Linking AvailabilityFinder with APIDataSource and intro-table templates.

chrome/common/extensions/docs/server2/server_instance.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.
 
 from fnmatch import fnmatch
-import logging
 import mimetypes
 import traceback
 import os
 
 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_finder import AvailabilityFinder
 from branch_utility import BranchUtility
 from caching_file_system import CachingFileSystem
 from compiled_file_system import CompiledFileSystem
 from empty_dir_file_system import EmptyDirFileSystem
 from example_zipper import ExampleZipper
 from file_system import FileNotFoundError
 from github_file_system import GithubFileSystem
+from host_file_system_creator import HostFileSystemCreator
 from intro_data_source import IntroDataSource
 from local_file_system import LocalFileSystem
 from object_store_creator import ObjectStoreCreator
 from offline_file_system import OfflineFileSystem
 from path_canonicalizer import PathCanonicalizer
 from redirector import Redirector
 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_branch_utility import TestBranchUtility
 from test_object_store import TestObjectStore
 from third_party.json_schema_compiler.model import UnixName
 import url_constants
 
 class ServerInstance(object):
   def __init__(self,
                channel,
                object_store_creator,
                host_file_system,
                app_samples_file_system,
                base_path,
-               compiled_fs_factory):
+               compiled_fs_factory,
+               branch_utility,
+               host_file_system_creator):
     self.channel = channel
 
     self.object_store_creator = object_store_creator
 
     self.host_file_system = host_file_system
 
     self.app_samples_file_system = app_samples_file_system
 
     self.compiled_host_fs_factory = compiled_fs_factory
 
+    self.availability_finder_factory = AvailabilityFinder.Factory(
+        object_store_creator,
+        self.compiled_host_fs_factory,
+        branch_utility,
+        host_file_system_creator.CreateAtVersion)

[not at google - send to devlin, 2013/07/09 23:11:55]

pass the host_file_system_creator to AvailabilityFinder, not just that function.

[epeterson, 2013/07/16 00:28:23]

Done.

+
     self.api_list_data_source_factory = APIListDataSource.Factory(
         self.compiled_host_fs_factory,
         svn_constants.API_PATH,
         svn_constants.PUBLIC_TEMPLATE_PATH)
 
     self.api_data_source_factory = APIDataSource.Factory(
         self.compiled_host_fs_factory,
-        svn_constants.API_PATH)
+        svn_constants.API_PATH,
+        self.availability_finder_factory)
 
     self.ref_resolver_factory = ReferenceResolver.Factory(
         self.api_data_source_factory,
         self.api_list_data_source_factory,
         object_store_creator)
 
     self.api_data_source_factory.SetReferenceResolverFactory(
         self.ref_resolver_factory)
 
     # Note: samples are super slow in the dev server because it doesn't support
@@ skipping 56 matching lines @@
 
   @staticmethod
   def ForTest(file_system):
     object_store_creator = ObjectStoreCreator.ForTest()
     return ServerInstance('test',
                           object_store_creator,
                           file_system,
                           EmptyDirFileSystem(),
                           '',
                           CompiledFileSystem.Factory(file_system,
-                                                     object_store_creator))
+                                                     object_store_creator),
+                          TestBranchUtility.CreateWithCannedData(),
+                          HostFileSystemCreator.ForTest(file_system,
+                                                        object_store_creator))
 
   @staticmethod
   def ForLocal():
     channel = 'trunk'
     object_store_creator = ObjectStoreCreator(channel,
                                               start_empty=False,
                                               store_type=TestObjectStore)
-    file_system = CachingFileSystem(LocalFileSystem.Create(),
-                                    object_store_creator)
+    host_file_system_creator = HostFileSystemCreator.ForLocal(
+        object_store_creator)
+    trunk_file_system = host_file_system_creator.CreateAtBranch('trunk')
     return ServerInstance(
         channel,
         object_store_creator,
-        file_system,
+        trunk_file_system,
         EmptyDirFileSystem(),
         '',
-        CompiledFileSystem.Factory(file_system, object_store_creator))
+        CompiledFileSystem.Factory(trunk_file_system, object_store_creator),
+        TestBranchUtility.CreateWithCannedData(),
+        host_file_system_creator)