Version 5.0.2

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index 78620071fa5941133347c5f34b3d109bb16e84ee..71055c0df12e566d5ccf42a9cb8fea6764901aa4 100755 (executable)
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -11,15 +11,11 @@ __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()
+# octal; -rw-------; make the database file(s) readable only by the user
+os.umask(0066)
 
 
 class XSetBg(SQLObject):
@@ -27,6 +23,38 @@ class XSetBg(SQLObject):
     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
+
+
+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()
+        connection = sqlhub.processConnection = self.connection
+        connection.query("VACUUM %s" % xsetbg_db.sqlmeta.table)
+
 
 db_dirs = []
 try:
@@ -49,7 +77,7 @@ if not xsetbg_db_path:
 
 if xsetbg_db_path:
     sqlhub.processConnection = \
-        connectionForURI('sqlite:///%s?debug=1&debugOutput=1' % xsetbg_db_path)
+        connectionForURI('sqlite:///%s' % xsetbg_db_path)
     try:
         XSetBg.select()[0]
     except IndexError: