X-Git-Url: https://git.phdru.name/?p=xsetbg.git;a=blobdiff_plain;f=reload_db.py;h=3c9c56e64ef3d26ca6fcc0f3cd9f9589309fff4d;hp=4c38208c045ee8d174059c66379bd37130e62854;hb=HEAD;hpb=ab98eea27897a184bd13b402a7b797881ddb1916

diff --git a/reload_db.py b/reload_db.py
index 4c38208..c12607a 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -1,29 +1,59 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Reload a dump into DB
 
 This file is a part of XSetBg.
 
 """
 
-__version__ = "$Revision: 17 $"[11:-2]
-__revision__ = "$Id: print_all.py 17 2007-06-14 10:37:08Z phd $"[5:-2]
-__date__ = "$Date: 2007-06-14 14:37:08 +0400 (Thu, 14 Jun 2007) $"[7:-2]
+import sys
+from sqlobject import SQLObjectNotFound
+from sqlobject.sqlbuilder import Insert
+from xsetbg_conf import xsetbg_conf
+from xsetbg_db import recreate_db, SQLiteMassInsert
+
+
+def convert_str(s):
+    if s == "None":
+        return None
+    else:
+        return int(float(s))
+
+
+dump_file = open(sys.argv[1], 'r',
+                 encoding=xsetbg_conf.get("images", "fs_encoding"))
+xsetbg_db = recreate_db()
+count_new = count_old = count_updated = 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)
+        try:
+            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')}
+            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
+            if row.full_name == filename:
+                count_old += 1
+            else:
+                row.full_name = filename
+                count_updated += 1
 
-__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2007 PhiloSoft Design"
-__license__ = "GNU GPL"
-
-import sys, os, shelve
-
-xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
-os.chdir(xsetbg_dir)
-
-global_db_name = "xsetbg.db"
-dump_file = open(sys.argv[1], 'rU')
-
-global_db = shelve.open(global_db_name, flag='n')
-for line in dump_file:
-   timestamp, filename = line.strip().split(None, 1)
-   global_db[filename] = float(timestamp)
-global_db.close()
 dump_file.close()
+
+print("New images:", count_new)
+print("Existing images:", count_old)
+print("Updated images:", count_updated)