Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

chrome/common/extensions/docs/server2/github_file_system.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.
 
 import json
 import logging
 import os
+from StringIO import StringIO
 
 import appengine_blobstore as blobstore
+from appengine_url_fetcher import AppEngineUrlFetcher
 from appengine_wrappers import GetAppVersion, urlfetch
 from file_system import FileSystem, StatInfo
 from future import Future
 from object_store_creator import ObjectStoreCreator
-from StringIO import StringIO
+import url_constants
 from zipfile import ZipFile, BadZipfile
 
 ZIP_KEY = 'zipball'
 USERNAME = None
 PASSWORD = None
 
 def _MakeBlobstoreKey(version):
   return ZIP_KEY + '.' + str(version)
 
 class _AsyncFetchFutureZip(object):
@@ skipping 33 matching lines @@
     except BadZipfile as e:
       logging.error('Bad github zip file: %s' % e)
       return None
 
     self._blobstore.Set(_MakeBlobstoreKey(self._key_to_set),
                         blob,
                         blobstore.BLOBSTORE_GITHUB)
     return return_zip
 
 class GithubFileSystem(FileSystem):
-  """FileSystem implementation which fetches resources from github.
-  """
-  def __init__(self, fetcher, blobstore):
-    # The password store is the same for all branches and versions.
-    password_store = (ObjectStoreCreator.GlobalFactory()
-        .Create(GithubFileSystem).Create(category='password'))
+  @staticmethod
+  def Create(object_store_creator):
+    return GithubFileSystem(
+        AppEngineUrlFetcher(url_constants.GITHUB_URL),
+        blobstore.AppEngineBlobstore(),
+        object_store_creator)
+
+  def __init__(self, fetcher, blobstore, object_store_creator):
+    # Password store doesn't depend on channel, and if we don't cancel the app
+    # version then the whole advantage of having it in the first place is
+    # greatly lessened (likewise it should always start populated).
+    password_store = object_store_creator.Create(
+        GithubFileSystem,
+        channel=None,
+        app_version=None,
+        category='password',
+        start_empty=False)
     if USERNAME is None:
       password_data = password_store.GetMulti(('username', 'password')).Get()
       self._username, self._password = (password_data.get('username'),
                                         password_data.get('password'))
     else:
       password_store.SetMulti({'username': USERNAME, 'password': PASSWORD})
       self._username, self._password = (USERNAME, PASSWORD)
 
     self._fetcher = fetcher
     self._blobstore = blobstore
-    self._stat_object_store = (ObjectStoreCreator.SharedFactory(GetAppVersion())
-        .Create(GithubFileSystem).Create())
+    # Github has no knowledge of Chrome channels, set channel to None.
+    self._stat_object_store = object_store_creator.Create(
+        GithubFileSystem,
+        channel=None)
     self._version = None
     self._GetZip(self.Stat(ZIP_KEY).version)
 
   def _GetZip(self, version):
     blob = self._blobstore.Get(_MakeBlobstoreKey(version),
                                blobstore.BLOBSTORE_GITHUB)
     if blob is not None:
       try:
         self._zip_file = Future(value=ZipFile(StringIO(blob)))
       except BadZipfile as e:
@@ skipping 85 matching lines @@
     version = (json.loads(result.content).get('commit', {})
                                          .get('tree', {})
                                          .get('sha', None))
     # Check if the JSON was valid, and set to 0 if not.
     if version is not None:
       self._stat_object_store.Set(path, version)
     else:
       logging.warning('Problem fetching commit hash from github.')
       return self._DefaultStat(path)
     return StatInfo(version)