Mercurial > piecrust2

diff piecrust/processing/less.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 35d4c172e5a6
children 63be34ce6e65
line wrap: on
line diff
--- a/piecrust/processing/less.py	Sat Apr 29 21:42:22 2017 -0700
+++ b/piecrust/processing/less.py	Wed May 17 00:11:48 2017 -0700
@@ -7,8 +7,7 @@
 import platform
 import subprocess
 from piecrust.processing.base import (
-        SimpleFileProcessor, ExternalProcessException)
-from piecrust.processing.tree import FORCE_BUILD
+    SimpleFileProcessor, ExternalProcessException, FORCE_BUILD)
 
 
 logger = logging.getLogger(__name__)
@@ -22,9 +21,9 @@
         self._conf = None
         self._map_dir = None
 
-    def onPipelineStart(self, pipeline):
-        self._map_dir = os.path.join(pipeline.tmp_dir, 'less')
-        if (pipeline.is_first_worker and
+    def onPipelineStart(self, ctx):
+        self._map_dir = os.path.join(ctx.tmp_dir, 'less')
+        if (ctx.is_main_process and
                 not os.path.isdir(self._map_dir)):
             os.makedirs(self._map_dir)
 
@@ -59,7 +58,7 @@
 
         map_path = self._getMapPath(in_path)
         map_url = '/' + os.path.relpath(
-                map_path, self.app.root_dir).replace('\\', '/')
+            map_path, self.app.root_dir).replace('\\', '/')
 
         # On Windows, it looks like LESSC is confused with paths when the
         # map file is not to be created in the same directory as the input
@@ -67,8 +66,8 @@
         # a mix of relative and absolute paths stuck together).
         # So create it there and move it afterwards... :(
         temp_map_path = os.path.join(
-                os.path.dirname(in_path),
-                os.path.basename(map_path))
+            os.path.dirname(in_path),
+            os.path.basename(map_path))
 
         args = [self._conf['bin'],
                 '--source-map=%s' % temp_map_path,
@@ -83,8 +82,8 @@
         shell = (platform.system() == 'Windows')
         try:
             proc = subprocess.Popen(
-                    args, shell=shell,
-                    stderr=subprocess.PIPE)
+                args, shell=shell,
+                stderr=subprocess.PIPE)
             stdout_data, stderr_data = proc.communicate()
         except FileNotFoundError as ex:
             logger.error("Tried running LESS processor with command: %s" %
@@ -93,7 +92,7 @@
                             "Did you install it?") from ex
         if proc.returncode != 0:
             raise ExternalProcessException(
-                    stderr_data.decode(sys.stderr.encoding))
+                stderr_data.decode(sys.stderr.encoding))
 
         logger.debug("Moving map file: %s -> %s" % (temp_map_path, map_path))
         if os.path.exists(map_path):
@@ -115,8 +114,8 @@
 
     def _getMapPath(self, path):
         map_name = "%s_%s.map" % (
-                os.path.basename(path),
-                hashlib.md5(path.encode('utf8')).hexdigest())
+            os.path.basename(path),
+            hashlib.md5(path.encode('utf8')).hexdigest())
         map_path = os.path.join(self._map_dir, map_name)
         return map_path