Issue 356 - Update devbuild in the Chrome Web Store

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 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 399 matching lines @@
 
     # upload a new version with the Chrome Web Store API
     # https://developer.chrome.com/webstore/using_webstore_api#uploadexisitng
 
     request = urllib2.Request('https://www.googleapis.com/upload/chromewebstore/v1.1/items/' + self.config.galleryID)
     request.get_method = lambda: 'PUT'
     request.add_header('Authorization', '%s %s' % (response['token_type'], response['access_token']))
     request.add_header('x-goog-api-version', '2')
 
     with open(self.path, 'rb') as file:
-      # skip CRX magic and version
-      offset = 8
-      file.seek(offset)
+      if file.read(8) != 'Cr24\x02\x00\x00\x00':
+        raise Exception('not a chrome extension or unknown CRX version')
 
       # skip public key and signature
-      offset += 8 + sum(struct.unpack('<II', file.read(8)))

[Wladimir Palant, 2014/04/21 20:22:56]

Please don't skip magic number and version - read them to verify that they are
what you expect, otherwise you should raise an exception (particularly important
if CRX version changes).

[Sebastian Noack, 2014/04/21 20:46:36]

Done.

-      file.seek(offset)

[Wladimir Palant, 2014/04/21 20:22:56]

Please use os.SEEK_CUR as second parameter to file.seek(), then you won't need a
complicated offset calculation - just a sum of the two lengths. For
Content-Length below you can use file.tell().

[Sebastian Noack, 2014/04/21 20:46:36]

Done.

-
-      request.add_header('Content-Length', os.fstat(file.fileno()).st_size - offset)
+      file.seek(sum(struct.unpack('<II', file.read(8))), os.SEEK_CUR)
+
+      request.add_header('Content-Length', os.fstat(file.fileno()).st_size - file.tell())
       request.add_data(file)
 
       response = json.load(urllib2.urlopen(request))
 
     if response['uploadState'] == 'FAILURE':
       raise Exception(response['itemError'])
 
   def run(self):
     """
       Run the nightly build process for one extension
@@ skipping 34 matching lines @@
 
       if self.config.type == 'ie':
         self.writeIEUpdateManifest(versions)
 
       # update index page
       self.updateIndex(versions)
 
       # update nightlies config
       self.config.latestRevision = self.revision
 
-      if self.config.clientID and self.config.clientSecret and self.config.refreshToken:

[Wladimir Palant, 2014/04/21 20:22:56]

I think it makes sense to keep the type == 'chrome' check - it makes no sense to
attempt CWS upload for non-Chrome extensions, even if the necessary parameters
are configured. Note that these parameters aren't explicitly CWS-related, we
might theoretically decide to use the same set of parameters with other
extension stores (unlikely of course).

[Sebastian Noack, 2014/04/21 20:46:36]

Done.

+      if self.type == 'chrome' and self.config.clientID and self.config.clientSecret and self.config.refreshToken:
         self.uploadToChromeWebStore()
     finally:
       # clean up
       if self.tempdir:
         shutil.rmtree(self.tempdir, ignore_errors=True)
 
 
 def main():
   """
     main function for createNightlies.py
@@ skipping 17 matching lines @@
     except Exception, ex:
       print >>sys.stderr, "The build for %s failed:" % repo
       traceback.print_exc()
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()