Issue 1048 - Fix Android update manifest format

sitescripts/extensions/bin/updateUpdateManifests.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 29 matching lines @@
   """
   if repo.type == 'android':
     command = ['hg', '-R', repo.repository, 'id', '-r', version, '-n']
     result = subprocess.check_output(command)
     revision = re.sub(r'\D', '', result)
 
     return {
       'revision': revision,
       'version': version,
       'minSdkVersion': get_min_sdk_version(repo, version),
+      'basename': os.path.basename(repo.repository)
     }
   elif repo.type == 'safari':
     metadata = repo.readMetadata(version)
     return {
       'certificateID': getSafariCertificateID(repo.keyFile),
       'version': version,
       'shortVersion': version,
       'basename': metadata.get('general', 'basename'),
     }
   elif repo.type == 'gecko':
@@ skipping 38 matching lines @@
     manifestPath = get_config().get('extensions', '%sUpdateManifestPath' % repoType)
     if repoType == 'ie':
       writeIEUpdateManifest(manifestPath, extensions[repoType])
     else:
       # ABP for Android used to have its own update manifest format. We need to
       # generate both that and the new one in the libadblockplus format as long
       # as a significant amount of users is on an old version.
       if repoType == 'android':
         newManifestPath = get_config().get("extensions",
                                            "androidNewUpdateManifestPath")
-        data = extensions[repoType][0]
-        updates = {
-          'adblockplusandroid': {

[Wladimir Palant, 2014/09/18 18:49:40]

This shouldn't be hardcoded. Please add a basename field to the result,
similarly to how it is being done for IE. Then make sure to process all
extensions in the list, not just the first one.

[Felix Dahlke, 2014/09/19 02:25:52]

Done.

-            'version': data['version'],
-            'url': data['updateURL']
+        updates = {}
+        for extension in extensions[repoType]:
+          updates[extension['basename']] = {
+            'version': extension['version'],
+            'url': extension['updateURL']
           }
-        }
         writeLibabpUpdateManifest(newManifestPath, updates)
-        del data['version']

[Wladimir Palant, 2014/09/18 18:49:40]

This shouldn't be necessary, the template will ignore additional parameters.

[Felix Dahlke, 2014/09/19 02:25:52]

Done.

       template = get_template(get_config().get('extensions', '%sUpdateManifest' % repoType))
       template.stream({'extensions': extensions[repoType]}).dump(manifestPath)
 
 def updateUpdateManifests():
   """
   updates all update manifests with the current versions
   """
 
   parser = SafeConfigParser()
   getDownloadLinks(parser)
   writeUpdateManifest(parser)
 
 if __name__ == "__main__":
   updateUpdateManifests()