Better

Author: Noname

python/fserver.py

@@ -37,19 +37,18 @@ def error(self, req):
 '''
 
 @click.command('start')
-@click.option('--port', '-p', default=9999)
+@click.option('--port', '-p', default=9999, help="FastCGI port number on localhost")
 @click.option('--ip', '-h', default='127.0.0.1')
-@click.option('--vhost', '-v', default='cloudfire-demo.coinkite.com')
+@click.option('--vhost', '-v', help="Virtual hostname to use")
 @click.option('--redis-url', '-r', default='redis://localhost:6379/', help="URL for Redis server")
-@click.option('--debug', '-d', is_flag=True, help="Runs locally as web server")
-def start_server(ip, port, debug, redis_url, vhost):
+@click.option('--devmode', '-d', is_flag=False, help="Runs locally as web server. Dev only")
+def start_server(ip, port, devmode, redis_url, vhost):
 	from example_app import app
 
 	RDB = redis.Redis.from_url(redis_url)
 
 	app.my_vhosts.append(vhost)
 	app.redis = RDB
-	app.debug = True
 
 	app.start_bg_tasks()
 
@@ -61,8 +60,9 @@ def start_server(ip, port, debug, redis_url, vhost):
 		sys.exit(1)
 
 
-	if debug:
-		app.run(host="0.0.0.0", port=port, debug=True)
+	if devmode:
+		app.debug = True
+		app.run(host="0.0.0.0", port=port)
 	else:
 		print "Running as FastCGI at %s:%d" % (ip, port)
 		MyWSGIServer(app, bindAddress=(ip, port), multiplexed=True, umask=0).run()

python/start.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# NOTE: this assumes you're using a virtualenv called "ENV" in this directory
+#
+PY=ENV/bin/python
+VHOST=cloudfire-demo.coinkite.com
+
+# update in-memory version of static files
+$PY upload.py multi http://$VHOST/static/ ../img
+
+# start a fast-cgi server.
+$PY fserver.py -r unix:../redis.sock --vhost $VHOST

python/static

@@ -0,0 +1 @@
+../img

python/upload.py

@@ -26,6 +26,7 @@ def blacklist_filename(fn):
 	return False
 
 def better_mimes(fname):
+	# sigh, mimetypes.guess_type is incomplete...
 	if fname.endswith('.svg'):
 		return 'image/svg+xml'
 	if fname.endswith('.md'):
@@ -69,11 +70,9 @@ def upload_file(host, fd, absurl):
 	needs_write = False
 
 	ct, enc = guess_type(absurl, strict=False)
-	print "%s = %s" % (absurl, ct)
 	if not ct:
 		ct = better_mimes(absurl)
-		if not ct:
-			ct = 'text/html'
+		assert ct, "No good mime type for: %s" % absurl
 	if not enc and ct and ct.startswith('text/'):
 		enc = 'utf-8'
 
@@ -125,7 +124,7 @@ def multi(baseurl, topdir):
 				continue
 			fname = os.path.join(root, fn)
 			url = os.path.join(baseurl, fname[len(topdir)+1:])
-			print '%s => %s' % (fname, url)
+			#print '%s => %s' % (fname, url)
 			wr = upload_file(host, click.open_file(fname), url)
 			if wr: needs_write = True