Extensions Docs Server: Internal file system

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

Index: chrome/common/extensions/docs/server2/echo_handler.py
diff --git a/chrome/common/extensions/docs/server2/echo_handler.py b/chrome/common/extensions/docs/server2/echo_handler.py
index c962a9073414f61772743531c7c2b9a23483c435..c1c5d267cdc6967f2356e379944d37366ca4ad01 100755
--- a/chrome/common/extensions/docs/server2/echo_handler.py
+++ b/chrome/common/extensions/docs/server2/echo_handler.py
@@ -3,8 +3,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import sys
+import logging
 import os
+import sys
 
 # Add the original server location to sys.path so we are able to import
 # modules from there.
@@ -13,20 +14,26 @@ if os.path.abspath(SERVER_PATH) not in sys.path:
   sys.path.append(os.path.abspath(SERVER_PATH))
 
 import branch_utility
-import urlfetch
 
 from google.appengine.ext import webapp
+from google.appengine.api import memcache
 from google.appengine.ext.webapp.util import run_wsgi_app
 
 from api_data_source import APIDataSource
+from example_zipper import ExampleZipper
 from fetcher_cache import FetcherCache
 from intro_data_source import IntroDataSource
-from local_fetcher import LocalFetcher
+from local_file_system import LocalFileSystem
+from memcache_file_system import MemcacheFileSystem
 from samples_data_source import SamplesDataSource
 from server_instance import ServerInstance
-from subversion_fetcher import SubversionFetcher
+from subversion_file_system import SubversionFileSystem
 from template_data_source import TemplateDataSource
-from example_zipper import ExampleZipper
+from appengine_url_fetcher import AppEngineUrlFetcher
+
+SVN_URL = 'http://src.chromium.org/chrome'
+TRUNK_URL = SVN_URL + '/trunk'
+BRANCH_URL = SVN_URL + '/branches'
 
 EXTENSIONS_PATH = 'chrome/common/extensions'
 DOCS_PATH = 'docs'
@@ -35,7 +42,7 @@ INTRO_PATH = DOCS_PATH + '/server2/templates/intros'
 ARTICLE_PATH = DOCS_PATH + '/server2/templates/articles'
 PUBLIC_TEMPLATE_PATH = DOCS_PATH + '/server2/templates/public'
 PRIVATE_TEMPLATE_PATH = DOCS_PATH + '/server2/templates/private'
-EXAMPLES_PATH = 'examples'
+EXAMPLES_PATH = DOCS_PATH + '/examples'
 FULL_EXAMPLES_PATH = DOCS_PATH + '/' + EXAMPLES_PATH
 
 # The branch that the server will default to when no branch is specified in the
@@ -46,22 +53,30 @@ DEFAULT_BRANCH = 'local'
 # Global cache of instances because the Server is recreated for every request.
 SERVER_INSTANCES = {}
 
+def _GetURLFromBranch(branch):
+    if branch == 'trunk':
+      return TRUNK_URL + '/src'
+    return BRANCH_URL + '/' + branch + '/src'
+
 class Server(webapp.RequestHandler):
   def _GetInstanceForBranch(self, branch):
     if branch in SERVER_INSTANCES:
       return SERVER_INSTANCES[branch]
     if branch == 'local':
-      fetcher = LocalFetcher(EXTENSIONS_PATH)
+      file_system = LocalFileSystem(EXTENSIONS_PATH)
       # No cache for local doc server.
       cache_timeout_seconds = 0
     else:
-      fetcher = SubversionFetcher(branch, EXTENSIONS_PATH, urlfetch)
-      cache_timeout_seconds = 300
-    cache_builder = FetcherCache.Builder(fetcher, cache_timeout_seconds)
+      fetcher = AppEngineUrlFetcher(
+          _GetURLFromBranch(branch) + '/' + EXTENSIONS_PATH)
+      svn_fs = SubversionFileSystem(fetcher)

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

inline svn_fs?

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

Done.

+      file_system = MemcacheFileSystem(svn_fs, memcache)
+      cache_timeout_seconds = 60
+    cache_builder = FetcherCache.Builder(file_system, cache_timeout_seconds)
     api_data_source = APIDataSource(cache_builder, API_PATH)
     intro_data_source = IntroDataSource(cache_builder,
                                         [INTRO_PATH, ARTICLE_PATH])
-    samples_data_source = SamplesDataSource(fetcher,
+    samples_data_source = SamplesDataSource(file_system,
                                             cache_builder,
                                             EXAMPLES_PATH)
     template_data_source = TemplateDataSource(
@@ -71,7 +86,7 @@ class Server(webapp.RequestHandler):
         samples_data_source,
         cache_builder,
         [PUBLIC_TEMPLATE_PATH, PRIVATE_TEMPLATE_PATH])
-    example_zipper = ExampleZipper(fetcher,
+    example_zipper = ExampleZipper(file_system,
                                    cache_builder,
                                    DOCS_PATH,
                                    EXAMPLES_PATH)
@@ -84,14 +99,22 @@ class Server(webapp.RequestHandler):
   def _HandleRequest(self, path):
     channel_name, real_path = (
         branch_utility.SplitChannelNameFromPath(path, default=DEFAULT_BRANCH))
-    branch = branch_utility.GetBranchNumberForChannelName(channel_name,
-                                                          urlfetch)
+    branch = branch_utility.GetBranchNumberForChannelName(
+        channel_name,
+        AppEngineUrlFetcher(''))
     if real_path == '':
       real_path = 'index.html'
     self._GetInstanceForBranch(branch).Get(real_path, self)

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

musing: when branch versions bump, this leaks Server instances. We might want to
add some logic to detect that at some point. Add TODO?

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

Done.

 
   def get(self):
     path = self.request.path
+    if '_ah/warmup' in path:
+      logging.info('Warmup request.')
+      self.get('/chrome/extensions/trunk/samples.html')
+      self.get('/chrome/extensions/dev/samples.html')
+      self.get('/chrome/extensions/beta/samples.html')
+      self.get('/chrome/extensions/stable/samples.html')
+      return
     # Redirect paths like "directory" to "directory/". This is so relative file
     # paths will know to treat this as a directory.
     if os.path.splitext(path)[1] == '' and path[-1] != '/':