Mercurial > piecrust2
diff piecrust/serving/wrappers.py @ 935:7ecb946bfafd
admin: Lots of fixes for running the admin panel in a WSGI server.
- Use new source APIs in the dashboard to open WIP files.
- Fixed broken/outdated code in some views.
- Fixed cases when Flask is not running at the root URL by using the
`SCRIPT_NAME` variable somewhat more properly.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Wed, 04 Oct 2017 09:15:16 -0700 |
| parents | 33a89139c284 |
| children | 137c9b41edd2 |
line wrap: on
line diff
--- a/piecrust/serving/wrappers.py Wed Oct 04 09:11:58 2017 -0700 +++ b/piecrust/serving/wrappers.py Wed Oct 04 09:15:16 2017 -0700 @@ -142,10 +142,27 @@ app_wrapper.run() +def get_piecrust_server(root_dir, *, + debug=False, + cache_key=None, + serve_site=True, + serve_admin=False, + is_cmdline_mode=False): + from piecrust.app import PieCrustFactory + appfactory = PieCrustFactory(root_dir, + debug=debug, + cache_key=cache_key) + return _get_piecrust_server(appfactory, + serve_site=serve_site, + serve_admin=serve_admin, + is_cmdline_mode=is_cmdline_mode) + + def _get_piecrust_server(appfactory, *, serve_site=True, serve_admin=False, is_cmdline_mode=False, + admin_root_url=None, run_sse_check=None): app = None @@ -164,11 +181,10 @@ if serve_admin: from piecrust.admin.web import create_foodtruck_app - admin_root_url = '/pc-admin' es = { 'FOODTRUCK_CMDLINE_MODE': is_cmdline_mode, - 'FOODTRUCK_ROOT': appfactory.root_dir, - 'FOODTRUCK_URL_PREFIX': admin_root_url, + 'FOODTRUCK_ROOT_DIR': appfactory.root_dir, + 'FOODTRUCK_ROOT_URL': admin_root_url, 'DEBUG': appfactory.debug} if is_cmdline_mode: es.update({ @@ -179,9 +195,11 @@ # Disable PIN protection with Werkzeug's debugger. os.environ['WERKZEUG_DEBUG_PIN'] = 'off' - admin_app = create_foodtruck_app(es) - admin_app.wsgi_app = _PieCrustSiteOrAdminMiddleware( - app, admin_app.wsgi_app, admin_root_url) + admin_app = create_foodtruck_app(es, url_prefix=admin_root_url) + if app is not None: + admin_app.wsgi_app = _PieCrustSiteOrAdminMiddleware( + app, admin_app.wsgi_app, admin_root_url) + app = admin_app return app @@ -203,3 +221,13 @@ if path_info.startswith(self.admin_root_url): return self.admin_app(environ, start_response) return self.main_app(environ, start_response) + + +class _PieCrustAdminScriptNamePatcherMiddleware: + def __init__(self, admin_app, admin_root_url): + self.admin_app = admin_app + self.admin_root_url = '/%s' % admin_root_url.strip('/') + + def __call__(self, environ, start_response): + environ['SCRIPT_NAME'] = self.admin_root_url + return self.admin_app(environ, start_response)