Version 5.0.2

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index 54d174b4076862fb865d3df0fa88ed3b17057f46..71055c0df12e566d5ccf42a9cb8fea6764901aa4 100755 (executable)
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -11,16 +11,11 @@ __all__ = ['xsetbg_db_path', 'xsetbg_db']
 
 import os
 from sqlobject import SQLObject, connectionForURI, sqlhub, \
-    StringCol, UnicodeCol, IntCol, BoolCol, DatabaseIndex, dberrors, \
-    SQLObjectNotFound
+    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):
@@ -31,26 +26,36 @@ class XSetBg(SQLObject):
     last_shown_idx = DatabaseIndex('last_shown')
     flag_idx = DatabaseIndex('flag')
 
-    def clearTable(self):
-        super.clearTable(XSetBg, self)
-        try:
-            seq = SqliteSequence.byName(XSetBg.sqlmeta.table)
-        except SQLObjectNotFound:
-            SqliteSequence(name=XSetBg.sqlmeta.table, seq=0)
-        else:
-            seq.seq = 0  # Reset autoincrement counter
-
 
 def recreate_db():
     global xsetbg_db
-    if xsetbg_db:
-        xsetbg_db.clearTable()
-    else:
+    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:
     xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')