Fix a bug: id can be None

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index 77dc70242ae8e1f1d711a2e3ed714fb9cbd27ba7..e5fe5d0310927a0d2c5704f41cdd44cfffeff47d 100755 (executable)
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -11,22 +11,26 @@ __all__ = ['xsetbg_db_path', 'xsetbg_db']
 
 import os
 from sqlobject import SQLObject, connectionForURI, sqlhub, \
-    StringCol, UnicodeCol, IntCol, BoolCol, dberrors
+    UnicodeCol, IntCol, BoolCol, DatabaseIndex, dberrors
 from xsetbg_conf import xsetbg_conf
 
 
-class SqliteSequence(SQLObject):
-    class sqlmeta:
-        idName = 'rowid'
-    name = StringCol(unique=True)
-    seq = IntCol()
-
-
 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: