master

11 files changed, 31 insertions, 29 deletions

diff --git a/lib/__init__.py b/pb/__init__.py
index e69de29..e69de29 100644
--- a/lib/__init__.py
+++ b/pb/__init__.py
diff --git a/breaker.py b/pb/breaker.py
index 06c89cf..c982b14 100755
--- a/breaker.py
+++ b/pb/breaker.py
@@ -3,9 +3,9 @@ import os
 import sys
 import random
 import re
-import lib.utils as utils
+import pb.lib.utils as utils
 import urllib
-from config import *
+from pb.config import *
 
 DEFAULT_FINALFORMAT = "png";
 SUBTLE_BREAK_MARK = 'pron'
@@ -41,6 +41,7 @@ class Breaker():
             "username",
             "expanded"
         ]
+        self.now = utils.now()
         self.files_created = []
         for k in self._required_keys:
             if k in kwargs:
@@ -133,7 +134,7 @@ class Breaker():
           raise;
       if (len(name_part) > 20):
           name_part = name_part[:-20]
-      return "{}{}_{}_{}".format(self.tag, name_part, utils.now(), self.params.username or ""), file_format 
+      return "{}{}_{}_{}".format(self.tag, name_part, self.now, self.params.username or ""), file_format 
 
 #{{{#########rotatefunctions#######################################  
     def _rotate(self):
diff --git a/config.py b/pb/config.py
index b849b9e..b849b9e 100644
--- a/config.py
+++ b/pb/config.py
diff --git a/gradient.py b/pb/gradient.py
index 68de55b..724b37c 100755
--- a/gradient.py
+++ b/pb/gradient.py
@@ -6,8 +6,8 @@ import simplejson as json
 import sys

 import os

 import sha

-import lib.utils as utils

-from config import *

+import pb.lib.utils as utils

+from pb.config import *

 

 

 PARAM_LIST = [ 

@@ -52,6 +52,7 @@ class Gradient:
         self.commands = []

         self.filename = ""

         self.filepath = ""

+        self.now = utils.now()

 

         params = {}

         for key in PARAM_LIST:

@@ -83,7 +84,7 @@ class Gradient:
                                          self.tag, 

                                          self.params['color1'].replace('#','').replace('(','-').replace(')','-'),

                                          self.params['color2'].replace('#','').replace('(','-').replace(')','-'),

-                                         utils.now(),                                         

+                                         self.now,                                         

                                          self.params['username'],

                                          self.params['filetype'] or DEFAULT_FORMAT, 

                                          )

diff --git a/imgrid.py b/pb/imgrid.py
index e294066..f75ec4a 100755
--- a/imgrid.py
+++ b/pb/imgrid.py
@@ -4,8 +4,8 @@ import re
 import os
 import simplejson as json
 import random
-import lib.utils as utils
-from config import *
+import pb.lib.utils as utils
+from pb.config import *
 import tempfile
 
 DEFAULT_HEIGHT = 400
@@ -44,6 +44,7 @@ class Imgrid():
             "username"
 #}}}
         ]
+        self.now = utils.now()
         
         #Work out params ...
         #note, tmpfile lib is pretty much useless here, given imagemagick's behavior with gifs (it splits them) etc...
@@ -95,7 +96,7 @@ class Imgrid():
     def _get_filename(self):
         return "{}_{}_{}".format(
             self.tag,
-            utils.now(),
+            self.now,
             self.params.username or ""
         );
 
@@ -107,7 +108,7 @@ class Imgrid():
         raise Exception("Unable to call cmd {}".format(str(cmd)))
 
     def _make_tempname(self, s):
-      return "IMGRIDTMP{}{}".format(utils.now(), s); 
+      return "IMGRIDTMP{}{}".format(self.now, s); 
 
 
     #makes a canvas file...step 1 (if not bgimage)
diff --git a/pb/lib/__init__.py b/pb/lib/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pb/lib/__init__.py
diff --git a/lib/db.py b/pb/lib/db.py
index 2570b4f..2570b4f 100755
--- a/lib/db.py
+++ b/pb/lib/db.py
diff --git a/lib/utils.py b/pb/lib/utils.py
index a662869..3630ba0 100644
--- a/lib/utils.py
+++ b/pb/lib/utils.py
@@ -1,5 +1,5 @@
 import re
-from config import *
+from pb.config import *
 import time 
 import urllib
 import urllib2
diff --git a/pattern.py b/pb/pattern.py
index 5470004..359af20 100755
--- a/pattern.py
+++ b/pb/pattern.py
@@ -4,7 +4,7 @@ import sys
 import random
 import re
 import urllib
-from config import *
+from pb.config import *
 import lib.utils as utils
 
 import simplejson as json
@@ -19,6 +19,7 @@ class Pattern:
         self.tag = "imPattern";
         self._pid = str(os.getpid())
         self.commands = [];
+        self.now = utils.now()
         self.height = ""
         self.width = ""
         self._required_keys = [
@@ -125,7 +126,7 @@ class Pattern:
             raise;
         if (len(name_part) > 20):
             name_part = name_part[:-20]
-        return "{}{}_{}_{}".format(self.tag, name_part, utils.now(), self.params.username or ""), file_format 
+        return "{}{}_{}_{}".format(self.tag, name_part, self.now, self.params.username or ""), file_format 
 
     def _cleanup(self):
         cmd = ["rm"]+self.files_created
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:
diff --git a/test.sh b/test.sh
index 8892abd..855c655 100644
--- a/test.sh
+++ b/test.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-curl --data 'width=200&height=500&stripes=true&stripenumber=50&stripeintensity=50&color1=green&color2=silver' localhost:8999/gradient
-echo ""
 curl --data 'width=200&height=500' localhost:8999/imgrid
 echo ""
 curl --data 'url=http://i.asdf.us/im/56/6005101large_1424913577_bike.gif&breaktype=RGB_WASH&breakmode=extreme' localhost:8999/breaker