[patch] staticdata patch for pyfa-9999/pyfa-1.28.1 release

pyfa-1.27.2-staticdata.patch (text/plain), 1.43 KB, created by Martin McCourt on 2017-03-22 19:09:17 UTC

diff -ur pyfa-old/config.py pyfa-9999/config.py
--- pyfa-old/config.py	2017-02-26 13:39:22.950001359 -0500
+++ pyfa-9999/config.py	2017-02-26 13:46:43.290004208 -0500
@@ -133,7 +133,13 @@
     # The database where the static EVE data from the datadump is kept.
     # This is not the standard sqlite datadump but a modified version created by eos
     # maintenance script
-    gameDB = os.path.join(pyfaPath, "eve.db")
+    gameDB = getattr(configforced, "gameDB", None)
+    if gameDB is None:
+        gameDB = os.path.join(pyfaPath, "eve.db")
+
+    imgsZIP = getattr(configforced, "imgsZIP", None)
+    if imgsZIP is None:
+        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
 
     ## DON'T MODIFY ANYTHING BELOW ##
     import eos.config
--- pyfa-old/config.py  2017-02-26 14:27:25.230020006 -0500
+++ pyfa-9999/config.py 2017-02-26 14:28:41.020020496 -0500
@@ -75,6 +75,7 @@
     global savePath
     global saveDB
     global gameDB
+    global imgsZIP
     global saveInRoot
 
     if debug:
--- pyfa-old/gui/bitmapLoader.py	2017-03-18 23:47:13.907208151 -0400
+++ pyfa-9999/gui/bitmapLoader.py	2017-03-18 23:51:22.827206813 -0400
@@ -37,7 +37,7 @@
 
 class BitmapLoader(object):
     try:
-        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
+        archive = zipfile.ZipFile(config.imgsZIP, 'r')
         logging.info("Using zipped image files.")
     except IOError:
         logging.info("Using local image files.")