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

client/isolated_format.py

 # Copyright 2014 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.
 
 """Understands .isolated files and can do local operations on them."""
 
 import hashlib
 import json
 import logging
 import os
 import re
 import stat
 import sys
 
 from utils import file_path
 from utils import fs
 from utils import tools
 
 
 # Version stored and expected in .isolated files.
-ISOLATED_FILE_VERSION = '1.4'
+ISOLATED_FILE_VERSION = '1.5'
 
 
 # Chunk size to use when doing disk I/O.
 DISK_FILE_CHUNK = 1024 * 1024
 
 
 # Sadly, hashlib uses 'sha1' instead of the standard 'sha-1' so explicitly
 # specify the names here.
 SUPPORTED_ALGOS = {
   'md5': hashlib.md5,
   'sha-1': hashlib.sha1,
   'sha-512': hashlib.sha512,
 }
 
 
 # Used for serialization.
 SUPPORTED_ALGOS_REVERSE = dict((v, k) for k, v in SUPPORTED_ALGOS.iteritems())
 
+SUPPORTED_FILE_TYPES = ['basic', 'ar']
+
 
 class IsolatedError(ValueError):
   """Generic failure to load a .isolated file."""
   pass
 
 
 class MappingError(OSError):
   """Failed to recreate the tree."""
   pass
 
@@ skipping 449 matching lines @@
               raise IsolatedError('Expected string, got %r' % subsubvalue)
           elif subsubkey == 'm':
             if not isinstance(subsubvalue, int):
               raise IsolatedError('Expected int, got %r' % subsubvalue)
           elif subsubkey == 'h':
             if not is_valid_hash(subsubvalue, algo):
               raise IsolatedError('Expected sha-1, got %r' % subsubvalue)
           elif subsubkey == 's':
             if not isinstance(subsubvalue, (int, long)):
               raise IsolatedError('Expected int or long, got %r' % subsubvalue)
+          elif subsubkey == 't':
+            if subsubvalue not in SUPPORTED_FILE_TYPES:
+              raise IsolatedError('Expected one of \'%s\', got %r' % (
+                  ', '.join(sorted(SUPPORTED_FILE_TYPES)), subsubvalue))
           else:
             raise IsolatedError('Unknown subsubkey %s' % subsubkey)
         if bool('h' in subvalue) == bool('l' in subvalue):
           raise IsolatedError(
               'Need only one of \'h\' (sha-1) or \'l\' (link), got: %r' %
               subvalue)
         if bool('h' in subvalue) != bool('s' in subvalue):
           raise IsolatedError(
               'Both \'h\' (sha-1) and \'s\' (size) should be set, got: %r' %
               subvalue)
@@ skipping 42 matching lines @@
     data['files'] = dict(
         (k.replace(wrong_path_sep, os.path.sep), v)
         for k, v in data['files'].iteritems())
     for v in data['files'].itervalues():
       if 'l' in v:
         v['l'] = v['l'].replace(wrong_path_sep, os.path.sep)
   if 'relative_cwd' in data:
     data['relative_cwd'] = data['relative_cwd'].replace(
         wrong_path_sep, os.path.sep)
   return data