made some important fixes

1 files changed, 40 insertions, 83 deletions

diff --git a/pbserver.py b/pbserver.py
index 82198ab..cea6314 100755
--- a/pbserver.py
+++ b/pbserver.py
@@ -6,7 +6,6 @@ from imgrid import Imgrid
 from breaker import Breaker
 from s3config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME
 
-
 import os
 import sys
 import db
@@ -17,11 +16,11 @@ from subprocess import call, Popen, PIPE
 import simplejson as json
 BIN_IDENTIFY = "/usr/bin/identify"
 
-#try:
-#    DB = db.db ()
-#except Exception as e:
-#    sys.stderr.write("Could not connect to db:\n{}".format(e))
-#    sys.exit(1);
+try:
+    DB = db.db ()
+except Exception as e:
+    sys.stderr.write("Could not connect to db:\n{}".format(e))
+    sys.exit(1);
 BASE_URL = "http://i.asdf.us"
 
 def hashdir(filename):
@@ -77,36 +76,42 @@ def insert_cmd (date, remote_addr, username, url, directory, oldfile, newfile, c
         sys.stderr.write(str(e))
         return
 
+def return_image(im, insert_url="NULL"):
+    directory = hashdir(im.filename)
+    dimensions = bin_identify(im.filepath)
+    objectname = "{}/{}".format(directory, im.filename)
+    try:
+        s3move(im.filepath, objectname)
+    #    return "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}".format(
+        insert_cmd(
+            im.now, 
+            request.environ.get('REMOTE_ADDR'),
+            im.params['username'] or "NULL",
+            insert_url,
+            directory,
+            "NULL",
+            im.filename, 
+            ";".join(im.commands),
+            json.dumps(im.params),
+            im.tag,
+        )
+        return json.loads({
+            'url' : "{}/{}".format(BASE_URL, objectname)
+            'size' : file_size(im.filepath),
+            'width' : "{}px".format(dimensions[0]),
+            'height' : "{}px".format(dimensions[1]),
+        })
+    except Exception as e:
+        sys.stderr.write(str(e))
+        raise;
+        
+
 @post('/gradient')
 def gradient():
     try:
         im = Gradient(request.forms)
         im.create();
-        directory = hashdir(im.filename)
-        dimensions = bin_identify(im.filepath)
-        objectname = "{}/{}".format(directory, im.filename)
-#        s3move(im.filepath, objectname)
-        return(im.filepath, objectname)
-#    return "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}".format(
-#    insert_cmd(
-#        im.now, 
-#        request.environ.get('REMOTE_ADDR'),
-#        im.params['username'] or "NULL",
-#        "NULL",
-#        directory,
-#        "NULL",
-#        im.filename, 
-#        ";".join(im.commands),
-#        json.dumps(im.params),
-#        im.tag,
-#    )
-    return json.loads({
-        'url' : "{}/{}".format(BASE_URL, objectname)
-        'size' : file_size(im.filepath),
-        'width' : "{}px".format(dimensions[0]),
-        'height' : "{}px".format(dimensions[1]),
-    })
-    #URL, FILESIZE, WIDTH, HEIGHT to replace index.html
+        return return_image(im)
     except Exception as e:
         sys.stderr.write(str(e))
         raise;
@@ -116,67 +121,19 @@ def imgrid():
     try:
         im = Imgrid(request.forms)
         im.create();
-        directory = hashdir(im.filename)
-        dimensions = bin_identify(im.filepath)
-        objectname = "{}/{}".format(directory, im.filename)
-#        s3move(im.filepath, objectname)
-        return(im.filepath, objectname)
-#    return "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}".format(
-#    insert_cmd(
-#        im.now, 
-#        request.environ.get('REMOTE_ADDR'),
-#        im.params['username'] or "NULL",
-#        im.params.imageinstead or im.params.bgimage or im.params.planebgimage or "NULL",
-#        directory,
-#        "NULL",
-#        im.filename, 
-#        ";".join(im.commands),
-#        json.dumps(im.params),
-#        im.tag,
-#    )
-    return json.loads({
-        'url' : "{}/{}".format(BASE_URL, objectname)
-        'size' : file_size(im.filepath),
-        'width' : "{}px".format(dimensions[0]),
-        'height' : "{}px".format(dimensions[1]),
-    })
-    #URL, FILESIZE, WIDTH, HEIGHT to replace main.js
+        return return_image(im, im.params.imageinstead or im.params.bgimage or im.params.planebgimage or "NULL")
     except Exception as e:
         sys.stderr.write(str(e))
-        raise;
+        return json.load({ 'error' : 'Request could not be processed' })
 
 @post('/breaker')
 def breaker():
     try:
         im = Breaker(request.forms)
         im.create();
-        directory = hashdir(im.filename)
-        dimensions = bin_identify(im.filepath)
-        objectname = "{}/{}".format(directory, im.filename)
-#        s3move(im.filepath, objectname)
-        return(im.filepath, objectname)
-#    return "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}".format(
-#    insert_cmd(
-#        im.now, 
-#        request.environ.get('REMOTE_ADDR'),
-#        im.params['username'] or "NULL",
-#        im.params['url'],
-#        directory,
-#        "NULL",
-#        im.filename, 
-#        ";".join(im.commands),
-#        json.dumps(im.params),
-#        im.tag,
-#    )
-    return json.loads({
-        'url' : "{}/{}".format(BASE_URL, objectname)
-        'size' : file_size(im.filepath),
-        'width' : "{}px".format(dimensions[0]),
-        'height' : "{}px".format(dimensions[1]),
-    })
-    #URL, FILESIZE, WIDTH, HEIGHT to replace main.js make sure you use px
+        return return_image(im, im.params['url'])
     except Exception as e:
         sys.stderr.write(str(e))
-        raise;
+        return json.load({ 'error' : 'Request could not be processed' })
 
 run(host='0.0.0.0', port=8999, debug=True)