X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reload_db.py;h=060b05c3c08009d09e377945309a9a162d73c1ca;hb=1bf04fe0782d08411f0ee876defd6fc11dd3f884;hp=af037104762dbeab193a5ff54d4c7d3b4a1ab92c;hpb=9f11c26113add5270ade4da28c7a2adb84194b1b;p=xsetbg.git

diff --git a/reload_db.py b/reload_db.py
index af03710..060b05c 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -6,20 +6,44 @@ This file is a part of XSetBg.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2007-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2007-2015 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-import sys, os, shelve
+import sys
+from sqlobject import SQLObjectNotFound
+from sqlobject.sqlbuilder import Insert
+from xsetbg_conf import xsetbg_conf
+from xsetbg_db import recreate_db, SQLiteMassInsert
 
-xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
-os.chdir(xsetbg_dir)
-
-global_db_name = "xsetbg.db"
+fs_encoding = xsetbg_conf.get("images", "fs_encoding")
 dump_file = open(sys.argv[1], 'rU')
+xsetbg_db = recreate_db()
+
+
+def convert_str(s):
+    if s == "None":
+        return None
+    else:
+        return int(float(s))
+
+
+with SQLiteMassInsert() as txn:
+    for line in dump_file:
+        id, timestamp, filename = line.strip().split(None, 2)
+        id = convert_str(id)
+        timestamp = convert_str(timestamp)
+        if fs_encoding != 'utf-8':
+            filename = filename.decode(fs_encoding).encode('utf-8')
+        try:
+            row = xsetbg_db.byFull_name(filename)
+        except SQLObjectNotFound:
+            values = {'last_shown': timestamp, 'full_name': filename}
+            if id:
+                values['id'] = id
+            query = txn.sqlrepr(Insert(xsetbg_db.sqlmeta.table, values=values))
+            txn.query(query)
+        else:
+            assert id is None or row.id == id
+            assert row.last_shown == timestamp
 
-global_db = shelve.open(global_db_name, flag='n')
-for line in dump_file:
-   timestamp, filename = line.strip().split(None, 1)
-   global_db[filename] = float(timestamp)
-global_db.close()
 dump_file.close()