X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reload_db.py;h=41a3c941fcc3b406f1f74f9ca65dc8e126a5b900;hb=990bd4dfbb33d7f14e2a44371a9ae76d8ccb125f;hp=97012a8c0d3cfa3dcd733d3f56743b2eac08d714;hpb=688d1400d0e05a4ff2f10db88e89f149f39fee4e;p=xsetbg.git

diff --git a/reload_db.py b/reload_db.py
index 97012a8..41a3c94 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -10,25 +10,14 @@ __copyright__ = "Copyright (C) 2007-2015 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys
-from sqlobject import SQLObjectNotFound, sqlhub
+from sqlobject import sqlhub
 from sqlobject.sqlbuilder import Insert
 from xsetbg_conf import xsetbg_conf
-from xsetbg_db import SqliteSequence, XSetBg, xsetbg_db
+from xsetbg_db import recreate_db
 
 fs_encoding = xsetbg_conf.get("images", "fs_encoding")
 dump_file = open(sys.argv[1], 'rU')
-
-if xsetbg_db:
-    try:
-        seq = SqliteSequence.byName(XSetBg.sqlmeta.table)
-    except SQLObjectNotFound:
-        SqliteSequence(name=XSetBg.sqlmeta.table, seq=0)
-    else:
-        seq.seq = 0  # Reset autoincrement counter
-    xsetbg_db.clearTable()
-else:
-    xsetbg_db = XSetBg
-    xsetbg_db.createTable()
+xsetbg_db = recreate_db()
 
 def convert_str(s):
     if s == "None":
@@ -55,7 +44,7 @@ for line in dump_file:
     values = {'last_shown': timestamp, 'full_name': filename}
     if id:
         values['id'] = id
-    query = txn.sqlrepr(Insert(XSetBg.sqlmeta.table, values=values))
+    query = txn.sqlrepr(Insert(xsetbg_db.sqlmeta.table, values=values))
     txn.query(query)
 
 txn.commit()