X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=xsetbg_db.py;h=f52c79db1e7cf6d4a4678f5debf98d7d44eb4145;hb=aa64b9d6bb2f1653cc65e57d7f1aed279542b54d;hp=c6a8a3fece4c4a0699cffdeb7372829cfd2d95df;hpb=80c5a31f64e2722657d472191b52589210b7f0d8;p=xsetbg.git

diff --git a/xsetbg_db.py b/xsetbg_db.py
index c6a8a3f..f52c79d 100755
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -4,16 +4,22 @@
 """
 
 __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, StringCol, IntCol, BoolCol, dberrors
 from xsetbg_conf import xsetbg_conf
 
+
+class XSetbg(SQLObject):
+    path = StringCol(alternateID=True)
+    last_shown = IntCol(default=None) # timestamp
+    flag = BoolCol(default=None)
+
+
 db_dirs = []
 try:
     xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')
@@ -29,15 +35,19 @@ if not xsetbg_db_path:
     db_dirs.append(os.path.dirname(os.path.abspath(__file__)))
 
     for d in db_dirs:
-        xsetbg_db_path = os.path.join(d, 'xsetbg.db')
+        xsetbg_db_path = os.path.join(d, 'xsetbg.sqlite')
         if os.path.exists(xsetbg_db_path):
             break
-    else:
-        raise RuntimeError("Cannot find xsetbg.db; searched %s", db_dirs)
 
-try:
-    xsetbg_db = shelve.open(xsetbg_db_path, 'r')
-except anydbm.error:
+if xsetbg_db_path:
+    try:
+        XSetbg.setConnection('sqlite:///' + xsetbg_db_path)
+        XSetbg.select()[0]
+    except dberrors.Error:
+        xsetbg_db = None
+    else:
+        xsetbg_db = XSetbg
+else:
     xsetbg_db = None
 
 if __name__ == '__main__':