Commit: 0114c5c1cd039864e071fd5ca628335d8a13bded - factorio_calc (hg)

Just a simple, and painful to use calculator for the game Factorio written in Python

Commit MetaInfo

• Révision: 0114c5c1cd039864e071fd5ca628335d8a13bded (tree)
• l'heure: 2019-03-30 11:06:38
• Auteur: Eric Hopper <hopper@omni...>
• Commiter: Eric Hopper

Message de Log

Update to preferentially read items.xml as the item database.

Change Summary

• modified: factorio_calc.py

Modification

diff -r 3d95e6a47f05 -r 0114c5c1cd03 factorio_calc.py
--- a/factorio_calc.py	Tue Feb 06 08:25:29 2018 -0800
+++ b/factorio_calc.py	Fri Mar 29 19:06:38 2019 -0700
@@ -199,18 +199,28 @@
                 ProductionItem(name, time, tuple(ingredients), produced))
 
 _mod_dir = _osp.dirname(__file__)
-db_fname = _osp.join(_mod_dir, 'item-db.pickle')
+xml_fname = _osp.join(_mod_dir, 'items.xml')
+pickle_fname = _osp.join(_mod_dir, 'item-db-0.16.pickle')
 
-if _osp.exists(db_fname):
-    with open(db_fname, 'rb') as _item_f:
+if _osp.exists(xml_fname):
+    with open(xml_fname, 'r') as _item_f:
+        item_db = ItemSet.createFromXML(_item_f)
+        db_fname = xml_fname
+elif _osp.exists(pickle_fname):
+    with open(pickle_fname, 'rb') as _item_f:
         item_db = pickle.load(_item_f)
+        db_fname = pickle_fname
 else:
-    item_db = set()
+    item_db = ItemSet()
 
 def save_items():
     tmp_new = db_fname + '.new'
-    with open(tmp_new, 'wb') as item_f:
-        pickle.dump(item_db, item_f, -1)
+    if db_fname.endswith('.xml'):
+        with open(tmp_new, 'w') as item_f:
+            item_f.writelines(item_db.asXML())
+    else:
+        with open(tmp_new, 'wb') as item_f:
+            pickle.dump(item_db, item_f, -1)
     os.unlink(db_fname)
     os.link(tmp_new, db_fname)
     os.unlink(tmp_new)