Merge branch 'master' of github.com:getpelican/pelican

This commit is contained in:
Alexis Métaireau 2012-11-21 15:58:16 +01:00
commit aee59f42ef
4 changed files with 5 additions and 1 deletions

View file

@ -63,6 +63,8 @@ finalized pelican object invoked after al
- minifying js/css assets.
- notify/ping search engines with an updated sitemap.
article_generate_context article_generator, metadata
article_generate_preread article_generator invoked before a article is read in ArticlesGenerator.generate_context;
use if code needs to do something before every article is parsed
article_generator_init article_generator invoked in the ArticlesGenerator.__init__
article_generator_finalized article_generator invoked at the end of ArticlesGenerator.generate_context
get_generators generators invoked in Pelican.get_generator_classes,

View file

@ -5,7 +5,6 @@ import logging
import functools
from datetime import datetime
from os import getenv
from sys import platform, stdin
@ -15,6 +14,7 @@ from pelican import signals
logger = logging.getLogger(__name__)
class Page(object):
"""Represents a page
Given a content, and metadata, create an adequate object.

View file

@ -307,6 +307,7 @@ class ArticlesGenerator(Generator):
article_path,
exclude=self.settings['ARTICLE_EXCLUDES']):
try:
signals.article_generate_preread.send(self)
content, metadata = read_file(f, settings=self.settings)
except Exception, e:
logger.warning(u'Could not process %s\n%s' % (f, str(e)))

View file

@ -2,6 +2,7 @@ from blinker import signal
initialized = signal('pelican_initialized')
finalized = signal('pelican_finalized')
article_generate_preread = signal('article_generate_preread')
article_generate_context = signal('article_generate_context')
article_generator_init = signal('article_generator_init')
article_generator_finalized = signal('article_generate_finalized')