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

diff --git a/reload_db.py b/reload_db.py
index 060b05c..ffa0013 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -1,24 +1,16 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Reload a dump into DB
 
 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
 from xsetbg_conf import xsetbg_conf
 from xsetbg_db import recreate_db, SQLiteMassInsert
 
-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":
@@ -27,23 +19,42 @@ def convert_str(s):
         return int(float(s))
 
 
+dump_file = open(sys.argv[1], 'r')
+xsetbg_db = recreate_db()
+count_new = count_old = count_updated = 0
+fs_encoding = xsetbg_conf.get("images", "fs_encoding")
+
 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')
+        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}
+            values = {'last_shown': timestamp,
+                      'full_name': filename.encode('utf-8')}
             if id:
                 values['id'] = id
             query = txn.sqlrepr(Insert(xsetbg_db.sqlmeta.table, values=values))
             txn.query(query)
+            count_new += 1
         else:
             assert id is None or row.id == id
-            assert row.last_shown == timestamp
+            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)