diff options
Diffstat (limited to 'pbserver.py')
| -rwxr-xr-x | pbserver.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pbserver.py b/pbserver.py index 25de07a..36a53a1 100755 --- a/pbserver.py +++ b/pbserver.py @@ -70,7 +70,8 @@ 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"): + +def format_im_data(im, insert_url="NULL"): directory = hashdir(im.filename) dimensions = bin_identify(im.filepath) size = utils.file_size(im.filepath) @@ -78,7 +79,6 @@ def return_image(im, insert_url="NULL"): try: s3move(im.filepath, objectname) cleanup(im.filepath) -# # return "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}".format( insert_cmd( im.now, request.environ.get('REMOTE_ADDR'), @@ -100,7 +100,15 @@ def return_image(im, insert_url="NULL"): except Exception as e: sys.stderr.write(str(e)) raise; - + + +def return_image(im, insert_url="NULL"): + return format_im_data(im, insert_url) + + +def return_jsonp(im, insert_url="NULL"): + return "{}({})".format(im.get("callback"), format_im_data(im, insert_url)) + @post('/im/api/imgradient') def gradient(): @@ -158,9 +166,7 @@ def pattern(): im.create(); return return_image(im, im.params['image_url']) except Exception as e: - sys.stderr.write(str(e)) - sys.stderr.write("imgradient failure\n") - sys.stderr.write("params:\n") + sys.stderr.write(str(e)+"\n") for i in request.forms: sys.stderr.write("{}:{}\n".format(i, request.forms[i])) raise; |