diff options
Diffstat (limited to 'nikola/plugins/template')
| -rw-r--r-- | nikola/plugins/template/jinja.py | 24 | ||||
| -rw-r--r-- | nikola/plugins/template/mako.py | 19 |
2 files changed, 28 insertions, 15 deletions
diff --git a/nikola/plugins/template/jinja.py b/nikola/plugins/template/jinja.py index 845f4d5..aec6063 100644 --- a/nikola/plugins/template/jinja.py +++ b/nikola/plugins/template/jinja.py @@ -31,10 +31,11 @@ import json import os from nikola.plugin_categories import TemplateSystem -from nikola.utils import makedirs, req_missing, sort_posts, _smartjoin_filter +from nikola.utils import makedirs, req_missing, slugify, sort_posts, _smartjoin_filter try: import jinja2 + import jinja2.nodes from jinja2 import meta except ImportError: jinja2 = None @@ -66,6 +67,7 @@ class JinjaTemplates(TemplateSystem): self.lookup.filters['tojson'] = json.dumps self.lookup.filters['sort_posts'] = sort_posts self.lookup.filters['smartjoin'] = _smartjoin_filter + self.lookup.filters['slugify'] = slugify self.lookup.globals['enumerate'] = enumerate self.lookup.globals['isinstance'] = isinstance self.lookup.globals['tuple'] = tuple @@ -104,29 +106,35 @@ class JinjaTemplates(TemplateSystem): """Render template to a string using context.""" return self.lookup.from_string(template).render(**context) - def get_string_deps(self, text): + def get_string_deps(self, text, context=None): """Find dependencies for a template string.""" deps = set([]) ast = self.lookup.parse(text) - dep_names = [d for d in meta.find_referenced_templates(ast) if d] + simple_dep_names = [d for d in meta.find_referenced_templates(ast) if d] + formatted_dep_names = [ + imp.template.left.value % (context[imp.template.right.name],) + for imp in ast.find_all(jinja2.nodes.Import) + if isinstance(imp.template, jinja2.nodes.Mod) + ] + dep_names = simple_dep_names + formatted_dep_names for dep_name in dep_names: filename = self.lookup.loader.get_source(self.lookup, dep_name)[1] - sub_deps = [filename] + self.get_deps(filename) + sub_deps = [filename] + self.get_deps(filename, context) self.dependency_cache[dep_name] = sub_deps deps |= set(sub_deps) return list(deps) - def get_deps(self, filename): + def get_deps(self, filename, context=None): """Return paths to dependencies for the template loaded from filename.""" with io.open(filename, 'r', encoding='utf-8-sig') as fd: text = fd.read() - return self.get_string_deps(text) + return self.get_string_deps(text, context) - def template_deps(self, template_name): + def template_deps(self, template_name, context=None): """Generate list of dependencies for a template.""" if self.dependency_cache.get(template_name) is None: filename = self.lookup.loader.get_source(self.lookup, template_name)[1] - self.dependency_cache[template_name] = [filename] + self.get_deps(filename) + self.dependency_cache[template_name] = [filename] + self.get_deps(filename, context) return self.dependency_cache[template_name] def get_template_path(self, template_name): diff --git a/nikola/plugins/template/mako.py b/nikola/plugins/template/mako.py index 8066b96..8197518 100644 --- a/nikola/plugins/template/mako.py +++ b/nikola/plugins/template/mako.py @@ -28,6 +28,7 @@ import io import os +import re import shutil from mako import exceptions, util, lexer, parsetree @@ -52,7 +53,7 @@ class MakoTemplates(TemplateSystem): directories = [] cache_dir = None - def get_string_deps(self, text, filename=None): + def get_string_deps(self, text, context=None, *, filename=None): """Find dependencies for a template string.""" lex = lexer.Lexer(text=text, filename=filename, input_encoding='utf-8') lex.parse() @@ -61,7 +62,11 @@ class MakoTemplates(TemplateSystem): for n in lex.template.nodes: keyword = getattr(n, 'keyword', None) if keyword in ["inherit", "namespace"] or isinstance(n, parsetree.IncludeTag): - deps.append(n.attributes['file']) + filename = n.attributes["file"] + if '${' in filename: + # Support for comment helper inclusions + filename = re.sub(r'''\${context\[['"](.*?)['"]]}''', lambda m: context[m.group(1)], filename) + deps.append(filename) # Some templates will include "foo.tmpl" and we need paths, so normalize them # using the template lookup for i, d in enumerate(deps): @@ -73,10 +78,10 @@ class MakoTemplates(TemplateSystem): d, filename) return deps - def get_deps(self, filename): + def get_deps(self, filename, context=None): """Get paths to dependencies for a template.""" text = util.read_file(filename) - return self.get_string_deps(text, filename) + return self.get_string_deps(text, context, filename=filename) def set_directories(self, directories, cache_folder): """Create a new template lookup with set directories.""" @@ -122,17 +127,17 @@ class MakoTemplates(TemplateSystem): context.update(self.filters) return Template(template, lookup=self.lookup).render(**context) - def template_deps(self, template_name): + def template_deps(self, template_name, context=None): """Generate list of dependencies for a template.""" # We can cache here because dependencies should # not change between runs if self.cache.get(template_name, None) is None: template = self.lookup.get_template(template_name) - dep_filenames = self.get_deps(template.filename) + dep_filenames = self.get_deps(template.filename, context) deps = [template.filename] for fname in dep_filenames: # yes, it uses forward slashes on Windows - deps += self.template_deps(fname.split('/')[-1]) + deps += self.template_deps(fname.split('/')[-1], context) self.cache[template_name] = list(set(deps)) return self.cache[template_name] |