Fix(DB): Fix column encoding

[xsetbg.git] / xsetbg_db.py

diff --git a/xsetbg_db.py b/xsetbg_db.py
index dc23254cf386deb462a1c0b1dac90d8e4a07de56..ba5ab6c7630cccbdd55cd717000d8ab111f207a4 100755 (executable)
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -1,27 +1,28 @@
-#! /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"
-
-__all__ = ['xsetbg_db_path', 'xsetbg_db']
-
 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']
+
+# octal; -rw-------; make the database file(s) readable only by the user
+os.umask(0o066)
+
 
 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():
@@ -48,15 +49,16 @@ class SQLiteMassInsert(object):
         return txn
 
     def __exit__(self, *args, **kw):
-        sqlhub.processConnection.commit()
+        sqlhub.processConnection.commit(close=True)
         connection = sqlhub.processConnection = self.connection
-        connection.query("VACUUM %s" % xsetbg_db.sqlmeta.table)
+        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:
@@ -87,5 +89,5 @@ 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)