]> git.phdru.name Git - xsetbg.git/blobdiff - xsetbg_db.py
Style: Fix `flake8` error E999 SyntaxError: leading zeros in decimal integer
[xsetbg.git] / xsetbg_db.py
index 71055c0df12e566d5ccf42a9cb8fea6764901aa4..0ad9d048625dce5f00eea0ab0b2f67d56f5cc6b3 100755 (executable)
@@ -3,28 +3,26 @@
 
 """
 
-__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(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():
@@ -53,13 +51,13 @@ class SQLiteMassInsert(object):
     def __exit__(self, *args, **kw):
         sqlhub.processConnection.commit()
         connection = sqlhub.processConnection = self.connection
-        connection.query("VACUUM %s" % xsetbg_db.sqlmeta.table)
+        connection.query("VACUUM")
 
 
 db_dirs = []
 try:
     xsetbg_db_path = xsetbg_conf.get('xsetbg', 'database')
-except:
+except Exception:
     xsetbg_db_path = None
 
 if not xsetbg_db_path:
@@ -90,5 +88,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)