X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=reload_db.py;h=ffa0013b7b2803f7e850c8de6b62fb2dac0b74f8;hb=080d6169f03836330b355e5304e51122d7956c11;hp=3c9c56e64ef3d26ca6fcc0f3cd9f9589309fff4d;hpb=cdffc4b36468a4d72497c25ec4a3bf1f54fe1b3f;p=xsetbg.git

diff --git a/reload_db.py b/reload_db.py
index 3c9c56e..ffa0013 100755
--- 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,10 +19,10 @@ def convert_str(s):
         return int(float(s))
 
 
-fs_encoding = xsetbg_conf.get("images", "fs_encoding")
-dump_file = open(sys.argv[1], 'rU')
+dump_file = open(sys.argv[1], 'r')
 xsetbg_db = recreate_db()
-count_new = count_old = 0
+count_new = count_old = count_updated = 0
+fs_encoding = xsetbg_conf.get("images", "fs_encoding")
 
 with SQLiteMassInsert() as txn:
     for line in dump_file:
@@ -31,7 +31,10 @@ with SQLiteMassInsert() as txn:
         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 +47,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)