Extensions Docs Server: TDS fix, no local caching

chrome/common/extensions/docs/server2/template_data_source.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 logging
+
 from path_utils import FormatKey
 from third_party.handlebar import Handlebar
 
 EXTENSIONS_URL = '/chrome/extensions'
 
 def _MakeBranchDict(branch):
   return {
     'showWarning': branch != 'stable',
     'branches': [
       { 'name': 'Stable', 'path': EXTENSIONS_URL + '/stable' },
@@ skipping 19 matching lines @@
   class Factory(object):
     """ A factory to create lightweight TemplateDataSource instances bound to
     individual Requests.
     """
     def __init__(self,
                  branch,
                  api_data_source,
                  intro_data_source,
                  samples_data_source,
                  cache_builder,
-                 base_paths):
+                 public_template_path,
+                 private_template_path):
       self._branch_info = _MakeBranchDict(branch)
       self._static_resources = ((('/' + branch) if branch != 'local' else '') +
                                 '/static')
       self._api_data_source = api_data_source
       self._intro_data_source = intro_data_source
       self._samples_data_source = samples_data_source
       self._cache = cache_builder.build(Handlebar)
-      self._base_paths = base_paths
+      self._public_template_path = public_template_path
+      self._private_template_path = private_template_path
 
     def Create(self, request):
       """ Returns a new TemplateDataSource bound to |request|.
       """
       return TemplateDataSource(self._branch_info,
                                 self._static_resources,
                                 self._api_data_source,
                                 self._intro_data_source,
                                 self._samples_data_source,
                                 self._cache,
-                                self._base_paths,
+                                self._public_template_path,
+                                self._private_template_path,
                                 request)
 
   def __init__(self,
                branch_info,
                static_resources,
                api_data_source,
                intro_data_source,
                samples_data_source,
                cache,
-               base_paths,
+               public_template_path,
+               private_template_path,
                request):
     self._branch_info = branch_info
     self._static_resources = static_resources
     self._api_data_source = api_data_source
     self._intro_data_source = intro_data_source
     self._samples_data_source = samples_data_source
     self._cache = cache
-    self._base_paths = base_paths
+    self._public_template_path = public_template_path
+    self._private_template_path = private_template_path
     self._request = request
 
   def Render(self, template_name):
     """This method will render a template named |template_name|, fetching all
     the partial templates needed from |self._cache|. Partials are retrieved
     from the TemplateDataSource with the |get| method.
     """
-    template = self.get(template_name)
+    template = self.get(template_name, self._public_template_path)
     if not template:
       return ''
       # TODO error handling
     return template.render({
       'apis': self._api_data_source,
       'branchInfo': self._branch_info,
       'intros': self._intro_data_source,
       'partials': self,
       'samples': self._samples_data_source,
       'static': self._static_resources
     }).text
 
   def __getitem__(self, key):
     return self.get(key)
 
-  def get(self, key):
+  def get(self, key, use_path=None):

[not at google - send to devlin, 2012/07/23 13:13:27]

Have two methods rather than overloading, like

  template = self.GetTemplate(self._public_template_path, template_name)

def get(self, key):
  return self.GetTemplate(self._private_template_path, key)

GetTemplate(self, base_path, template_name):
  ...

[cduvall, 2012/07/23 19:04:41]

Done.

     real_path = FormatKey(key)
-    for base_path in self._base_paths:
-      try:
-        return self._cache.GetFromFile(base_path + '/' + real_path)
-      except Exception:
-        pass
-    return None
+    if use_path is None:
+      base_path = self._private_template_path
+    else:
+      base_path = use_path
+    try:
+      return self._cache.GetFromFile(base_path + '/' + real_path)
+    except Exception as e:
+      logging.warn(e)
+      return None