Mercurial > piecrust2

diff piecrust/processing/pipeline.py @ 666:81d9c3a3a0b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
internal: Get rid of the whole "sub cache" business. * Compute cache keys up front, so the cache directory is only chosen once. * Buffer up config variants to apply before loading the config. Makes it possible to cache variant-resulting configs, too. * Make a factory class to reuse the logic that creates the `PieCrust` object correctly for multi-process workers and such. * Add a test.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 03 Mar 2016 08:22:41 -0800
parents 3ceeca7bb71c
children 61d606fbc313
line wrap: on
line diff
--- a/piecrust/processing/pipeline.py	Thu Mar 03 08:19:28 2016 -0800
+++ b/piecrust/processing/pipeline.py	Thu Mar 03 08:22:41 2016 -0800
@@ -27,13 +27,17 @@
 
 
 class ProcessorPipeline(object):
-    def __init__(self, app, out_dir, force=False):
+    def __init__(self, app, out_dir, force=False,
+                 applied_config_variant=None,
+                 applied_config_values=None):
         assert app and out_dir
         self.app = app
         self.out_dir = out_dir
         self.force = force
+        self.applied_config_variant = applied_config_variant
+        self.applied_config_values = applied_config_values
 
-        tmp_dir = app.sub_cache_dir
+        tmp_dir = app.cache_dir
         if not tmp_dir:
             import tempfile
             tmp_dir = os.path.join(tempfile.gettempdir(), 'piecrust')
@@ -246,14 +250,24 @@
         ctx.jobs.append(job)
 
     def _createWorkerPool(self):
+        from piecrust.app import PieCrustFactory
         from piecrust.workerpool import WorkerPool
         from piecrust.processing.worker import (
                 ProcessingWorkerContext, ProcessingWorker)
 
+        appfactory = PieCrustFactory(
+                self.app.root_dir,
+                cache=self.app.cache.enabled,
+                cache_key=self.app.cache_key,
+                config_variant=self.applied_config_variant,
+                config_values=self.applied_config_values,
+                debug=self.app.debug,
+                theme_site=self.app.theme_site)
+
         ctx = ProcessingWorkerContext(
-                self.app.root_dir, self.out_dir, self.tmp_dir,
-                force=self.force, debug=self.app.debug,
-                theme_site=self.app.theme_site)
+                appfactory,
+                self.out_dir, self.tmp_dir,
+                force=self.force)
         ctx.enabled_processors = self.enabled_processors
         if self.additional_processors_factories is not None:
             ctx.additional_processors = [