Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

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
 import os
 import traceback
 
 from branch_utility import BranchUtility
 import compiled_file_system as compiled_fs
 from docs_server_utils import FormatKey
 from file_system import FileNotFoundError
 from third_party.handlebar import Handlebar
 import url_constants
 
 EXTENSIONS_URL = '/chrome/extensions'
 
 def _MakeChannelDict(channel_name):
   channel_dict = {
-    'channels': [{'name': name} for name in BranchUtility.GetAllBranchNames()],
+    'channels': [{'name': name} for name in BranchUtility.GetAllChannelNames()],
     'current': channel_name
   }
   for channel in channel_dict['channels']:
     if channel['name'] == channel_name:
       channel['isCurrent'] = True
   return channel_dict
 
 class TemplateDataSource(object):
   """Renders Handlebar templates, providing them with the context in which to
   render.
@@ skipping 90 matching lines @@
       'intros': self._intro_data_source,
       'sidenavs': self._sidenav_data_source,
       'partials': self,
       'samples': self._samples_data_source,
       'static': self._static_resources,
       'app': 'app',
       'extension': 'extension',
       'apps_title': 'Apps',
       'extensions_title': 'Extensions',
       'apps_samples_url': url_constants.GITHUB_BASE,
+      # TODO(kalman): this is wrong, it's always getting from trunk, but meh
+      # it hardly ever shows up (only in the "cannot fetch samples" message).
+      # In fact I don't even know if it can show up anymore due the samples data
+      # being persisent. In any case, when the channel distinctions are gone
+      # this can go away, so, double meh.
       'extensions_samples_url': url_constants.EXTENSIONS_SAMPLES,
       'true': True,
       'false': False
     })
     if render_data.errors:
       logging.error('Handlebar error(s) rendering %s:\n%s' %
           (template_name, '  \n'.join(render_data.errors)))
     return render_data.text
 
   def get(self, key):
     return self.GetTemplate(self._private_template_path, key)
 
   def GetTemplate(self, base_path, template_name):
     try:
       return self._cache.GetFromFile(
           '/'.join((base_path, FormatKey(template_name))))
     except FileNotFoundError as e:
       logging.warning(traceback.format_exc())
       return None