1 files changed, 6 insertions, 28 deletions
diff --git a/share/Flask_test/pbserver.py b/share/Flask_test/pbserver.py
index 70796d3..3d0caa8 100755
--- a/share/Flask_test/pbserver.py
+++ b/share/Flask_test/pbserver.py
@@ -1,41 +1,20 @@
 #!/usr/bin/python2.7
 from bottle import route, run, post, request, static_file
-import sys
 sys.path.append("./lib")
-#FIXME probably can get away with import * here
-from Pb.Break import PbBreak
-from Pb.Generate import PbGenerate
-from Pb.Gradient import PbGradient
-from Pb.Grid import PbGrid
-from Pb.Landscape import PbLandscape
-from Pb.Pattern import PbPattern
+from Pb import *
+import sys, os
 
-from Config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME, BIN_IDENTIFY
-from Pb import Pb
-from Db import Db
-
-import os
-import sys
-
-import sha
 from subprocess import call, Popen, PIPE
-import simplejson as json
-
-#
-
-def return_image(im, insert_url="NULL"):
-  return format_im_data(im, insert_url)
-
 
+#FIXME add
 def return_jsonp(im, insert_url="NULL"):    
   return "{}({})".format(im.get("callback"), format_im_data(im, insert_url))
 
-
 def _pb_post(pb_class, request):
   try:
       im = pb_class(**(dict(request.forms)))
       im.create();
-      return return_image(im)
+      return im.file_json();
   except Exception as e:
       sys.stderr.write("%s failure" % pb_class.__name__)
       sys.stderr.write("params:\n")
@@ -67,9 +46,8 @@ def pattern():
 def imlandscape():
   _pb_post(Imlandscape, request)
 
-
-
 #static routes
+#{{{
 @route('/im/<filename>')
 def server_static(filename):
     return static_file(filename, root='frontend/im/')
@@ -103,7 +81,7 @@ def server_static(filename):
 @route('/img/<filename>')
 def server_static(filename):
     return static_file(filename, root='frontend/img/')
-
+#}}}
 
 run(host='0.0.0.0', server='flup', port=8999, debug=True)
 #run(host='0.0.0.0',  port=8999, debug=True)