Mercurial > wikked
changeset 208:1e3275ff5dfc
Make `--debug` only for debug logging. Use `--dev` for using dev assets.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Mon, 17 Feb 2014 08:34:21 -0800 |
parents | c6dd9b0c5009 |
children | 540d1ce51b38 |
files | wikked/commands/web.py wikked/views/read.py wikked/web.py |
diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/wikked/commands/web.py Mon Feb 17 08:34:14 2014 -0800 +++ b/wikked/commands/web.py Mon Feb 17 08:34:21 2014 -0800 @@ -20,6 +20,9 @@ parser.add_argument('--port', help="The port to use", default=5000) + parser.add_argument('-d', '--dev', + help="Use development assets", + action='store_true') def run(self, ctx): # Change working directory because the Flask app can currently @@ -28,10 +31,16 @@ os.chdir(ctx.params.root) from wikked.web import app + + # Setup the app. + if ctx.args.dev: + app.config['DEV_ASSETS'] = True + app.wiki_params = ctx.params if bool(app.config.get('UPDATE_WIKI_ON_START')): ctx.wiki.update() + # Run! debug_mode = ctx.args.debug or app.config.get('DEBUG', False) app.run( host=ctx.args.host,
--- a/wikked/views/read.py Mon Feb 17 08:34:14 2014 -0800 +++ b/wikked/views/read.py Mon Feb 17 08:34:21 2014 -0800 @@ -13,7 +13,7 @@ @app.route('/') def home(): tpl_name = 'index.html' - if app.config['DEBUG']: + if app.config['DEV_ASSETS']: tpl_name = 'index-dev.html' return render_template(tpl_name, cache_bust=('?%d' % time.time())); @@ -21,7 +21,7 @@ @app.route('/read/<path:url>') def read(): tpl_name = 'index.html' - if app.config['DEBUG']: + if app.config['DEV_ASSETS']: tpl_name = 'index-dev.html' return render_template(tpl_name, cache_bust=('?%d' % time.time())); @@ -29,7 +29,7 @@ @app.route('/search') def search(): tpl_name = 'index.html' - if app.config['DEBUG']: + if app.config['DEV_ASSETS']: tpl_name = 'index-dev.html' return render_template(tpl_name, cache_bust=('?%d' % time.time()));
--- a/wikked/web.py Mon Feb 17 08:34:14 2014 -0800 +++ b/wikked/web.py Mon Feb 17 08:34:21 2014 -0800 @@ -16,6 +16,7 @@ # Setup some config defaults. +app.config.setdefault('DEV_ASSETS', False) app.config.setdefault('SQL_DEBUG', False) app.config.setdefault('SQL_COMMIT_ON_TEARDOWN', False) app.config.setdefault('WIKI_ROOT', None)