github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Template loading on demand get_templates was transformed into get_template.

Browse source
This commit is contained in:
Alexander Artemenko 2011-01-02 02:50:08 +03:00
commit fd47a74b9e
3 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/settings.rst
View file

@ -34,6 +34,8 @@ Setting name what it does ?
`DEFAULT_LANG` The default language to use. Default is 'en'. `DEFAULT_LANG` The default language to use. Default is 'en'.
`DISPLAY_PAGES_ON_MENU` Display or not the pages on the menu of the template. `DISPLAY_PAGES_ON_MENU` Display or not the pages on the menu of the template.
Templates can follow or not this settings. Templates can follow or not this settings.
`DIRECT_TEMPLATES` Tuple, containing templates to render. There should be
a html file for each of these templates in the theme.
`FALLBACK_ON_FS_DATE` If True, pelican will use the file system dates infos `FALLBACK_ON_FS_DATE` If True, pelican will use the file system dates infos
(mtime) if it can't get informations from the (mtime) if it can't get informations from the
metadata? metadata?

41
pelican/generators.py
View file

@ -16,7 +16,6 @@ from pelican.readers import read_file
_TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories', _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
'archives', 'page') 'archives', 'page')
_DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
class Generator(object): class Generator(object):
@ -30,21 +29,23 @@ class Generator(object):
for arg, value in kwargs.items(): for arg, value in kwargs.items():
setattr(self, arg, value) setattr(self, arg, value)
def get_templates(self): # templates cache
"""Return the templates to use. self._templates = {}
self._templates_path = os.path.expanduser(os.path.join(self.theme, 'templates'))
self._env = Environment(loader = FileSystemLoader(self._templates_path))
def get_template(self, name):
"""Return the template by name.
Use self.theme to get the templates to use, and return a list of Use self.theme to get the templates to use, and return a list of
templates ready to use with Jinja2. templates ready to use with Jinja2.
""" """
path = os.path.expanduser(os.path.join(self.theme, 'templates')) if name not in self._templates:
env = Environment(loader=FileSystemLoader(path))
templates = {}
for template in _TEMPLATES:
try: try:
templates[template] = env.get_template('%s.html' % template) self._templates[name] = self._env.get_template(name + '.html')
except TemplateNotFound: except TemplateNotFound:
raise Exception('[templates] unable to load %s.html from %s' % ( raise Exception('[templates] unable to load %s.html from %s' % (
template, path)) name, self._templates_path))
return templates return self._templates[name]
def get_files(self, path, exclude=[], extensions=None): def get_files(self, path, exclude=[], extensions=None):
"""Return a list of files to use, based on rules """Return a list of files to use, based on rules
@ -130,23 +131,28 @@ class ArticlesGenerator(Generator):
"""Generate the pages on the disk """Generate the pages on the disk
TODO: change the name""" TODO: change the name"""
templates = self.get_templates()
write = partial( write = partial(
writer.write_file, writer.write_file,
relative_urls = self.settings.get('RELATIVE_URLS') relative_urls = self.settings.get('RELATIVE_URLS')
) )
for template in _DIRECT_TEMPLATES: for template in self.settings.get('DIRECT_TEMPLATES'):
write('%s.html' % template, templates[template], self.context, write('%s.html' % template, self.get_template(template), self.context,
blog=True) blog=True)
tag_template = self.get_template('tag')
for tag, articles in self.tags.items(): for tag, articles in self.tags.items():
write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag, write('tag/%s.html' % tag, tag_template, self.context, tag=tag,
articles=articles) articles=articles)
category_template = self.get_template('category')
for cat in self.categories: for cat in self.categories:
write('category/%s.html' % cat, templates['category'], self.context, write('category/%s.html' % cat, category_template, self.context,
category=cat, articles=self.categories[cat]) category=cat, articles=self.categories[cat])
article_template = self.get_template('article')
for article in chain(self.translations, self.articles): for article in chain(self.translations, self.articles):
write(article.save_as, write(article.save_as,
templates['article'], self.context, article=article, article_template, self.context, article=article,
category=article.category) category=article.category)
def generate_context(self): def generate_context(self):
@ -252,9 +258,8 @@ class PagesGenerator(Generator):
self.context['PAGES'] = self.pages self.context['PAGES'] = self.pages
def generate_output(self, writer): def generate_output(self, writer):
templates = self.get_templates()
for page in chain(self.translations, self.pages): for page in chain(self.translations, self.pages):
writer.write_file('pages/%s' % page.save_as, templates['page'], writer.write_file('pages/%s' % page.save_as, self.get_template('page'),
self.context, page=page, self.context, page=page,
relative_urls = self.settings.get('RELATIVE_URLS')) relative_urls = self.settings.get('RELATIVE_URLS'))

1
pelican/settings.py
View file

@ -24,6 +24,7 @@ _DEFAULT_CONFIG = {'PATH': None,
'DEFAULT_LANG': 'en', 'DEFAULT_LANG': 'en',
'TAG_CLOUD_STEPS': 4, 'TAG_CLOUD_STEPS': 4,
'TAG_CLOUD_MAX_ITEMS': 100, 'TAG_CLOUD_MAX_ITEMS': 100,
'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
} }
def read_settings(filename): def read_settings(filename):