diff options
Diffstat (limited to 'pbserver.py')
| -rwxr-xr-x | pbserver.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pbserver.py b/pbserver.py index 02a17ed..fb7fb65 100755 --- a/pbserver.py +++ b/pbserver.py @@ -1,16 +1,16 @@ #!/usr/bin/python2.7 from bottle import route, run, post, request -from gradient import Gradient -from imgrid import Imgrid -from breaker import Breaker -from pattern import Pattern +from pb.gradient import Gradient +from pb.imgrid import Imgrid +from pb.breaker import Breaker +from pb.pattern import Pattern -from config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME +from pb.config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME import os import sys -import lib.db as db +import pb.lib.db as db import mimetypes import sha from subprocess import call, Popen, PIPE @@ -20,11 +20,11 @@ BIN_IDENTIFY = "/usr/bin/identify" from boto.s3.connection import S3Connection from boto.s3.key import Key # -#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): @@ -126,7 +126,7 @@ def gradient(): @post('/im/api/imgrid') def imgrid(): try: - im = Imgrid(request.forms) + im = Imgrid(**(dict(request.forms))) im.create(); url= "NULL" for elem in [ im.params.imageinstead , im.params.bgimage, im.params.planebgimage ]: @@ -141,7 +141,7 @@ def imgrid(): @post('/im/api/imbreak') def breaker(): try: - im = Breaker(request.forms) + im = Breaker(**(dict(request.forms))) im.create(); return return_image(im, im.params['url']) except Exception as e: @@ -151,7 +151,7 @@ def breaker(): @post('/im/api/impattern') def pattern(): try: - im = Pattern(request.forms) + im = Pattern(**(dict(request.forms))) im.create(); return return_image(im, im.params['image_url']) except Exception as e: |