getting ready to finish the new gallery

2 files changed, 72 insertions, 68 deletions

diff --git a/gallery/gallery.py b/gallery/gallery.py
deleted file mode 100644
index ba3cb70..0000000
--- a/gallery/gallery.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/python2.7
-import os
-import cgi
-import re
-import random
-
-import db
-db = db.db()
-
-BASE_HREF = "http://i.asdf.us/im/"
-PARAMLIST = "addr start limit name interface random tag"
-SQL_LIMIT = 20
-QUERY_LIMIT = 20;
-_TAG_TRANSLATE = {
-    "grid" : "PbGrid",
-    "gradient" : "PbGradient",
-    "break" : "PbBreak",
-    "landscape" : "PbLandscape",
-    "pattern" : "PbPattern",
-    "transparent" : "PbGenerate:transparent",
-    "Over" : "PbGenerate:Over",
-    "ATop" : "PbGenerate:ATop",
-    "Dst_Over" : "PbGenerate:Dst_Over",
-    "Dst_In" : "PbGenerate:Dst_In",
-    "Dst_Out" : "PbGenerate:Dst_Out",
-    "Multiply" : "PbGenerate:Multiply",
-    "Screen" : "PbGenerate:Screen",
-    "Divide" : "PbGenerate:Divide",
-    "Plus" : "PbGenerate:Plus",
-    "Difference" : "PbGenerate:Difference",
-    "Exclusion" : "PbGenerate:Exclusion",
-    "Lighten" : "PbGenerate:Lighten",
-    "Darken" : "PbGenerate:Darken",
-    "Overlay" : "PbGenerate:Overlay",
-    "Hard_Light" : "PbGenerate:Hard_Light",
-    "Soft_Light" : "PbGenerate:Soft_Light",
-    "Pegtop_Light" : "PbGenerate:Pegtop_Light",
-    "Linear_Light" : "PbGenerate:Linear_Light",
-    "Vivid_Light" : "PbGenerate:Vivid_Light",
-    "Pin_Light" : "PbGenerate:Pin_Light",
-    "Linear_Dodge" : "PbGenerate:Linear_Dodge",
-    "Linear_Burn" : "PbGenerate:Linear_Burn",
-    "Color_Dodge" : "PbGenerate:Color_Dodge",
-    "Color_Burn" : "PbGenerate:Color_Burn"
-}
-
-
-class Gallery(object):
-    def __init__(self):
-        pass
-    def select_random(self, tag=None, username=None):
-
-    def _tag_translate(self, tag):
-        return _TAG_TRANSLATE.get(tag, tag)
-
-  def get_files (params):
-      """does a select * from im_cmd
-      with a where clause
-      the where clause needs to search by
-      name
-      id lt or gt
-      tag (using tag translate)
-      random (bool)
-
-      normally the results are ordered by id descending
-      """
-
-params = get_params(PARAMLIST)
diff --git a/photoblaster/gallery.py b/photoblaster/gallery.py
new file mode 100644
index 0000000..5667a07
--- /dev/null
+++ b/photoblaster/gallery.py
@@ -0,0 +1,72 @@
+from photoblaster.db.pb import Pb
+
+BASE_HREF = "http://i.asdf.us/im/"
+PARAMLIST = "addr start limit name interface random tag"
+QUERY_LIMIT = 20
+_TAG_TRANSLATE = {
+    "grid": "PbGrid",
+    "gradient": "PbGradient",
+    "break": "PbBreak",
+    "landscape": "PbLandscape",
+    "pattern": "PbPattern",
+    "transparent": "PbGenerate:transparent",
+    "Over": "PbGenerate:Over",
+    "ATop": "PbGenerate:ATop",
+    "Dst_Over": "PbGenerate:Dst_Over",
+    "Dst_In": "PbGenerate:Dst_In",
+    "Dst_Out": "PbGenerate:Dst_Out",
+    "Multiply": "PbGenerate:Multiply",
+    "Screen": "PbGenerate:Screen",
+    "Divide": "PbGenerate:Divide",
+    "Plus": "PbGenerate:Plus",
+    "Difference": "PbGenerate:Difference",
+    "Exclusion": "PbGenerate:Exclusion",
+    "Lighten": "PbGenerate:Lighten",
+    "Darken": "PbGenerate:Darken",
+    "Overlay": "PbGenerate:Overlay",
+    "Hard_Light": "PbGenerate:Hard_Light",
+    "Soft_Light": "PbGenerate:Soft_Light",
+    "Pegtop_Light": "PbGenerate:Pegtop_Light",
+    "Linear_Light": "PbGenerate:Linear_Light",
+    "Vivid_Light": "PbGenerate:Vivid_Light",
+    "Pin_Light": "PbGenerate:Pin_Light",
+    "Linear_Dodge": "PbGenerate:Linear_Dodge",
+    "Linear_Burn": "PbGenerate:Linear_Burn",
+    "Color_Dodge": "PbGenerate:Color_Dodge",
+    "Color_Burn": "PbGenerate:Color_Burn"
+}
+
+
+class Gallery(object):
+    def __init__(self):
+        self.pbdb = Pb()
+
+    def select_random(self,
+                      tag=None,
+                      username=None,
+                      start=None,
+                      limit=QUERY_LIMIT):
+        filter_by = {}
+        if tag:
+            filter_by['tag'] = self._tag_translate(tag)
+        if username:
+            filter_by['username'] = username
+        columns = self.pbdb.get_random(filter_by=filter_by,
+                                       offset=start,
+                                       limit=limit)
+        return columns.serialize()
+
+    def _tag_translate(self, tag):
+        return _TAG_TRANSLATE.get(tag, tag)
+
+    def get_files(params):
+        """does a select * from im_cmd
+        with a where clause
+        the where clause needs to search by
+        name
+        id lt or gt
+        tag (using tag translate)
+        random (bool)
+
+        normally the results are ordered by id descending
+        """