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

Fix generator caching

Browse source 
With generator level caching, cached files weren't added to the
collections. Only new files were processed. This fixes the issue.
This commit is contained in:
Deniz Turgut 2016-12-10 01:58:38 -05:00
commit fc52234986
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pelican/generators.py
View file

@ -533,7 +533,7 @@ class ArticlesGenerator(CachingGenerator):
continue continue
if article_or_draft.status.lower() == "published": if article_or_draft.status.lower() == "published":
all_articles.append(article_or_draft) pass
elif article_or_draft.status.lower() == "draft": elif article_or_draft.status.lower() == "draft":
article_or_draft = self.readers.read_file( article_or_draft = self.readers.read_file(
base_path=self.path, path=f, content_class=Draft, base_path=self.path, path=f, content_class=Draft,
@ -542,8 +542,6 @@ class ArticlesGenerator(CachingGenerator):
preread_sender=self, preread_sender=self,
context_signal=signals.article_generator_context, context_signal=signals.article_generator_context,
context_sender=self) context_sender=self)
self.add_source_path(article_or_draft)
all_drafts.append(article_or_draft)
else: else:
logger.error( logger.error(
"Unknown status '%s' for file %s, skipping it.", "Unknown status '%s' for file %s, skipping it.",
@ -553,6 +551,10 @@ class ArticlesGenerator(CachingGenerator):
self.cache_data(f, article_or_draft) self.cache_data(f, article_or_draft)
if article_or_draft.status.lower() == "published":
all_articles.append(article_or_draft)
else:
all_drafts.append(article_or_draft)
self.add_source_path(article_or_draft) self.add_source_path(article_or_draft)
self.articles, self.translations = process_translations( self.articles, self.translations = process_translations(
@ -636,11 +638,7 @@ class PagesGenerator(CachingGenerator):
self._add_failed_source_path(f) self._add_failed_source_path(f)
continue continue
if page.status.lower() == "published": if page.status.lower() not in ("published", "hidden"):
all_pages.append(page)
elif page.status.lower() == "hidden":
hidden_pages.append(page)
else:
logger.error( logger.error(
"Unknown status '%s' for file %s, skipping it.", "Unknown status '%s' for file %s, skipping it.",
page.status, f) page.status, f)
@ -649,6 +647,10 @@ class PagesGenerator(CachingGenerator):
self.cache_data(f, page) self.cache_data(f, page)
if page.status.lower() == "published":
all_pages.append(page)
elif page.status.lower() == "hidden":
hidden_pages.append(page)
self.add_source_path(page) self.add_source_path(page)
self.pages, self.translations = process_translations( self.pages, self.translations = process_translations(