Fix(DB): Fix column encoding

[xsetbg.git] / reload_db.py

diff --git a/reload_db.py b/reload_db.py
index ff1c3a697386c344c1a94937714ffd05d11fa93b..c12607a2f3fa00aab5a99748ecdf8ff3968c87d7 100755 (executable)
--- a/reload_db.py
+++ b/reload_db.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Reload a dump into DB
 
 This file is a part of XSetBg.
@@ -19,19 +19,21 @@ def convert_str(s):
         return int(float(s))
 
 
-fs_encoding = xsetbg_conf.get("images", "fs_encoding")
-dump_file = open(sys.argv[1], 'r')
+dump_file = open(sys.argv[1], 'r',
+                 encoding=xsetbg_conf.get("images", "fs_encoding"))
 xsetbg_db = recreate_db()
-count_new = count_old = 0
+count_new = count_old = count_updated = 0
 
 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)
-        filename = filename.decode(fs_encoding)
         try:
-            row = xsetbg_db.byFull_name(filename)
+            if id:
+                row = xsetbg_db.get(id)
+            else:
+                row = xsetbg_db.byFull_name(filename)
         except SQLObjectNotFound:
             values = {'last_shown': timestamp,
                       'full_name': filename.encode('utf-8')}
@@ -44,9 +46,14 @@ with SQLiteMassInsert() as txn:
             assert id is None or row.id == id
             if row.last_shown is not None:
                 assert row.last_shown == timestamp
-            count_old += 1
+            if row.full_name == filename:
+                count_old += 1
+            else:
+                row.full_name = filename
+                count_updated += 1
 
 dump_file.close()
 
-print "New images:", count_new
-print "Existing images:", count_old
+print("New images:", count_new)
+print("Existing images:", count_old)
+print("Updated images:", count_updated)