Issue 1093 - Separate update manifest generation

sitescripts/extensions/bin/updateDownloadLinks.py

Index: sitescripts/extensions/bin/updateDownloadLinks.py
===================================================================
--- a/sitescripts/extensions/bin/updateDownloadLinks.py
+++ b/sitescripts/extensions/bin/updateDownloadLinks.py
@@ -23,15 +23,14 @@
   and version information
 """
 
-import sys, os, re, urllib, urllib2, urlparse, subprocess, time
+import sys, os, re, urllib, urllib2, subprocess, time

[Wladimir Palant, 2014/07/22 11:24:26]

sys, os, subprocess are no longer being used here. Please convert this into one
import per line while at it.

[Felix Dahlke, 2014/07/22 12:01:11]

Done.

 import xml.dom.minidom as dom

[Wladimir Palant, 2014/07/22 11:24:26]

dom should no longer be required here.

[Felix Dahlke, 2014/07/22 12:01:11]

Done.

 from ConfigParser import SafeConfigParser
 from StringIO import StringIO

[Wladimir Palant, 2014/07/22 11:24:26]

StringIO is no longer being used here.

[Felix Dahlke, 2014/07/22 12:01:11]

Done.

 from sitescripts.utils import get_config, get_template

[Wladimir Palant, 2014/07/22 11:24:26]

get_template is no longer being used here.

[Felix Dahlke, 2014/07/22 12:01:11]

Done.

-from sitescripts.extensions.utils import compareVersions, Configuration, getSafariCertificateID
-from sitescripts.extensions.android import get_min_sdk_version
+from sitescripts.extensions.utils import (compareVersions, Configuration,
+  getSafariCertificateID, getDownloadLinks, readMetadata)

[Wladimir Palant, 2014/07/22 11:24:26]

compareVersions, getSafariCertificateID, readMetadata aren't being used here.

[Felix Dahlke, 2014/07/22 12:01:11]

Done.

 from sitescripts.extensions.pad import PadFile
-from buildtools.packagerGecko import KNOWN_APPS
 
 def urlencode(value):
   return urllib.quote(value.encode('utf-8'), '')
@@ -102,134 +101,6 @@
 
   return (None, None)
 
-def getLocalLink(repo):
-  """
-  gets the link for the newest download of an add-on in the local downloads
-  repository
-  """
-  highestURL = None
-  highestVersion = None
-
-  for filename, version in repo.getDownloads():
-    if not highestVersion or compareVersions(version, highestVersion) > 0:
-      highestURL = urlparse.urljoin(repo.downloadsURL, filename)
-      highestVersion = version
-
-  return (highestURL, highestVersion)
-
-def getDownloadLink(repo):
-  """
-  gets the download link to the most current version of an extension
-  """
-  # you can't easily install extensions from third-party sources on Chrome
-  # and Opera. So always get the link for the version on the Web Store.
-  if repo.galleryID:
-    if repo.type == "chrome":
-      return getGoogleDownloadLink(repo.galleryID)
-    if repo.type == "opera":
-      return getOperaDownloadLink(repo.galleryID)
-
-  (localURL, localVersion) = getLocalLink(repo)
-
-  # get a link to Firefox Add-Ons, if the latest version has been published there
-  if repo.type == 'gecko' and repo.galleryID:
-    (galleryURL, galleryVersion) = getMozillaDownloadLink(repo.galleryID)
-    if not localVersion or (galleryVersion and
-                            compareVersions(galleryVersion, localVersion) >= 0):
-      return (galleryURL, galleryVersion)
-
-  return (localURL, localVersion)
-
-def getQRCode(text):
-  try:
-    import qrcode
-    import base64
-    import Image    # required by qrcode but not formally a dependency
-  except:
-    return None
-
-  data = StringIO()
-  qrcode.make(text, box_size=5).save(data, 'png')
-  return 'data:image/png;base64,' + base64.b64encode(data.getvalue())
-
-def getDownloadLinks(result):
-  """
-  gets the download links for all extensions and puts them into the config
-  object
-  """
-  for repo in Configuration.getRepositoryConfigurations():
-    (downloadURL, version) = getDownloadLink(repo)
-    if downloadURL == None:
-      continue
-    if not result.has_section(repo.repositoryName):
-      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 readMetadata(repo, version):
-  """
-  reads extension ID and compatibility information from metadata file in the
-  extension's repository
-  """
-  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,
-      'minSdkVersion': get_min_sdk_version(repo, version),
-    }
-  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':
-    metadata = repo.readMetadata(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
-    data = readMetadata(repo, links.get(repo.repositoryName, 'version'))
-    data['updateURL'] = links.get(repo.repositoryName, 'downloadURL')
-    if data['updateURL'].startswith(repo.downloadsURL):
-      data['updateURL'] += "?update"
-    extensions[repo.type].append(data)
-
-  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.pad and links.has_section(repo.repositoryName):
@@ -248,7 +119,6 @@
   result.write(file)
   file.close()
 
-  writeUpdateManifest(result)
   writePadFile(result)
 
 if __name__ == "__main__":