piecrust2: piecrust/sources/taxonomy.py comparison

comparison piecrust/sources/taxonomy.py @ 989:8adc27285d93

bake: Big pass on bake performance. - Reduce the amount of data passed between processes. - Make inter-process data simple objects to make it easier to test with alternatives to pickle. - Make sources have the basic requirement to be able to find a content item from an item spec (path). - Make Hoedown the default Markdown formatter.

author	Ludovic Chabant <ludovic@chabant.com>
date	Sun, 19 Nov 2017 14:29:17 -0800
parents	45ad976712ec
children	1857dbd4580f

comparison

equal deleted inserted replaced

-:f83ae0a5d793
+:8adc27285d93
 from piecrust.configuration import ConfigurationError
 from piecrust.data.filters import (
 PaginationFilter, SettingFilterClause)
 from piecrust.page import Page
 from piecrust.pipelines._pagebaker import PageBaker
-from piecrust.pipelines._pagerecords import PagePipelineRecordEntry
+from piecrust.pipelines._pagerecords import (
+PagePipelineRecordEntry,
+add_page_job_result, merge_job_result_into_record_entry)
 from piecrust.pipelines.base import (
-ContentPipeline, get_record_name_for_source)
+ContentPipeline, get_record_name_for_source,
+create_job, content_item_from_job)
 from piecrust.pipelines.records import RecordHistory
 from piecrust.routing import RouteParameter
 from piecrust.sources.base import ContentItem
 from piecrust.sources.generator import GeneratorSourceBase
 param_type = (RouteParameter.TYPE_PATH if self.taxonomy.is_multiple
 else RouteParameter.TYPE_STRING)
 return [RouteParameter(name, param_type,
 variadic=self.taxonomy.is_multiple)]
-def findContent(self, route_params):
+def findContentFromRoute(self, route_params):
 slugified_term = route_params[self.taxonomy.term_name]
 spec = '_index'
 metadata = {'term': slugified_term,
-'record_entry_spec': '_index[%s]' % slugified_term,
 'route_params': {
 self.taxonomy.term_name: slugified_term}
 }
 return ContentItem(spec, metadata)
 slugified_values = self.slugify(str(values))
 route_val = slugified_values
 # We need to register this use of a taxonomy term.
 rcs = self.app.env.render_ctx_stack
-cpi = rcs.current_ctx.current_pass_info
+ri = rcs.current_ctx.render_info
-if cpi:
+utt = ri.get('used_taxonomy_terms')
-utt = cpi.getCustomInfo('used_taxonomy_terms')
+if utt is None:
-if utt is None:
+utt = set()
-utt = set()
+utt.add(slugified_values)
-utt.add(slugified_values)
+ri['used_taxonomy_terms'] = utt
-cpi.setCustomInfo('used_taxonomy_terms', utt)
+else:
-else:
+utt.add(slugified_values)
-utt.add(slugified_values)
 # Put the slugified values in the route metadata so they're used to
 # generate the URL.
 route_params[self.taxonomy.term_name] = route_val
 logger.debug("Queuing %d '%s' jobs." %
 (len(self._analyzer.dirty_slugified_terms),
 self.taxonomy.name))
 jobs = []
+rec_fac = self.createRecordEntry
+current_record = ctx.current_record
 for slugified_term in self._analyzer.dirty_slugified_terms:
-item = ContentItem(
+item_spec = '_index'
-'_index',
+record_entry_spec = '_index[%s]' % slugified_term
-{'term': slugified_term,
-'record_entry_spec': '_index[%s]' % slugified_term,
+jobs.append(create_job(self, item_spec,
-'route_params': {
+term=slugified_term,
-self.taxonomy.term_name: slugified_term}
+record_entry_spec=record_entry_spec))
-})
-jobs.append(self.createJob(item))
+entry = rec_fac(record_entry_spec)
+current_record.addEntry(entry)
 if len(jobs) > 0:
 return jobs
 return None
 def run(self, job, ctx, result):
-content_item = job.content_item
+term = job['term']
+content_item = ContentItem('_index',
+{'term': term,
+'route_params': {
+self.taxonomy.term_name: term}
+})
+page = Page(self.source, content_item)
 logger.debug("Rendering '%s' page: %s" %
-(self.taxonomy.name, content_item.metadata['term']))
+(self.taxonomy.name, page.source_metadata['term']))
-page = Page(self.source, job.content_item)
 prev_entry = ctx.previous_entry
-cur_entry = result.record_entry
+rdr_subs = self._pagebaker.bake(page, prev_entry)
-cur_entry.term = content_item.metadata['term']
-self._pagebaker.bake(page, prev_entry, cur_entry)
+add_page_job_result(result)
+result['subs'] = rdr_subs
+result['term'] = page.source_metadata['term']
+def handleJobResult(self, result, ctx):
+existing = ctx.record_entry
+merge_job_result_into_record_entry(existing, result)
+existing.term = result['term']
 def postJobRun(self, ctx):
 # We create bake entries for all the terms that were *not* dirty.
 # This is because otherwise, on the next incremental bake, we wouldn't
 # find any entry for those things, and figure that we need to delete
 self._addTerms(
 slugifier, cur_entry.item_spec, cur_terms)
 # Re-bake all taxonomy terms that include new or changed pages, by
 # marking them as 'dirty'.
-previous_records = self.record_histories.previous
+history = self.record_histories.getHistory(record_name).copy()
-prev_rec = previous_records.getRecord(record_name)
-history = RecordHistory(prev_rec, cur_rec)
 history.build()
 for prev_entry, cur_entry in history.diffs:
 entries = [cur_entry]
 if prev_entry:
 entries.append(prev_entry)
 def _get_all_entry_taxonomy_terms(entry):
 res = set()
 for o in entry.subs:
-for pinfo in o.render_info:
+pinfo = o['render_info']
-if pinfo:
+terms = pinfo.get('used_taxonomy_terms')
-terms = pinfo.getCustomInfo('used_taxonomy_terms')
+if terms:
-if terms:
+res |= set(terms)
-res |= set(terms)
 return res
 class _Slugifier(object):
 def __init__(self, taxonomy, mode):

Mercurial > piecrust2

comparison piecrust/sources/taxonomy.py @ 989:8adc27285d93