# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1392654861 28800
# Node ID 1e3275ff5dfc4c6f4ec69feab8ef5ae8097cd970
# Parent  c6dd9b0c5009849c65527516e15d0f555e548fd4
Make `--debug` only for debug logging. Use `--dev` for using dev assets.

diff -r c6dd9b0c5009 -r 1e3275ff5dfc wikked/commands/web.py
--- 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,
diff -r c6dd9b0c5009 -r 1e3275ff5dfc wikked/views/read.py
--- 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()));
 
diff -r c6dd9b0c5009 -r 1e3275ff5dfc wikked/web.py
--- 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)