X-Git-Url: https://git.phdru.name/?p=xsetbg.git;a=blobdiff_plain;f=xsetbg_db.py;h=e5fe5d0310927a0d2c5704f41cdd44cfffeff47d;hp=54d174b4076862fb865d3df0fa88ed3b17057f46;hb=e97d0a3ca1e3b4c5d8c386fd7939e9b23d7bbbd4;hpb=990bd4dfbb33d7f14e2a44371a9ae76d8ccb125f diff --git a/xsetbg_db.py b/xsetbg_db.py index 54d174b..e5fe5d0 100755 --- a/xsetbg_db.py +++ b/xsetbg_db.py @@ -11,18 +11,10 @@ __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() - - class XSetBg(SQLObject): full_name = UnicodeCol(alternateID=True) last_shown = IntCol(default=None) # timestamp @@ -31,21 +23,10 @@ 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