Mercurial > piecrust2

diff piecrust/processing/base.py @ 852:4850f8c21b6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: Start of the big refactor for PieCrust 3.0. * Everything is a `ContentSource`, including assets directories. * Most content sources are subclasses of the base file-system source. * A source is processed by a "pipeline", and there are 2 built-in pipelines, one for assets and one for pages. The asset pipeline is vaguely functional, but the page pipeline is completely broken right now. * Rewrite the baking process as just running appropriate pipelines on each content item. This should allow for better parallelization.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 17 May 2017 00:11:48 -0700
parents c4b3a7fd2f87
children 08e02c2a2a1a
line wrap: on
line diff
--- a/piecrust/processing/base.py	Sat Apr 29 21:42:22 2017 -0700
+++ b/piecrust/processing/base.py	Wed May 17 00:11:48 2017 -0700
@@ -1,4 +1,3 @@
-import shutil
 import os.path
 import logging
 
@@ -11,26 +10,31 @@
 PRIORITY_LAST = 1
 
 
-class PipelineContext(object):
-    def __init__(self, worker_id, app, out_dir, tmp_dir, force=None):
-        self.worker_id = worker_id
-        self.app = app
-        self.out_dir = out_dir
-        self.tmp_dir = tmp_dir
-        self.force = force
-        self.record = None
-        self._additional_ignore_patterns = []
+FORCE_BUILD = object()
+
+
+class ProcessorContext:
+    def __init__(self, pipeline, pipeline_ctx):
+        self.ignore_patterns = []
+        self.extra_processors = []
+        self._pipeline = pipeline
+        self._pipeline_ctx = pipeline_ctx
 
     @property
-    def is_first_worker(self):
-        return self.worker_id == 0
+    def tmp_dir(self):
+        return self._pipeline.tmp_dir
 
     @property
-    def is_pipeline_process(self):
-        return self.worker_id < 0
+    def out_dir(self):
+        return self._pipeline_ctx.out_dir
 
-    def addIgnorePatterns(self, patterns):
-        self._additional_ignore_patterns += patterns
+    @property
+    def worker_id(self):
+        return self._pipeline_ctx.worker_id
+
+    @property
+    def is_main_process(self):
+        return self._pipeline_ctx.is_main_process
 
 
 class Processor(object):
@@ -63,24 +67,12 @@
         pass
 
 
-class CopyFileProcessor(Processor):
-    PROCESSOR_NAME = 'copy'
-
-    def __init__(self):
-        super(CopyFileProcessor, self).__init__()
-        self.priority = PRIORITY_LAST
+class ExternalProcessException(Exception):
+    def __init__(self, stderr_data):
+        self.stderr_data = stderr_data
 
-    def matches(self, path):
-        return True
-
-    def getOutputFilenames(self, filename):
-        return [filename]
-
-    def process(self, path, out_dir):
-        out_path = os.path.join(out_dir, os.path.basename(path))
-        logger.debug("Copying: %s -> %s" % (path, out_path))
-        shutil.copyfile(path, out_path)
-        return True
+    def __str__(self):
+        return self.stderr_data
 
 
 class SimpleFileProcessor(Processor):
@@ -109,12 +101,3 @@
     def _doProcess(self, in_path, out_path):
         raise NotImplementedError()
 
-
-class ExternalProcessException(Exception):
-    def __init__(self, stderr_data):
-        self.stderr_data = stderr_data
-
-    def __str__(self):
-        return self.stderr_data
-
-