Merged in other half of NaCl SDK's r1387 change to update_manifest.py

native_client_sdk/src/build_tools/sdk_tools/update_manifest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Utility to update the SDK manifest file in the build_tools directory'''
 
 import optparse
 import os
 import re
 import sdk_update
 import string
 import subprocess
 import sys
+import urllib2
 
 HELP='''"Usage: %prog [-b bundle] [options]"
 
 Actions for particular bundles:
   sdk_tools: Upload the most recently built nacl_sdk.zip and sdk_tools.tgz
       files to the server and update the manifest file
   pepper_??: Download the latest pepper builds off the appropriate branch,
       upload these files to the appropriate location on the server, and
       update the manifest file.
   <others>: Only update manifest file -- you'll need to upload the file yourself
@@ skipping 132 matching lines @@
     if options.manifest_version is not None:
       self._UpdateManifestVersion(options)
     # Keep a copy of bundle_name, which will be consumed by UpdateBundle, for
     # use in _VerifyAllOptionsConsumed below.
     bundle_name = options.bundle_name
     if bundle_name is not None:
       self._UpdateBundle(options)
     self._VerifyAllOptionsConsumed(options, bundle_name)
     self._ValidateManifest()
 
+  def ValidateManifestLinks(self):
+    '''Validates all the links in the manifest file and throws if one is bad'''
+    valid = True
+    for bundle in self._manifest_data[sdk_update.BUNDLES_KEY]:
+      for archive in bundle.GetArchives():
+        stream = None
+        try:
+          print "Checking size of data at link: %s" % archive.GetUrl()
+          stream = urllib2.urlopen(archive.GetUrl())
+          server_size = int(stream.info()[sdk_update.HTTP_CONTENT_LENGTH])
+          if server_size != archive.GetSize():
+            sys.stderr.write('Size mismatch for %s. Expected %s but got %s\n' %
+                             (archive.GetUrl(), archive.GetSize(), server_size))
+            sys.stderr.flush()
+            valid = False
+        finally:
+          if stream:
+            stream.close()
+    if not valid:
+      raise Error('Files on server do not match the manifest file')
+
 
 class GsUtil(object):
   def __init__(self, gsutil):
     '''gsutil is the path to the gsutil executable'''
     self.gsutil = gsutil
     self.root = 'gs://nativeclient-mirror/nacl/nacl_sdk'
 
   def GetURI(self, path):
     '''Return the full gs:// URI for a given relative path'''
     return '/'.join([self.root, path])
@@ skipping 127 matching lines @@
         if it doesn't already exists. Raises an Error if the manifest doesn't
         validate after updating.
 
     Args:
       options: option data'''
     # UpdateManifest does not know how to deal with file-related options
     self._manifest.UpdateManifest(self.options)
     self.WriteFile()
 
 
+def CommandPush(options, args, manifest_file):
+  '''Check the manifest file and push it to the server if it's okay'''
+  print 'Running Push with options=%s and args=%s' % (options, args)
+  manifest = manifest_file._manifest
+  manifest.UpdateManifest(options)
+  print 'Validating links within manifest file'
+  manifest.ValidateManifestLinks()
+  print 'Copying manifest file to server'
+  manifest_file.gsutil.Copy(options.manifest_file, 'naclsdk_manifest.json')
+
+
 def main(argv):
   '''Main entry for update_manifest.py'''
 
   buildtools_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
   parser = optparse.OptionParser(usage=HELP)
 
   # Setup options
   parser.add_option(
       '-a', '--archive-id', dest='archive_id',
       default=None,
@@ skipping 64 matching lines @@
       default=None,
       help='Required for new manifest files: '
            'Version number for the manifest.')
   parser.add_option(
       '-W', '--win-archive', dest='win_arch_url',
       default=None,
       help='URL for the Windows archive.')
 
   # Parse options and arguments and check.
   (options, args) = parser.parse_args(argv)
-  if len(args) > 0:
-    parser.error('These arguments were not understood: %s' % args)
+  manifest_file = UpdateSDKManifestFile(options)
+  if len(args) == 0:
+    manifest_file.HandleBundles()
+    manifest_file.UpdateWithOptions()
+    return 0
 
-  manifest_file = UpdateSDKManifestFile(options)
-  manifest_file.HandleBundles()
-  manifest_file.UpdateWithOptions()
-
+  COMMANDS = {
+      'push': CommandPush
+      }
+  def CommandUnknown(options, args, manifest_file):
+    raise Error("Unknown command %s" % args[0])
+  try:
+    COMMANDS.get(args[0], CommandUnknown)(options, args, manifest_file)
+  except Error as error:
+    print "Error: %s" % error
+    return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))