return int(float(s))
-fs_encoding = xsetbg_conf.get("images", "fs_encoding")
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:
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')}
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)