Issue 520 - Generate PAD files for download portals when updating download links

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 52 matching lines @@
     return (linkTag.firstChild.data, versionTag.firstChild.data)
   else:
     return (None, None)
 
 def getGoogleDownloadLink(galleryID):
   """
   gets download link for a Chrome add-on from the Chrome Gallery site
   """
   galleryID = urlencode(galleryID)
 
-  url = 'https://clients2.google.com/service/update2/crx?x='
-  url += urlencode('id=%s&uc' % galleryID)
+  url = 'https://clients2.google.com/service/update2/crx?x=%s' % urlencode('id=%s&uc' % galleryID)
   document = dom.parse(urlopen(url))
   updateTags = document.getElementsByTagName('updatecheck')
   version = updateTags and updateTags[0].getAttribute('version')
 
   if not version:
     return (None, None)
 
   request = urllib2.Request('https://chrome.google.com/webstore/detail/_/' + galleryID)
   request.get_method = lambda : 'HEAD'
   url = urllib2.urlopen(request).geturl()
@@ skipping 141 matching lines @@
   if len(extensions['android']) > 1:
     print >>sys.stderr, 'Warning: more than one Android app defined, update manifest only works for one'
 
   for repoType in extensions.iterkeys():
     manifestPath = get_config().get('extensions', '%sUpdateManifestPath' % repoType)
     template = get_template(get_config().get('extensions', '%sUpdateManifest' % repoType))
     template.stream({'extensions': extensions[repoType]}).dump(manifestPath)
 
 def writePadFile(links):
   for repo in Configuration.getRepositoryConfigurations():
-    if repo.padTemplate and links.has_section(repo.repositoryName):
+    if repo.pad and links.has_section(repo.repositoryName):
       PadFile.forRepository(repo, links.get(repo.repositoryName, 'version'),
                                   links.get(repo.repositoryName, 'downloadURL')).write()
 
 def updateLinks():
   """
   writes the current extension download links to a file
   """
 
   # Now get download links and save them to file
   result = SafeConfigParser()
   getDownloadLinks(result)
   file = open(get_config().get('extensions', 'downloadLinksFile'), 'wb')
   result.write(file)
   file.close()
 
   writeUpdateManifest(result)
   writePadFile(result)
 
 if __name__ == "__main__":
   updateLinks()