Fix a bug: id can be None

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index f52c79db1e7cf6d4a4678f5debf98d7d44eb4145..e5fe5d0310927a0d2c5704f41cdd44cfffeff47d 100755 (executable)
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -10,15 +10,27 @@ __license__ = "GNU GPL"
 __all__ = ['xsetbg_db_path', 'xsetbg_db']
 
 import os
-from sqlobject import SQLObject, StringCol, IntCol, BoolCol, dberrors
+from sqlobject import SQLObject, connectionForURI, sqlhub, \
+    UnicodeCol, IntCol, BoolCol, DatabaseIndex, dberrors
 from xsetbg_conf import xsetbg_conf
 
 
-class XSetbg(SQLObject):
-    path = StringCol(alternateID=True)
-    last_shown = IntCol(default=None) # timestamp
+class XSetBg(SQLObject):
+    full_name = UnicodeCol(alternateID=True)
+    last_shown = IntCol(default=None)  # timestamp
     flag = BoolCol(default=None)
 
+    last_shown_idx = DatabaseIndex('last_shown')
+    flag_idx = DatabaseIndex('flag')
+
+
+def recreate_db():
+    global xsetbg_db
+    if not xsetbg_db:
+        xsetbg_db = XSetBg
+        xsetbg_db.createTable()
+    return xsetbg_db
+
 
 db_dirs = []
 try:
@@ -40,13 +52,16 @@ if not xsetbg_db_path:
             break
 
 if xsetbg_db_path:
+    sqlhub.processConnection = \
+        connectionForURI('sqlite:///%s' % xsetbg_db_path)
     try:
-        XSetbg.setConnection('sqlite:///' + xsetbg_db_path)
-        XSetbg.select()[0]
+        XSetBg.select()[0]
+    except IndexError:
+        xsetbg_db = XSetBg  # Table exists but is empty
     except dberrors.Error:
         xsetbg_db = None
     else:
-        xsetbg_db = XSetbg
+        xsetbg_db = XSetBg
 else:
     xsetbg_db = None