X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reload_db.py;h=fe25e864781546343bd97233a1c87786913c161d;hb=0ece1df14f89c4bbc0af81b7683843af225181cb;hp=ee51b392aedb6048c6cf4dada016ae7cb7f930dd;hpb=161060b2c24bd37d7cd11f74297790dbe93504be;p=xsetbg.git

diff --git a/reload_db.py b/reload_db.py
index ee51b39..fe25e86 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -5,10 +5,6 @@ This file is a part of XSetBg.
 
 """
 
-__author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2007-2015 PhiloSoft Design"
-__license__ = "GNU GPL"
-
 import sys
 from sqlobject import SQLObjectNotFound
 from sqlobject.sqlbuilder import Insert
@@ -23,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:
@@ -35,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')}
@@ -46,10 +45,16 @@ with SQLiteMassInsert() as txn:
             count_new += 1
         else:
             assert id is None or row.id == id
-            assert row.last_shown == timestamp
-            count_old += 1
+            if row.last_shown is not None:
+                assert row.last_shown == timestamp
+            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 "Updated images:", count_updated