X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reload_db.py;h=f6dff81d39e69b6fa6e3d5b95520ff594bacb6a4;hb=4e7394a7e103cf0633cc9c42d9959aa94f2d7c9a;hp=41a3c941fcc3b406f1f74f9ca65dc8e126a5b900;hpb=990bd4dfbb33d7f14e2a44371a9ae76d8ccb125f;p=xsetbg.git

diff --git a/reload_db.py b/reload_db.py
index 41a3c94..f6dff81 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -10,14 +10,11 @@ __copyright__ = "Copyright (C) 2007-2015 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys
-from sqlobject import sqlhub
+from sqlobject import SQLObjectNotFound
 from sqlobject.sqlbuilder import Insert
 from xsetbg_conf import xsetbg_conf
-from xsetbg_db import recreate_db
+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":
@@ -25,29 +22,35 @@ def convert_str(s):
     else:
         return int(float(s))
 
-connection = xsetbg_db._connection
-
-connection.query("PRAGMA synchronous=OFF")
-connection.query("PRAGMA count_changes=OFF")
-connection.query("PRAGMA journal_mode=MEMORY")
-connection.query("PRAGMA temp_store=MEMORY")
-
-txn = connection.transaction()
-sqlhub.processConnection = 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')
-    values = {'last_shown': timestamp, 'full_name': filename}
-    if id:
-        values['id'] = id
-    query = txn.sqlrepr(Insert(xsetbg_db.sqlmeta.table, values=values))
-    txn.query(query)
-
-txn.commit()
-sqlhub.processConnection = connection
+fs_encoding = xsetbg_conf.get("images", "fs_encoding")
+dump_file = open(sys.argv[1], 'rU')
+xsetbg_db = recreate_db()
+count_new = count_old = 0
+
+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)
+        filename = filename.decode(fs_encoding)
+        try:
+            row = xsetbg_db.byFull_name(filename)
+        except SQLObjectNotFound:
+            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
+            if row.last_shown is not None:
+                assert row.last_shown == timestamp
+            count_old += 1
 
 dump_file.close()
+
+print "New images:", count_new
+print "Existing images:", count_old