Chromium Code Reviews| Index: chrome/common/extensions/docs/server2/server_instance.py |
| diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py |
| index 647af069be6350514b57f716fd2a4b5dba50a1fd..cb212701346338fcf5012e784cce753a5fa8c5ea 100644 |
| --- a/chrome/common/extensions/docs/server2/server_instance.py |
| +++ b/chrome/common/extensions/docs/server2/server_instance.py |
| @@ -3,7 +3,6 @@ |
| # found in the LICENSE file. |
| from fnmatch import fnmatch |
| -import logging |
| import mimetypes |
| import traceback |
| import os |
| @@ -12,8 +11,10 @@ from api_data_source import APIDataSource |
| from api_list_data_source import APIListDataSource |
| from appengine_url_fetcher import AppEngineUrlFetcher |
| from appengine_wrappers import GetAppVersion, IsDevServer |
| +from availability_data_source import AvailabilityDataSource |
| from branch_utility import BranchUtility |
| from caching_file_system import CachingFileSystem |
| +from chrome_version_utility import ChromeVersionUtility |
| from compiled_file_system import CompiledFileSystem |
| from empty_dir_file_system import EmptyDirFileSystem |
| from example_zipper import ExampleZipper |
| @@ -27,9 +28,9 @@ from path_canonicalizer import PathCanonicalizer |
| from reference_resolver import ReferenceResolver |
| from samples_data_source import SamplesDataSource |
| from sidenav_data_source import SidenavDataSource |
| -from subversion_file_system import SubversionFileSystem |
| import svn_constants |
| from template_data_source import TemplateDataSource |
| +from test_file_system import TestFileSystem |
| from test_object_store import TestObjectStore |
| from third_party.json_schema_compiler.model import UnixName |
| import url_constants |
| @@ -39,7 +40,8 @@ class ServerInstance(object): |
| channel, |
| object_store_creator, |
| host_file_system, |
| - app_samples_file_system): |
| + app_samples_file_system, |
| + file_system_creator): |
| self.channel = channel |
| self.object_store_creator = object_store_creator |
| @@ -52,6 +54,16 @@ class ServerInstance(object): |
| host_file_system, |
| object_store_creator) |
| + self.chrome_version_utility = ChromeVersionUtility( |
| + url_constants.OMAHA_DEV_HISTORY, |
| + AppEngineUrlFetcher(), |
| + object_store_creator) |
| + |
| + self.availability_data_source_factory = AvailabilityDataSource.Factory( |
| + self.chrome_version_utility, |
| + object_store_creator, |
| + file_system_creator) |
| + |
| self.api_list_data_source_factory = APIListDataSource.Factory( |
| self.compiled_host_fs_factory, |
| svn_constants.API_PATH, |
| @@ -59,7 +71,9 @@ class ServerInstance(object): |
| self.api_data_source_factory = APIDataSource.Factory( |
| self.compiled_host_fs_factory, |
| - svn_constants.API_PATH) |
| + svn_constants.API_PATH, |
| + self.availability_data_source_factory, |
| + file_system_creator) |
|
not at google - send to devlin
2013/05/13 21:26:41
I don't think you need to pass it in here
|
| self.ref_resolver_factory = ReferenceResolver.Factory( |
| self.api_data_source_factory, |
| @@ -125,7 +139,8 @@ class ServerInstance(object): |
| return ServerInstance('test', |
| ObjectStoreCreator.ForTest(), |
| file_system, |
| - EmptyDirFileSystem()) |
| + EmptyDirFileSystem(), |
| + lambda branch: file_system) |
| @staticmethod |
| def ForLocal(): |
| @@ -133,8 +148,14 @@ class ServerInstance(object): |
| object_store_creator = ObjectStoreCreator(channel, |
| start_empty=False, |
| store_type=TestObjectStore) |
| + def file_system_creator(branch): |
| + object_store_creator = ObjectStoreCreator(branch, |
|
not at google - send to devlin
2013/05/13 21:26:41
why do you need a different object store creator?j
epeterson
2013/05/15 07:38:34
Done.
|
| + start_empty=False, |
| + store_type=TestObjectStore) |
| + return CachingFileSystem(LocalFileSystem.Create(), object_store_creator) |
| return ServerInstance( |
| channel, |
| object_store_creator, |
| CachingFileSystem(LocalFileSystem.Create(), object_store_creator), |
|
not at google - send to devlin
2013/05/13 21:26:41
for that matter, use the above function to constru
epeterson
2013/05/15 07:38:34
Done.
|
| - EmptyDirFileSystem()) |
| + EmptyDirFileSystem(), |
| + file_system_creator) |