Docserver: Pull knowledge of host file systems into a single

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

 # Copyright 2013 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
 from urlparse import urlsplit
 
 from data_source_registry import CreateDataSources
@@ skipping 31 matching lines @@
     redirect = server_instance.redirector.Redirect(self._request.host, path)
     if redirect is not None:
       return Response.Redirect(redirect)
 
     canonical_result = server_instance.path_canonicalizer.Canonicalize(path)
     redirect = canonical_result.path.lstrip('/')
     if path != redirect:
       return Response.Redirect('/' + redirect,
                                permanent=canonical_result.permanent)
 
+    trunk_fs = server_instance.host_file_system_provider.GetTrunk()
     templates = server_instance.template_data_source_factory.Create(
         self._request,
         CreateDataSources(server_instance, self._request))
 
     content = None
     content_type = None
 
     try:
       # At this point, any valid paths ending with '/' have been redirected.
       # Therefore, the response should be a 404 Not Found.
       if path.endswith('/'):
         pass
       elif fnmatch(path, 'extensions/examples/*.zip'):
         content = server_instance.example_zipper.Create(
             path[len('extensions/'):-len('.zip')])
         content_type = 'application/zip'
       elif path.startswith('extensions/examples/'):
         mimetype = mimetypes.guess_type(path)[0] or 'text/plain'
-        content = server_instance.host_file_system.ReadSingle(
+        content = trunk_fs.ReadSingle(
             '%s/%s' % (svn_constants.DOCS_PATH, path[len('extensions/'):]),
             binary=_IsBinaryMimetype(mimetype))
         content_type = mimetype
       elif path.startswith('static/'):
         mimetype = mimetypes.guess_type(path)[0] or 'text/plain'
-        content = server_instance.host_file_system.ReadSingle(
+        content = trunk_fs.ReadSingle(
             ('%s/%s' % (svn_constants.DOCS_PATH, path)),
             binary=_IsBinaryMimetype(mimetype))
         content_type = mimetype
       elif path.endswith('.html'):
         content = templates.Render(path)
         content_type = 'text/html'
       else:
         content = None
     except FileNotFoundError:
       content = None
 
     headers = {'x-frame-options': 'sameorigin'}
     if content is None:
       content = (templates.Render('%s/404' % path.split('/', 1)[0]) or
                  templates.Render('extensions/404'))
       return Response.NotFound(content, headers=headers)
 
     if not content:
       logging.error('%s had empty content' % path)
 
     headers.update({
       'content-type': content_type,
       'cache-control': 'max-age=300',
     })
     return Response.Ok(content, headers=headers)