Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: chrome/common/extensions/docs/server2/template_data_source.py

Issue 14273041: Doc server manifest page generation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Codereview fixes Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/docs/server2/template_data_source.py
diff --git a/chrome/common/extensions/docs/server2/template_data_source.py b/chrome/common/extensions/docs/server2/template_data_source.py
index ba78f434a58b257c1ae225e74937c40e5ab15e92..6777d36bf6af741ad562eb39619bfb4979e9a4ca 100644
--- a/chrome/common/extensions/docs/server2/template_data_source.py
+++ b/chrome/common/extensions/docs/server2/template_data_source.py
@@ -3,11 +3,9 @@
# 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
@@ -20,6 +18,7 @@ def _MakeChannelDict(channel_name):
'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
@@ -50,6 +49,7 @@ class TemplateDataSource(object):
sidenav_data_source_factory,
compiled_fs_factory,
ref_resolver_factory,
+ manifest_data_source,
public_template_path,
private_template_path):
self._branch_info = _MakeChannelDict(channel_name)
@@ -64,6 +64,7 @@ class TemplateDataSource(object):
self._public_template_path = public_template_path
self._private_template_path = private_template_path
self._static_resources = '/%s/static' % channel_name
+ self._manifest_data_source = manifest_data_source
def _CreateTemplate(self, template_name, text):
return Handlebar(self._ref_resolver.ResolveAllLinks(text))
@@ -79,6 +80,7 @@ class TemplateDataSource(object):
self._samples_data_source_factory.Create(request),
self._sidenav_data_source_factory.Create(path),
self._cache,
+ self._manifest_data_source,
self._public_template_path,
self._private_template_path,
self._static_resources)
@@ -91,6 +93,7 @@ class TemplateDataSource(object):
samples_data_source,
sidenav_data_source,
cache,
+ manifest_data_source,
public_template_path,
private_template_path,
static_resources):
@@ -104,6 +107,7 @@ class TemplateDataSource(object):
self._public_template_path = public_template_path
self._private_template_path = private_template_path
self._static_resources = static_resources
+ self._manifest_data_source = manifest_data_source
def Render(self, template_name):
"""This method will render a template named |template_name|, fetching all
@@ -121,6 +125,7 @@ class TemplateDataSource(object):
'intros': self._intro_data_source,
'sidenavs': self._sidenav_data_source,
'partials': self,
+ 'manifest_source': self._manifest_data_source,
'samples': self._samples_data_source,
'static': self._static_resources,
'app': 'app',
@@ -149,6 +154,6 @@ class TemplateDataSource(object):
try:
return self._cache.GetFromFile(
'/'.join((base_path, FormatKey(template_name))))
- except FileNotFoundError as e:
+ except FileNotFoundError:
logging.warning(traceback.format_exc())
return None

Powered by Google App Engine
This is Rietveld 408576698