[telemetry] Minor Cloud Storage script fixes.

tools/telemetry/cloud_storage

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import logging
 import os
 import subprocess
 
@@ skipping 39 matching lines @@
     if file_path in file_buckets:
       # Ignore duplicates, if both data and sha1 file were in the file list.
       continue
     if not os.path.exists(hash_path):
       # Probably got some non-Cloud Storage files in the file list. Ignore.
       continue
 
     file_hash = cloud_storage.ReadHash(hash_path)
     file_buckets[file_path] = []
     for bucket in BUCKETS:
-      if file_hash in bucket_contents[bucket]:
+      if bucket in bucket_contents and file_hash in bucket_contents[bucket]:
         file_buckets[file_path].append(bucket)
 
   return file_buckets
 
 
 class Ls(command_line.Command):
   """List which bucket each file is in."""
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_argument('-r', '--recursive', action='store_true')
     parser.add_argument('paths', nargs='+')
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
     for path in args.paths:
       if not os.path.exists(path):
         parser.error('Path not found: %s' % path)
 
   def Run(self, args):
     def GetFilesInPaths(paths, recursive):
       """If path is a dir, yields all files in path, otherwise just yields path.
       
       If recursive is true, walks subdirectories recursively."""
       for path in paths:
         if not os.path.isdir(path):
           yield path
-          return
+          continue
 
         if recursive:
           for root, _, filenames in os.walk(path):
             for filename in filenames:
               yield os.path.join(root, filename)
         else:
           for filename in os.listdir(path):
             yield os.path.join(path, filename)
 
     files = _FindFilesInCloudStorage(GetFilesInPaths(args.paths, args.recursive))
@@ skipping 15 matching lines @@
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_argument('files', nargs='+')
     parser.add_argument('bucket', choices=BUCKET_ALIASES)
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
     args.bucket = BUCKET_ALIASES[args.bucket]
 
-    for path in args.files:
-      _, hash_path = _GetPaths(path)
-      if not os.path.exists(hash_path):
-        parser.error('File not found: %s' % hash_path)
-
   def Run(self, args):
     files = _FindFilesInCloudStorage(args.files)
 
     for file_path, buckets in sorted(files.iteritems()):
       if not buckets:
         raise IOError('%s not found in Cloud Storage.' % file_path)
 
     for file_path, buckets in sorted(files.iteritems()):
+      if args.bucket in buckets:
+        buckets.remove(args.bucket)
+      if not buckets:
+        logging.info('Skipping %s, no action needed.' % file_path)
+        continue
+
       # Move to the target bucket.
       file_hash = cloud_storage.ReadHash(file_path + '.sha1')
       cloud_storage.Move(buckets.pop(), args.bucket, file_hash)
 
       # Delete all additional copies.
       for bucket in buckets:
-        if bucket == args.bucket:
-          continue
         cloud_storage.Delete(bucket, file_hash)
 
 
 class Rm(command_line.Command):
   """Remove files from Cloud Storage."""
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_argument('files', nargs='+')
 
-  @classmethod
-  def ProcessCommandLineArgs(cls, parser, args):
-    for path in args.files:
-      _, hash_path = _GetPaths(path)
-      if not os.path.exists(hash_path):
-        parser.error('File not found: %s' % hash_path)
-
   def Run(self, args):
     files = _FindFilesInCloudStorage(args.files)
     for file_path, buckets in sorted(files.iteritems()):
       file_hash = cloud_storage.ReadHash(file_path + '.sha1')
       for bucket in buckets:
         cloud_storage.Delete(bucket, file_hash)
 
 
 class Upload(command_line.Command):
   """Upload files to Cloud Storage."""
@@ skipping 43 matching lines @@
     subparser.set_defaults(command=command)
     command.AddCommandLineArgs(subparser)
 
   args = parser.parse_args()
   args.command.ProcessCommandLineArgs(parser, args)
   args.command().Run(args)
 
 
 if __name__ == '__main__':
   main()