Fixed clean URLs for GCS file system provider in the documentation server.

chrome/common/extensions/docs/server2/gcs_file_system.py

 # 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.
 
 from third_party.cloudstorage import cloudstorage_api
 from third_party.cloudstorage import common
 from third_party.cloudstorage import errors
 
 from docs_server_utils import StringIdentity
 from file_system import FileSystem, FileNotFoundError, StatInfo
@@ skipping 18 matching lines @@
 
 def _ReadFile(filename):
   AssertIsFile(filename)
   try:
     with cloudstorage_api.open('/' + filename, 'r') as f:
       return f.read()
   except errors.Error:
     raise FileNotFoundError('Read failed for %s: %s' % (filename,
         traceback.format_exc()))
 
-def _ListDir(dir_name):
+def _ListDir(dir_name, recursive=False):
   AssertIsDirectory(dir_name)
   try:
-    files = cloudstorage_api.listbucket('/' + dir_name)
-    return [os_path.filename.lstrip('/') for os_path in files]
+    # The listbucket method uses a prefix approach to simulate hierarchy.
+    # Calling it with the "delimiter" argument set to '/' gets only files
+    # directly inside the directory, not all recursive content.
+    delimiter = None if recursive else '/'
+    files = cloudstorage_api.listbucket('/' + dir_name, delimiter=delimiter)
+    return [os_path.filename.lstrip('/')[len(dir_name):] for os_path in files]
   except errors.Error:
     raise FileNotFoundError('cloudstorage.listbucket failed for %s: %s' %
                             (dir_name, traceback.format_exc()))
 
 def _CreateStatInfo(bucket, path):
   full_path = Join(bucket, path)
   last_commit_file = Join(bucket, LAST_COMMIT_HASH_FILENAME)
   try:
     last_commit = _ReadFile(last_commit_file)
     if IsDirectory(full_path):
-      child_versions = dict()
-      # Fetching stats for all files under full_path, recursively. The
-      # listbucket method uses a prefix approach to simulate hierarchy,
-      # but calling it without the "delimiter" argument searches for prefix,
-      # which means, for directories, everything beneath it.
-      for _file in cloudstorage_api.listbucket('/' + full_path):
-        filename = _file.filename.lstrip('/')[len(full_path):]
-        child_versions[filename] = last_commit
+      child_versions = dict((filename, last_commit) 
+                            for filename in _ListDir(full_path)) 
     else:
       child_versions = None
     return StatInfo(last_commit, child_versions)
   except (TypeError, errors.Error):
     raise FileNotFoundError('cloudstorage.stat failed for %s: %s' % (path,
                             traceback.format_exc()))
 
 class CloudStorageFileSystem(FileSystem):
   '''FileSystem implementation which fetches resources from Google Cloud
   Storage.
@@ skipping 36 matching lines @@
     try:
       return _CreateStatInfo(self._bucket, path)
     except errors.AuthorizationError:
       self._warnAboutAuthError()
       raise
 
   def GetIdentity(self):
     return '@'.join((self.__class__.__name__, StringIdentity(self._bucket)))
 
   def __repr__(self):
-    return 'LocalFileSystem(%s)' % self._bucket
+    return 'CloudStorageFileSystem(%s)' % self._bucket
 
   def _warnAboutAuthError(self):
     logging.warn(('Authentication error on Cloud Storage. Check if your'
                   ' appengine project has permissions to Read the GCS'
                   ' buckets. If you are running a local appengine server,'
                   ' you need to set an access_token in'
                   ' local_debug/gcs_debug.conf.'
                   ' Remember that this token expires in less than 10'
                   ' minutes, so keep it updated. See'
                   ' gcs_file_system_provider.py for instructions.'));
     logging.debug(traceback.format_exc())