Issue 399 - Added support for Safari to updateDownloadLinks

sitescripts/extensions/bin/updateDownloadLinks.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 159 matching lines @@
       result.add_section(repo.repositoryName)
     result.set(repo.repositoryName, "downloadURL", downloadURL)
     result.set(repo.repositoryName, "version", version)
 
     qrcode = getQRCode(downloadURL)
     if qrcode != None:
       result.set(repo.repositoryName, "qrcode", qrcode)
 
 def readRawMetadata(repo, version='tip'):
   files = subprocess.check_output(['hg', '-R', repo.repository, 'locate', '-r', version]).splitlines()
-  if 'metadata.%s' % repo.type in files:
-    command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, 'metadata.%s' % repo.type)]
-    result = subprocess.check_output(command)
-  else:
-    # Fall back to platform-independent metadata file for now
-    command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, 'metadata')]
-    result = subprocess.check_output(command)

[Wladimir Palant, 2014/04/30 11:50:57]

Nit: You only copied that code but |result = subprocess.check_output(command)|
can be performed after the if block - it's being done on both branches.

[Sebastian Noack, 2014/04/30 12:21:45]

Even better, just generating the manifest filename with a conditional branch. So
we also don't need to duplicate the command line.

+  genericFilename = 'metadata'
+  filename = '%s.%s' % (genericFilename, repo.type)
+
+  # Fall back to platform-independent metadata file
+  if filename not in files:
+    filename = genericFilename
+
+  command = ['hg', '-R', repo.repository, 'cat', '-r', version, os.path.join(repo.repository, filename)]
+  result = subprocess.check_output(command)
 
   parser = SafeConfigParser()
   parser.readfp(StringIO(result))
 
   return parser
 
 def readMetadata(repo, version):
   """
   reads extension ID and compatibility information from metadata file in the
   extension's repository
@@ skipping 13 matching lines @@
       'minSdkVersion': usesSdk.attributes["android:minSdkVersion"].value,
     }
   elif repo.type == 'safari':
     metadata = readRawMetadata(repo, version)
     return {
       'certificateID': getSafariCertificateID(repo.keyFile),
       'version': version,
       'shortVersion': version,
       'basename': metadata.get('general', 'basename'),
     }
-  else:

[Wladimir Palant, 2014/04/30 11:50:57]

Nit: Please check |repo.type == 'gecko'| explicitly here, we do it in newer code
now. We should throw an exception for unknown repository types.

[Sebastian Noack, 2014/04/30 12:21:45]

Done.

+  elif repo.type == 'gecko':
     metadata = readRawMetadata(repo, version)
     result = {
       'extensionID': metadata.get('general', 'id'),
       'version': version,
       'compat': []
     }
     for key, value in KNOWN_APPS.iteritems():
       if metadata.has_option('compat', key):
         minVersion, maxVersion = metadata.get('compat', key).split('/')
         result['compat'].append({'id': value, 'minVersion': minVersion, 'maxVersion': maxVersion})
     return result
+  else:
+    raise Exception('unknown repository type %r' % repo.type)
 
 def writeUpdateManifest(links):
   """
   writes an update manifest for all Gecko extensions and Android apps
   """
 
   extensions = {'gecko': [], 'android': [], 'safari': []}
   for repo in Configuration.getRepositoryConfigurations():
     if repo.type not in extensions or not links.has_section(repo.repositoryName):
       continue
@@ skipping 20 matching lines @@
   result = SafeConfigParser()
   getDownloadLinks(result)
   file = open(get_config().get('extensions', 'downloadLinksFile'), 'wb')
   result.write(file)
   file.close()
 
   writeUpdateManifest(result)
 
 if __name__ == "__main__":
   updateLinks()