Issue 3759 - Removed PAD generation code

sitescripts/extensions/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 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 117 matching lines @@
   buildRepository = _defineProperty('buildRepository')
   nightliesDirectory = _defineProperty('nightliesDirectory')
   nightliesURL = _defineProperty('nightliesURL')
   downloadsRepo = _defineProperty('downloadsRepo')
   downloadsURL = _defineProperty('downloadsURL')
   docsDirectory = _defineProperty('docsDirectory')
   signtool = _defineProperty('signtool')
   certname = _defineProperty('signtool_certname')
   dbdir = _defineProperty('signtool_dbdir')
   dbpass = _defineProperty('signtool_dbpass')
-  padDirectory = _defineProperty('padDirectory')
-  padURL = _defineProperty('padURL')
-  padTemplate = _defineProperty('padTemplate')
 
   keyFile = _defineProperty('key', local=True, default='')
   name = _defineProperty('name', local=True)
   galleryID = _defineProperty('galleryID', local=True, default='')
   devbuildGalleryID = _defineProperty('devbuildGalleryID', local=True, default='')
   downloadPage = _defineProperty('downloadPage', local=True, default='')
   experimental = _defineProperty('experimental', local=True, default='')
   clientID = _defineProperty('clientID', local=True, default='')
   clientSecret = _defineProperty('clientSecret', local=True, default='')
   refreshToken = _defineProperty('refreshToken', local=True, default='')
-  pad = _defineProperty('pad', local=True, type='boolean', default=False)
 
   latestRevision = _defineNightlyProperty('latestRevision')
 
   def __init__(self, config, nightlyConfig, repositoryName, repository):
     """
       Creates a new Configuration instance that is bound to a particular
       repository.
     """
 
     self.repositoryName = repositoryName
@@ skipping 19 matching lines @@
 
     if self.nightlyConfig and not self.nightlyConfig.has_section(self.repositoryName):
       self.nightlyConfig.add_section(self.repositoryName)
 
   def __str__(self):
     """
       Provides a string representation of this configuration
     """
     return self.repositoryName
 
-  def listContents(self, version='tip'):
-    return subprocess.check_output(['hg', '-R', self.repository, 'locate', '-r', version]).splitlines()
-
   def readMetadata(self, version='tip'):
     genericFilename = 'metadata'
     filename = '%s.%s' % (genericFilename, self.type)
-    files = self.listContents(version)
+    files = subprocess.check_output(['hg', '-R', self.repository,
+                                     'locate', '-r', version]).splitlines()
 
     if filename not in files:
       # some repositories like those for Android and
       # Internet Explorer don't have metadata files
       if genericFilename not in files:
         return None
 
       # Fall back to platform-independent metadata file
       filename = genericFilename
 
     command = ['hg', '-R', self.repository, 'cat', '-r', version, os.path.join(self.repository, filename)]
     result = subprocess.check_output(command)
 
     parser = SafeConfigParser()
     parser.readfp(StringIO(result))
 
     return parser
 
-  @property
-  def basename(self):

[Wladimir Palant, 2016/03/08 16:58:14]

If I see it correctly, this property is still being used by a bunch of scripts.

[Sebastian Noack, 2016/03/08 17:01:02]

If I see it correctly, we introduced that property when we added the PAD
generation code, and I couldn't find any other usage of it. I might be wrong
though, but are you sure that you didn't confuse it with os.path.basename?

[Wladimir Palant, 2016/03/08 17:34:12]

I didn't but there appears to be a separate NightlyBuild.basename property. Fine
with me then.

+  def getDownloads(self):
     metadata = self.readMetadata()
     if metadata:
-      return metadata.get('general', 'basename')
-    return os.path.basename(os.path.normpath(self.repository))
+      prefix = metadata.get('general', 'basename')
+    else:
+      prefix = os.path.basename(os.path.normpath(self.repository))
+    prefix +=  '-'
 
-  def getDownloads(self):
-    prefix = self.basename + '-'
     command = ['hg', 'locate', '-R', self.downloadsRepo, '-r', 'default']
-
     for filename in subprocess.check_output(command).splitlines():
       if filename.startswith(prefix) and filename.endswith(self.packageSuffix):
         yield (filename, filename[len(prefix):len(filename) - len(self.packageSuffix)])
 
   @staticmethod
   def getRepositoryConfigurations(nightlyConfig = None):
     """
       Retrieves configuration settings for all repositories
       from the configuration file, where existing repositories
       are identified by an <id>_repository entry appearing
@@ skipping 179 matching lines @@
   if not extensions:
     return
 
   updates = {}
   for extension in extensions:
     updates[extension['basename']] = {
       "url": extension['updateURL'],
       "version": extension['version']
     }
   writeLibabpUpdateManifest(path, updates)