X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg_db.py;h=fd9237dbde6ccf0101a06e3190ff3c9949ed4630;hb=4ed80c34b609224bca893a3655d921ab6ba01c8d;hp=54bc62e3d06f73875de6c1548bd5d2529d4f1aa0;hpb=8ac6352062c85457b59fba2967476b1617494d9c;p=xsetbg.git

diff --git a/xsetbg_db.py b/xsetbg_db.py
old mode 100644
new mode 100755
index 54bc62e..fd9237d
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -1,21 +1,66 @@
+#! /usr/bin/env python
 """XSetBg database
 
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2014, 2015 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['xsetbg_db_path', 'xsetbg_db']
 
-import anydbm
 import os
-import shelve
+from sqlobject import SQLObject, connectionForURI, sqlhub, \
+    StringCol, IntCol, BoolCol, dberrors
 from xsetbg_conf import xsetbg_conf
 
-xsetbg_db_path = os.path.expanduser(xsetbg_conf.get('xsetbg', 'database'))
 
+class SqliteSequence(SQLObject):
+    class sqlmeta:
+        idName = 'rowid'
+    name = StringCol(unique=True)
+    seq = IntCol()
+
+
+class XSetBg(SQLObject):
+    path = StringCol(alternateID=True)
+    last_shown = IntCol(default=None)  # timestamp
+    flag = BoolCol(default=None)
+
+
+db_dirs = []
 try:
-    xsetbg_db = shelve.open(xsetbg_db_path, 'r')
-except anydbm.error:
+    xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')
+except:
+    xsetbg_db_path = None
+
+if not xsetbg_db_path:
+    if 'XDG_CACHE_HOME' in os.environ:
+        db_dirs.append(os.environ['XDG_CACHE_HOME'])
+    home_cache = os.path.expanduser('~/.cache')
+    if home_cache not in db_dirs:
+        db_dirs.append(home_cache)
+    db_dirs.append(os.path.dirname(os.path.abspath(__file__)))
+
+    for d in db_dirs:
+        xsetbg_db_path = os.path.join(d, 'xsetbg.sqlite')
+        if os.path.exists(xsetbg_db_path):
+            break
+
+if xsetbg_db_path:
+    sqlhub.processConnection = \
+        connectionForURI('sqlite:///%s?debug=1&debugOutput=1' % xsetbg_db_path)
+    try:
+        XSetBg.select()[0]
+    except IndexError:
+        xsetbg_db = XSetBg  # Table exists but is empty
+    except dberrors.Error:
+        xsetbg_db = None
+    else:
+        xsetbg_db = XSetBg
+else:
     xsetbg_db = None
+
+if __name__ == '__main__':
+    print "DB dirs:", db_dirs
+    print "DB file:", xsetbg_db_path