piecrust2: piecrust/serving/server.py comparison

comparison piecrust/serving/server.py @ 555:daf8df5ade7d

serve: Refactor the server to make pieces usable by the debugging middleware.

author	Ludovic Chabant <ludovic@chabant.com>
date	Wed, 12 Aug 2015 23:04:46 -0700
parents	155c7e20414f
children	657384f08ca3

comparison

equal deleted inserted replaced

-:155c7e20414f
+:daf8df5ade7d
 from werkzeug.exceptions import (
 NotFound, MethodNotAllowed, InternalServerError, HTTPException)
 from werkzeug.wrappers import Request, Response
 from jinja2 import FileSystemLoader, Environment
 from piecrust import CACHE_DIR, RESOURCES_DIR
-from piecrust.app import PieCrust
+from piecrust.rendering import PageRenderingContext, render_page
-from piecrust.rendering import QualifiedPage, PageRenderingContext, render_page
+from piecrust.routing import RouteNotFoundError
-from piecrust.serving.util import content_type_map, make_wrapped_file_response
+from piecrust.serving.util import (
-from piecrust.sources.base import MODE_PARSING
+content_type_map, make_wrapped_file_response, get_requested_page,
-from piecrust.uriutil import split_sub_uri
+get_app_for_server)
+from piecrust.sources.base import SourceNotFoundError
 logger = logging.getLogger(__name__)
 def get_description(self, environ=None):
 from werkzeug.utils import escape
 desc = '<p>' + self.description + '</p>'
 desc += '<p>'
 for nfe in self._nfes:
-desc += '<li>' + escape(nfe.description) + '</li>'
+desc += '<li>' + escape(str(nfe)) + '</li>'
 desc += '</p>'
 return desc
 class Server(object):
 response = self._try_serve_asset(environ, request)
 if response is not None:
 return response
 # Create the app for this request.
-app = PieCrust(root_dir=self.root_dir, debug=self.debug)
+app = get_app_for_server(self.root_dir, debug=self.debug,
-if self.sub_cache_dir:
+sub_cache_dir=self.sub_cache_dir)
-app._useSubCacheDir(self.sub_cache_dir)
-app.config.set('site/root', '/')
-app.config.set('server/is_serving', True)
 if (app.config.get('site/enable_debug_info') and
 self.enable_debug_info and
 '!debug' in request.args):
 app.config.set('site/show_debug_info', True)
 return None
 return make_wrapped_file_response(environ, request, full_path)
 def _try_serve_page(self, app, environ, request):
-# Try to find what matches the requested URL.
+# Find a matching page.
-req_path, page_num = split_sub_uri(app, request.path)
+req_page = get_requested_page(app, request.path)
-routes = find_routes(app.routes, req_path)
+# If we haven't found any good match, report all the places we didn't
-if len(routes) == 0:
+# find it at.
-raise RouteNotFoundError("Can't find route for: %s" % req_path)
+qp = req_page.qualified_page
+if qp is None:
-rendered_page = None
+msg = "Can't find path for '%s':" % request.path
-not_found_errors = []
+raise MultipleNotFound(msg, req_page.not_found_errors)
-for route, route_metadata in routes:
-try:
+# We have a page, let's try to render it.
-logger.debug("Trying to render match from source '%s'." %
+render_ctx = PageRenderingContext(qp,
-route.source_name)
+page_num=req_page.page_num,
-rendered_page = self._try_render_page(
+force_render=True)
-app, route, route_metadata, page_num, req_path)
+if qp.route.taxonomy_name is not None:
-if rendered_page is not None:
+taxonomy = app.getTaxonomy(qp.route.taxonomy_name)
-break
+tax_terms = qp.route.getTaxonomyTerms(qp.route_metadata)
-except NotFound as nfe:
+render_ctx.setTaxonomyFilter(tax_terms, needs_slugifier=True)
-not_found_errors.append(nfe)
+# See if this page is known to use sources. If that's the case,
-# If we haven't found any good match, raise whatever exception we
+# just don't use cached rendered segments for that page (but still
-# first got. Otherwise, raise a generic exception.
+# use them for pages that are included in it).
-if rendered_page is None:
+uri = qp.getUri()
-msg = ("Can't find path for '%s', looked in sources: %s" %
+entry = self._page_record.getEntry(uri, req_page.page_num)
-(req_path,
+if (qp.route.taxonomy_name is not None or entry is None or
-', '.join([r.source_name for r, _ in routes])))
+entry.used_source_names):
-raise MultipleNotFound(msg, not_found_errors)
+cache_key = '%s:%s' % (uri, req_page.page_num)
+app.env.rendered_segments_repository.invalidate(cache_key)
+# Render the page.
+rendered_page = render_page(render_ctx)
+# Check if this page is a taxonomy page that actually doesn't match
+# anything.
+if qp.route.taxonomy_name is not None:
+paginator = rendered_page.data.get('pagination')
+if (paginator and paginator.is_loaded and
+len(paginator.items) == 0):
+taxonomy = app.getTaxonomy(qp.route.taxonomy_name)
+message = ("This URL matched a route for taxonomy '%s' but "
+"no pages have been found to have it. This page "
+"won't be generated by a bake." % taxonomy.name)
+raise NotFound(message)
+# Remember stuff for next time.
+if entry is None:
+entry = ServeRecordPageEntry(req_page.req_path, req_page.page_num)
+self._page_record.addEntry(entry)
+for p, pinfo in render_ctx.render_passes.items():
+entry.used_source_names |= pinfo.used_source_names
 # Start doing stuff.
 page = rendered_page.page
 rp_content = rendered_page.content
 "falling back to uncompressed.")
 response.set_data(rp_content)
 return response
-def _try_render_page(self, app, route, route_metadata, page_num, req_path):
-# Match the route to an actual factory.
-taxonomy_info = None
-source = app.getSource(route.source_name)
-if route.taxonomy_name is None:
-factory = source.findPageFactory(route_metadata, MODE_PARSING)
-if factory is None:
-raise NotFound("No path found for '%s' in source '%s'." %
-(req_path, source.name))
-else:
-taxonomy = app.getTaxonomy(route.taxonomy_name)
-tax_terms = route.getTaxonomyTerms(route_metadata)
-taxonomy_info = (taxonomy, tax_terms)
-tax_page_ref = taxonomy.getPageRef(source)
-factory = tax_page_ref.getFactory()
-# Build the page.
-page = factory.buildPage()
-# We force the rendering of the page because it could not have
-# changed, but include pages that did change.
-qp = QualifiedPage(page, route, route_metadata)
-render_ctx = PageRenderingContext(qp,
-page_num=page_num,
-force_render=True)
-if taxonomy_info is not None:
-_, tax_terms = taxonomy_info
-render_ctx.setTaxonomyFilter(tax_terms, needs_slugifier=True)
-# See if this page is known to use sources. If that's the case,
-# just don't use cached rendered segments for that page (but still
-# use them for pages that are included in it).
-uri = qp.getUri()
-entry = self._page_record.getEntry(uri, page_num)
-if (taxonomy_info is not None or entry is None or
-entry.used_source_names):
-cache_key = '%s:%s' % (uri, page_num)
-app.env.rendered_segments_repository.invalidate(cache_key)
-# Render the page.
-rendered_page = render_page(render_ctx)
-# Check if this page is a taxonomy page that actually doesn't match
-# anything.
-if taxonomy_info is not None:
-paginator = rendered_page.data.get('pagination')
-if (paginator and paginator.is_loaded and
-len(paginator.items) == 0):
-taxonomy = taxonomy_info[0]
-message = ("This URL matched a route for taxonomy '%s' but "
-"no pages have been found to have it. This page "
-"won't be generated by a bake." % taxonomy.name)
-raise NotFound(message)
-# Remember stuff for next time.
-if entry is None:
-entry = ServeRecordPageEntry(req_path, page_num)
-self._page_record.addEntry(entry)
-for p, pinfo in render_ctx.render_passes.items():
-entry.used_source_names |= pinfo.used_source_names
-# Ok all good.
-return rendered_page
 def _handle_error(self, exception, environ, start_response):
 code = 500
 if isinstance(exception, HTTPException):
 code = exception.code
 inner_ex = exception.__context__
 exception = inner_ex
 return desc
-class RouteNotFoundError(Exception):
-pass
-class SourceNotFoundError(Exception):
-pass
-def find_routes(routes, uri):
-res = []
-tax_res = []
-for route in routes:
-metadata = route.matchUri(uri)
-if metadata is not None:
-if route.is_taxonomy_route:
-tax_res.append((route, metadata))
-else:
-res.append((route, metadata))
-return res + tax_res
 class ErrorMessageLoader(FileSystemLoader):
 def __init__(self):
 base_dir = os.path.join(RESOURCES_DIR, 'messages')
 super(ErrorMessageLoader, self).__init__(base_dir)

Mercurial > piecrust2

comparison piecrust/serving/server.py @ 555:daf8df5ade7d