diff --git a/eos/config.py b/eos/config.py index 6bc31eef8..c6c53f748 100644 --- a/eos/config.py +++ b/eos/config.py @@ -11,6 +11,7 @@ debug = False gamedataCache = True saveddataCache = True gamedata_version = "" +gamedata_date = "" gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db")) pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring) diff --git a/eos/db/__init__.py b/eos/db/__init__.py index dd027841b..5341e84ae 100644 --- a/eos/db/__init__.py +++ b/eos/db/__init__.py @@ -51,10 +51,14 @@ try: config.gamedata_version = gamedata_session.execute( "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'" ).fetchone()[0] + config.gamedata_date = gamedata_session.execute( + "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'dump_time'" + ).fetchone()[0] except Exception as e: pyfalog.warning("Missing gamedata version.") pyfalog.critical(e) config.gamedata_version = None + config.gamedata_date = None saveddata_connectionstring = config.saveddata_connectionstring if saveddata_connectionstring is not None: diff --git a/eve.db b/eve.db index 5ecdbcd8f..7dfe70273 100644 Binary files a/eve.db and b/eve.db differ diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 4a8a6d1a1..f8b3fb1f4 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -34,7 +34,8 @@ from codecs import open import config -from eos.config import gamedata_version +from eos.config import gamedata_version, gamedata_date +import datetime import gui.aboutData from gui.chrome_tabs import ChromeNotebook @@ -365,7 +366,8 @@ class MainFrame(wx.Frame): def ShowAboutBox(self, evt): info = wx.adv.AboutDialogInfo() info.Name = "pyfa" - info.Version = config.getVersion() # gui.aboutData.versionString + time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S') + info.Version = config.getVersion() + '\nEVE Data Version: {} ({})'.format(gamedata_version, time) # gui.aboutData.versionString # # try: # import matplotlib diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index 284ff6caf..34bab22c0 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -276,6 +276,7 @@ def main(db, json_path): # pyfa, we can do it here as a post-processing step eos.db.gamedata_engine.execute("UPDATE dgmtypeattribs SET value = 4.0 WHERE attributeID = ?", (1367,)) + eos.db.gamedata_engine.execute("UPDATE invtypes SET published = 0 WHERE typeName LIKE '%abyssal%'") print("done") if __name__ == "__main__":