Fix(DB): Fix column encoding

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index f52c79db1e7cf6d4a4678f5debf98d7d44eb4145..ba5ab6c7630cccbdd55cd717000d8ab111f207a4 100755 (executable)
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -1,29 +1,64 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """XSetBg database
 
 """
 
-__author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014, 2015 PhiloSoft Design"
-__license__ = "GNU GPL"
+import os
+from sqlobject import SQLObject, connectionForURI, sqlhub, \
+    UnicodeCol, IntCol, BoolCol, DatabaseIndex, dberrors
+from xsetbg_conf import xsetbg_conf
 
 __all__ = ['xsetbg_db_path', 'xsetbg_db']
 
-import os
-from sqlobject import SQLObject, StringCol, IntCol, BoolCol, dberrors
-from xsetbg_conf import xsetbg_conf
+# octal; -rw-------; make the database file(s) readable only by the user
+os.umask(0o066)
 
 
-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)
+    is_image = BoolCol(default=None)
+
+    last_shown_idx = DatabaseIndex('last_shown')
+    flag_idx = DatabaseIndex('flag')
+    is_image_idx = DatabaseIndex('is_image')
+
+
+def recreate_db():
+    global xsetbg_db
+    if not xsetbg_db:
+        xsetbg_db = XSetBg
+        xsetbg_db.createTable()
+    return xsetbg_db
+
+
+class SQLiteMassInsert(object):
+    def __init__(self):
+        self.connection = sqlhub.processConnection
+
+    def __enter__(self):
+        connection = self.connection
+        connection.query("PRAGMA synchronous=OFF")
+        connection.query("PRAGMA count_changes=OFF")
+        connection.query("PRAGMA journal_mode=MEMORY")
+        connection.query("PRAGMA temp_store=MEMORY")
+
+        txn = connection.transaction()
+        sqlhub.processConnection = txn
+        return txn
+
+    def __exit__(self, *args, **kw):
+        sqlhub.processConnection.commit(close=True)
+        connection = sqlhub.processConnection = self.connection
+        connection.query("VACUUM")
+        connection.close()
 
 
 db_dirs = []
 try:
     xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')
-except:
+except Exception:
     xsetbg_db_path = None
 
 if not xsetbg_db_path:
@@ -40,16 +75,19 @@ 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
 
 if __name__ == '__main__':
-    print "DB dirs:", db_dirs
-    print "DB file:", xsetbg_db_path
+    print("DB dirs:", db_dirs)
+    print("DB file:", xsetbg_db_path)