diff piecrust/commands/builtin/baking.py @ 205:e725af1d48fb

bake: Changes in how assets directories are configured. Change `skip_patterns` and `force_patterns` to `ignore` and `force`. Put less responsibility on the `bake` command to specify all those settings, and more on the `Baker` and `ProcessorPipeline` themselves. Add some tests.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 18 Jan 2015 12:12:57 -0800
parents 0c9de41689bb
children a47580a0955b
line wrap: on
line diff
--- a/piecrust/commands/builtin/baking.py	Sun Jan 18 11:53:18 2015 -0800
+++ b/piecrust/commands/builtin/baking.py	Sun Jan 18 12:12:57 2015 -0800
@@ -61,29 +61,15 @@
             return 1
 
     def _bakeSources(self, ctx, out_dir):
-        num_workers = ctx.app.config.get('baker/workers') or 4
         baker = Baker(
                 ctx.app, out_dir,
-                force=ctx.args.force,
-                no_assets=ctx.args.no_assets,
-                num_workers=num_workers)
+                force=ctx.args.force)
         baker.bake()
 
     def _bakeAssets(self, ctx, out_dir):
-        baker_params = ctx.app.config.get('baker') or {}
-        mounts = (baker_params.get('assets_dirs') or
-                  ctx.app.assets_dirs)
-        skip_patterns = (baker_params.get('ignore') or
-                         baker_params.get('skip_patterns'))
-        force_patterns = (baker_params.get('force') or
-                          baker_params.get('force_patterns'))
-        num_workers = ctx.app.config.get('baker/workers') or 4
         proc = ProcessorPipeline(
-                ctx.app, mounts, out_dir,
-                force=ctx.args.force,
-                skip_patterns=skip_patterns,
-                force_patterns=force_patterns,
-                num_workers=num_workers)
+                ctx.app, out_dir,
+                force=ctx.args.force)
         proc.run()