Extensions Docs Server: Internal file system

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

Index: chrome/common/extensions/docs/server2/samples_data_source.py
diff --git a/chrome/common/extensions/docs/server2/samples_data_source.py b/chrome/common/extensions/docs/server2/samples_data_source.py
index 76fbbac0963644ed633e0eb99e228b7fcf7ee855..5f4089054d823f057db8594b043f9e6df4807adf 100644
--- a/chrome/common/extensions/docs/server2/samples_data_source.py
+++ b/chrome/common/extensions/docs/server2/samples_data_source.py
@@ -14,30 +14,30 @@ class SamplesDataSource(object):
     self._samples_path = samples_path
 
   def _GetApiItems(self, api_items, js_file):
-    return set(re.findall('(chrome\.[a-zA-Z0-9\.]+)',
-                          self._fetcher.FetchResource(js_file).content))
+    api_items.update(set(re.findall('(chrome\.[a-zA-Z0-9\.]+)', js_file)))
 
   def _MakeApiLink(self, prefix, item):
     api, name = item.replace('chrome.', '').split('.', 1)
     return api + '.html#' + prefix + '-' + name
 
   def _GetDataFromManifest(self, path):
-    manifest = self._fetcher.FetchResource(path + '/manifest.json').content
+    manifest = self._fetcher.Read(
+        [path + '/manifest.json'])[path + '/manifest.json'].Get()

[not at google - send to devlin, 2012/07/18 10:39:16]

seems like you should hold onto path + '/manifest.json' in a variable.

[cduvall, 2012/07/18 21:26:10]

Done.

     manifest_json = json.loads(manifest)
     return (manifest_json.get('name'), manifest_json.get('description'))
 
   def _MakeSamplesList(self, files):
     samples_list = []
-    for filename in files:
+    for filename in sorted(files):
       if filename.rsplit('/')[-1] != 'manifest.json':
         continue
       # This is a little hacky, but it makes a sample page.
       sample_path = filename.rsplit('/', 1)[-2]
       sample_files = filter(lambda x: x.startswith(sample_path + '/'), files)
+      js_files = filter(lambda x: x.endswith('.js'), sample_files)
+      js_contents = self._fetcher.Read(js_files)
       api_items = set([])

[not at google - send to devlin, 2012/07/18 10:39:16]

don't need the [], just set()

[cduvall, 2012/07/18 21:26:10]

Done.

-      for file_ in sample_files:
-        if file_.endswith('.js'):
-          api_items.update(self._GetApiItems(api_items, file_))
+      [self._GetApiItems(api_items, js.Get()) for js in js_contents.values()]

[not at google - send to devlin, 2012/07/18 10:39:16]

I preferred the way it was... side-effectful list comprehensions doesn't seem
like a good idiom.

[cduvall, 2012/07/18 21:26:10]

Done.

 
       api_calls = []
       for item in api_items:
@@ -68,4 +68,4 @@ class SamplesDataSource(object):
     return self.get(key)
 
   def get(self, key):
-    return self._cache.getFromFileListing('docs/' + self._samples_path, True)
+    return self._cache.getFromFileListing(self._samples_path + '/')