luci-py/isolateserver.py: Add archive support when downloading.

client/isolateserver.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Archives a set of files or directories to an Isolate Server."""
 
 __version__ = '0.6.0'
 
 import base64
@@ skipping 10 matching lines @@
 import tempfile
 import threading
 import time
 import types
 import zlib
 
 from third_party import colorama
 from third_party.depot_tools import fix_encoding
 from third_party.depot_tools import subcommand
 
+from libs import arfile
 from utils import file_path
 from utils import fs
 from utils import logging_utils
 from utils import lru
 from utils import net
 from utils import on_error
 from utils import subprocess42
 from utils import threading_utils
 from utils import tools
 
@@ skipping 2023 matching lines @@
 
           # Wait for any item to finish fetching to cache.
           digest = fetch_queue.wait(remaining)
 
           # Create the files in the destination using item in cache as the
           # source.
           for filepath, props in remaining.pop(digest):
             fullpath = os.path.join(outdir, filepath)
 
             with cache.getfileobj(digest) as srcfileobj:
-              file_mode = props.get('m')
-              if file_mode:
-                # Ignore all bits apart from the user
-                file_mode &= 0700
-              putfile(
-                  srcfileobj, fullpath, file_mode,
-                  use_symlink=use_symlinks)
+              filetype = props.get('t', 'basic')
+
+              if filetype == 'basic':
+                file_mode = props.get('m')
+                if file_mode:
+                  # Ignore all bits apart from the user
+                  file_mode &= 0700
+                putfile(
+                    srcfileobj, fullpath, file_mode,
+                    use_symlink=use_symlinks)
+
+              elif filetype == 'ar':
+                basedir = os.path.dirname(fullpath)
+                extractor = arfile.ArFileReader(srcfileobj, fullparse=False)
+                for ai, ifd in extractor:
+                  fp = os.path.normpath(os.path.join(basedir, ai.name))
+                  file_path.ensure_tree(os.path.dirname(fp))
+                  putfile(ifd, fp, 0700, ai.size)
+
+              else:
+                raise isolated_format.IsolatedError(
+                      'Unknown file type %r', filetype)
 
           # Report progress.
           duration = time.time() - last_update
           if duration > DELAY_BETWEEN_UPDATES_IN_SECS:
             msg = '%d files remaining...' % len(remaining)
             print msg
             logging.info(msg)
             last_update = time.time()
 
   # Cache could evict some items we just tried to fetch, it's a fatal error.
@@ skipping 324 matching lines @@
   return dispatcher.execute(OptionParserIsolateServer(), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   file_path.enable_symlink()
   sys.exit(main(sys.argv[1:]))