piecrust2: piecrust/appconfig.py comparison

comparison piecrust/appconfig.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	b8f089092281
children	f070a4fc033c

comparison

equal deleted inserted replaced

-:2c7e57d80bba
+:4850f8c21b6e
 default_content_model_base,
 get_default_content_model, get_default_content_model_for_blog)
 from piecrust.cache import NullCache
 from piecrust.configuration import (
 Configuration, ConfigurationError, ConfigurationLoader,
-try_get_dict_values, try_get_dict_value, set_dict_value,
+try_get_dict_values, set_dict_value,
-merge_dicts, visit_dict,
+merge_dicts, visit_dict)
-MERGE_NEW_VALUES, MERGE_OVERWRITE_VALUES, MERGE_PREPEND_LISTS,
-MERGE_APPEND_LISTS)
 from piecrust.sources.base import REALM_USER, REALM_THEME
 logger = logging.getLogger(__name__)
 # If we have a theme, apply the theme on that. So stuff like routes
 # will now look like:
 # [custom theme] + [default theme] + [default]
 if theme_values is not None:
 self._processThemeLayer(theme_values, values)
-merge_dicts(values, theme_values)
 # Make all sources belong to the "theme" realm at this point.
 srcc = values['site'].get('sources')
 if srcc:
 for sn, sc in srcc.items():
 # Now we apply the site stuff. We want to end up with:
 # [custom site] + [default site] + [custom theme] + [default theme] +
 #   [default]
 if site_values is not None:
 self._processSiteLayer(site_values, values)
-merge_dicts(values, site_values)
 # Set the theme site flag.
 if self.theme_config:
 values['site']['theme_site'] = True
 def _processThemeLayer(self, theme_values, values):
 # Generate the default theme model.
 gen_default_theme_model = bool(try_get_dict_values(
 (theme_values, 'site/use_default_theme_content'),
-(values, 'site/use_default_theme_content'),
 default=True))
 if gen_default_theme_model:
-self._generateDefaultThemeModel(theme_values, values)
+logger.debug("Generating default theme content model...")
+cc = copy.deepcopy(default_theme_content_model_base)
+merge_dicts(values, cc)
+# Merge the theme config into the result config.
+merge_dicts(values, theme_values)
 def _processSiteLayer(self, site_values, values):
 # Default site content.
 gen_default_site_model = bool(try_get_dict_values(
 (site_values, 'site/use_default_content'),
 (values, 'site/use_default_content'),
 default=True))
 if gen_default_site_model:
-self._generateDefaultSiteModel(site_values, values)
+logger.debug("Generating default content model...")
+cc = copy.deepcopy(default_content_model_base)
-def _generateDefaultThemeModel(self, theme_values, values):
+merge_dicts(values, cc)
-logger.debug("Generating default theme content model...")
-cc = copy.deepcopy(default_theme_content_model_base)
+dcm = get_default_content_model(site_values, values)
-merge_dicts(values, cc)
+merge_dicts(values, dcm)
-def _generateDefaultSiteModel(self, site_values, values):
+blogsc = try_get_dict_values(
-logger.debug("Generating default content model...")
+(site_values, 'site/blogs'),
-cc = copy.deepcopy(default_content_model_base)
+(values, 'site/blogs'))
-merge_dicts(values, cc)
+if blogsc is None:
+blogsc = ['posts']
-dcm = get_default_content_model(site_values, values)
+set_dict_value(site_values, 'site/blogs', blogsc)
-merge_dicts(values, dcm)
+is_only_blog = (len(blogsc) == 1)
-blogsc = try_get_dict_values(
+for blog_name in reversed(blogsc):
-(site_values, 'site/blogs'),
+blog_cfg = get_default_content_model_for_blog(
-(values, 'site/blogs'))
+blog_name, is_only_blog, site_values, values,
-if blogsc is None:
+theme_site=self.theme_config)
-blogsc = ['posts']
+merge_dicts(values, blog_cfg)
-set_dict_value(site_values, 'site/blogs', blogsc)
+# Merge the site config into the result config.
-is_only_blog = (len(blogsc) == 1)
+merge_dicts(values, site_values)
-for blog_name in reversed(blogsc):
-blog_cfg = get_default_content_model_for_blog(
-blog_name, is_only_blog, site_values, values,
-theme_site=self.theme_config)
-merge_dicts(values, blog_cfg)
 def _validateAll(self, values):
 if values is None:
 values = {}
 if not routes:
 raise ConfigurationError("No routes were defined.")
 taxonomies = v.get('taxonomies')
 if taxonomies is None:
 v['taxonomies'] = {}
-generators = v.get('generators')
-if generators is None:
-v['generators'] = {}
 return v
 # Make sure the site root ends with a slash.
 def _validate_site_root(v, values, cache):
 raise ConfigurationError("The 'site/auto_formats' setting must be "
 "a dictionary.")
 v.setdefault('html', values['site']['default_format'])
 auto_formats_re = r"\.(%s)$" % (
 '|'.join(
 [re.escape(i) for i in list(v.keys())]))
 cache.write('auto_formats_re', auto_formats_re)
 return v
 # Check that the default auto-format is known.
 def _validate_site_default_auto_format(v, values, cache):
 if v not in values['site']['auto_formats']:
 raise ConfigurationError(
 "Default auto-format '%s' is not declared." % v)
 return v
 # Cache pagination suffix regex and format.
 def _validate_site_pagination_suffix(v, values, cache):
 raise ConfigurationError("All sources in 'site/sources' must "
 "be dictionaries.")
 sc.setdefault('type', 'default')
 sc.setdefault('fs_endpoint', sn)
 sc.setdefault('ignore_missing_dir', False)
-sc.setdefault('data_endpoint', sn)
+sc.setdefault('data_endpoint', None)
 sc.setdefault('data_type', 'iterator')
 sc.setdefault('item_name', sn)
 sc.setdefault('items_per_page', 5)
 sc.setdefault('date_format', DEFAULT_DATE_FORMAT)
 sc.setdefault('realm', REALM_USER)
+sc.setdefault('pipeline', 'page')
 # Validate endpoints.
 endpoint = sc['data_endpoint']
 if endpoint in reserved_endpoints:
 raise ConfigurationError(
 "Source '%s' is using a reserved endpoint name: %s" %
 (sn, endpoint))
-# Validate generators.
-for gn, gc in sc.get('generators', {}).items():
-if not isinstance(gc, dict):
-raise ConfigurationError(
-"Generators for source '%s' should be defined in a "
-"dictionary." % sn)
-gc['source'] = sn
 return v
 def _validate_site_routes(v, values, cache):
 "have an 'url'.")
 if rc_url[0] != '/':
 raise ConfigurationError("Route URLs must start with '/'.")
 r_source = rc.get('source')
-r_generator = rc.get('generator')
+if r_source is None:
-if r_source is None and r_generator is None:
+raise ConfigurationError("Routes must specify a source.")
-raise ConfigurationError("Routes must specify a source or "
-"generator.")
 if (r_source and
 r_source not in list(values['site']['sources'].keys())):
 raise ConfigurationError("Route is referencing unknown "
 "source: %s" % r_source)
-if (r_generator and
-r_generator not in list(values['site']['generators'].keys())):
+rc.setdefault('pass', 0)
-raise ConfigurationError("Route is referencing unknown "
-"generator: %s" % r_generator)
-rc.setdefault('generator', None)
 rc.setdefault('page_suffix', '/%num%')
 return v
 def _validate_site_taxonomies(v, values, cache):
 if not isinstance(v, dict):
 raise ConfigurationError(
 "The 'site/taxonomies' setting must be a mapping.")
 for tn, tc in v.items():
 tc.setdefault('multiple', False)
 tc.setdefault('term', tn)
 tc.setdefault('page', '_%s.%%ext%%' % tc['term'])
-return v
-def _validate_site_generators(v, values, cache):
-if not isinstance(v, dict):
-raise ConfigurationError(
-"The 'site/generators' setting must be a mapping.")
-for gn, gc in v.items():
-if 'type' not in gc:
-raise ConfigurationError(
-"Generator '%s' doesn't specify a type." % gn)
 return v
 def _validate_site_plugins(v, values, cache):
 if isinstance(v, str):
 v = v.split(',')
 elif not isinstance(v, list):
 raise ConfigurationError(
 "The 'site/plugins' setting must be an array, or a "
 "comma-separated list.")
 return v

Mercurial > piecrust2

comparison piecrust/appconfig.py @ 852:4850f8c21b6e