piecrust2: piecrust/main.py comparison

comparison piecrust/main.py @ 852:4850f8c21b6e

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	cd3a00455b87
children	eed19a80c00e

comparison

equal deleted inserted replaced

-:2c7e57d80bba
+:4850f8c21b6e
 import logging
 import argparse
 import colorama
 from piecrust import APP_VERSION
 from piecrust.app import (
-PieCrust, PieCrustConfiguration, apply_variant_and_values)
+PieCrustFactory, PieCrustConfiguration)
 from piecrust.chefutil import (
 format_timed, log_friendly_exception, print_help_item)
 from piecrust.commands.base import CommandContext
 from piecrust.pathutil import SiteNotFoundError, find_app_root
 from piecrust.plugins.base import PluginLoader
 logger = logging.getLogger(__name__)
 class ColoredFormatter(logging.Formatter):
 COLORS = {
 'DEBUG': colorama.Fore.BLACK + colorama.Style.BRIGHT,
 'INFO': '',
 'WARNING': colorama.Fore.YELLOW,
 'ERROR': colorama.Fore.RED,
 'CRITICAL': colorama.Back.RED + colorama.Fore.WHITE
 }
 def __init__(self, fmt=None, datefmt=None):
 super(ColoredFormatter, self).__init__(fmt, datefmt)
 def format(self, record):
 sys.exit(exit_code)
 def _setup_main_parser_arguments(parser):
 parser.add_argument(
 '--version',
 action='version',
 version=('%(prog)s ' + APP_VERSION))
 parser.add_argument(
 '--root',
 help="The root directory of the website.")
 parser.add_argument(
 '--theme',
 action='store_true',
 help="Makes the current command apply to a theme website.")
 parser.add_argument(
 '--config',
 dest='config_variant',
 help="The configuration variant to use for this command.")
 parser.add_argument(
 '--config-set',
 nargs=2,
 metavar=('NAME', 'VALUE'),
 action='append',
 dest='config_values',
 help="Sets a specific site configuration setting.")
 parser.add_argument(
 '--debug',
 help="Show debug information.", action='store_true')
 parser.add_argument(
 '--debug-only',
 action='append',
 help="Only show debug information for the given categories.")
 parser.add_argument(
 '--no-cache',
 help="When applicable, disable caching.",
 action='store_true')
 parser.add_argument(
 '--quiet',
 help="Print only important information.",
 action='store_true')
 parser.add_argument(
 '--log',
 dest='log_file',
 help="Send log messages to the specified file.")
 parser.add_argument(
 '--log-debug',
 help="Log debug messages to the log file.",
 action='store_true')
 parser.add_argument(
 '--no-color',
 help="Don't use colorized output.",
 action='store_true')
 parser.add_argument(
 '--pid-file',
 dest='pid_file',
 help="Write a PID file for the current process.")
 """ Kinda hacky, but we want the `serve` command to use a different cache
 so that PieCrust doesn't need to re-render all the pages when going
 between `serve` and `bake` (or, worse, *not* re-render them all correctly
 and end up serving or baking the wrong version).
 """
 _command_caches = {
 'serve': 'server'}
 def _pre_parse_chef_args(argv):
 # We need to parse some arguments before we can build the actual argument
 # parser, because it can affect which plugins will be loaded. Also, log-
 root = None
 # Can't apply custom configuration stuff if there's no website.
 if (pre_args.config_variant or pre_args.config_values) and not root:
 raise SiteNotFoundError(
 "Can't apply any configuration variant or value overrides, "
 "there is no website here.")
 if root:
 cache_key = None
 if not pre_args.no_cache:
 cache_key = _build_cache_key(pre_args)
-app = PieCrust(
+appfactory = PieCrustFactory(
 root,
 theme_site=pre_args.theme,
 cache=(not pre_args.no_cache),
 cache_key=cache_key,
-debug=pre_args.debug)
+debug=pre_args.debug,
-apply_variant_and_values(
+config_variant=pre_args.config_variant,
-app, pre_args.config_variant, pre_args.config_values)
+config_values=pre_args.config_values)
+app = appfactory.create()
 else:
+appfactory = None
 app = NullPieCrust(
 theme_site=pre_args.theme)
 # Setup the arg parser.
 parser = argparse.ArgumentParser(
 prog='chef',
 description="The PieCrust chef manages your website.",
 formatter_class=argparse.RawDescriptionHelpFormatter)
 _setup_main_parser_arguments(parser)
 commands = sorted(app.plugin_loader.getCommands(),
 key=lambda c: c.name)
 subparsers = parser.add_subparsers(title='list of commands')
 if not hasattr(result, 'func'):
 parser.print_help()
 return 0
 # Run the command!
-ctx = CommandContext(app, parser, result)
+ctx = CommandContext(appfactory, app, parser, result)
-ctx.config_variant = pre_args.config_variant
-ctx.config_values = pre_args.config_values
 exit_code = result.func(ctx)
 if exit_code is None:
 return 0
 if not isinstance(exit_code, int):
 logger.error("Got non-integer exit code: %s" % exit_code)

Mercurial > piecrust2

comparison piecrust/main.py @ 852:4850f8c21b6e