Feat(reload_db): Get existing row by id

[xsetbg.git] / reload_db.py

diff --git a/reload_db.py b/reload_db.py
index 3c9c56e64ef3d26ca6fcc0f3cd9f9589309fff4d..d60e3ec314207c0213e745bd35c8757352afa6f7 100755 (executable)
--- a/reload_db.py
+++ b/reload_db.py
@@ -20,7 +20,7 @@ def convert_str(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
 
@@ -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')}