X-Git-Url: https://git.phdru.name/?p=xsetbg.git;a=blobdiff_plain;f=xsetbg_db.py;h=406ca9609809caf9c77714a2b66e3091f0af7425;hp=35840cc842ba4c85a98ab32fbfdb7af1d5971816;hb=HEAD;hpb=a4ad85691c6a53f6faf53bc64a7a0a1c32515cd5

diff --git a/xsetbg_db.py b/xsetbg_db.py
index 35840cc..ba5ab6c 100755
--- a/xsetbg_db.py
+++ b/xsetbg_db.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """XSetBg database
 
 """
@@ -11,16 +11,18 @@ 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(0066)
+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():
@@ -47,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")
+        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:
@@ -86,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)