Docserver: Fixes for GitilesFileSystem

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

 # Copyright (c) 2012 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.
 
 # These are fake fetchers that are used for testing and the preview server.
 # They return canned responses for URLs. appengine_wrappers.py uses the fake
 # fetchers if the App Engine imports fail.
 
 import base64
 import json
@@ skipping 61 matching lines @@
       except OSError as e:
         return None
     try:
       return ReadFile(path)
     except IOError:
       return None
 
 
 _GITILES_BASE_RE = re.escape(url_constants.GITILES_BASE)
 _GITILES_BRANCH_BASE_RE = re.escape(url_constants.GITILES_BRANCH_BASE)
-_GITILES_URL_TO_PATH_PATTERN = re.compile(
-    r'(' + _GITILES_BASE_RE + r'|' + _GITILES_BRANCH_BASE_RE + r').+?/(.*)')
+# NOTE: _GITILES_BRANCH_BASE_RE must be first, because _GITILES_BASE_RE is
+# a more general pattern.
+_GITILES_URL_RE = r'(%s|%s)/' % (_GITILES_BRANCH_BASE_RE, _GITILES_BASE_RE)
+_GITILES_URL_TO_COMMIT_PATTERN = re.compile(
+    r'%s[^/]+\?format=JSON' % _GITILES_URL_RE)
+_GITILES_URL_TO_PATH_PATTERN = re.compile(r'%s.+?/(.*)' % _GITILES_URL_RE)
 def _ExtractPathFromGitilesUrl(url):
   return _GITILES_URL_TO_PATH_PATTERN.match(url).group(2)
 
 
 class _FakeGitilesServer(_FakeFetcher):
   def fetch(self, url):
+    if _GITILES_URL_TO_COMMIT_PATTERN.match(url) is not None:
+      return json.dumps({'commit': '1' * 40})
     path = _ExtractPathFromGitilesUrl(url)
     chromium_path = ChromiumPath(path)
     if self._IsDir(chromium_path):
       jsn = {}
       dir_stat = self._Stat(chromium_path)
       jsn['id'] = dir_stat
       jsn['entries'] = []
       for f in self._ListDir(chromium_path):
         if f.startswith('.'):
           continue
+        f_path = os.path.join(chromium_path, f)
         jsn['entries'].append({
-          'id': self._Stat(os.path.join(chromium_path, f)),
-          'name': f
+          'id': self._Stat(f_path),
+          'name': f,
+          'type': 'tree' if self._IsDir(f_path) else 'blob'
         })
       return json.dumps(jsn)
     try:
       return base64.b64encode(ReadFile(path))
     except IOError:
       return None
 
 
 class _FakeViewvcServer(_FakeFetcher):
   def fetch(self, url):
@@ skipping 62 matching lines @@
     url_constants.OMAHA_PROXY_URL: _FakeOmahaProxy(),
     '%s/.*' % url_constants.SVN_URL: _FakeSubversionServer(),
     '%s/.*' % url_constants.VIEWVC_URL: _FakeViewvcServer(),
     '%s/.*/commits/.*' % url_constants.GITHUB_REPOS: _FakeGithubStat(),
     '%s/.*/zipball' % url_constants.GITHUB_REPOS: _FakeGithubZip(),
     '%s/api/.*' % url_constants.CODEREVIEW_SERVER: _FakeRietveldAPI(),
     '%s/tarball/.*' % url_constants.CODEREVIEW_SERVER: _FakeRietveldTarball(),
     '%s/.*' % _GITILES_BASE_RE: _FakeGitilesServer(),
     '%s/.*' % _GITILES_BRANCH_BASE_RE: _FakeGitilesServer()
   })