Bump to v1.5.1 stable, fix for #176 (pyfa update breaks skeletons)

This commit is contained in:
blitzmann
2014-10-01 17:43:54 -04:00
parent 9b8c1ff3ba
commit 0bbc35cd1b
3 changed files with 27 additions and 11 deletions

View File

@@ -14,7 +14,7 @@ saveInRoot = False
# Version data
version = "1.5.1"
tag = "git"
tag = "Stable"
expansionName = "Oceanus"
expansionVersion = "1.0"
evemonMinVersion = "4081"

11
pyfa.py
View File

@@ -84,7 +84,6 @@ if __name__ == "__main__":
import os.path
import eos.db
import eos.db.migration as migration
import service.prefetch
from gui.mainFrame import MainFrame
@@ -92,15 +91,7 @@ if __name__ == "__main__":
if not os.path.exists(config.savePath):
os.mkdir(config.savePath)
if os.path.isfile(config.saveDB):
# If database exists, run migration after init'd database
eos.db.saveddata_meta.create_all()
migration.update(eos.db.saveddata_engine)
else:
# If database does not exist, do not worry about migration. Simply
# create and set version
eos.db.saveddata_meta.create_all()
eos.db.saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)
eos.db.saveddata_meta.create_all()
pyfa = wx.App(False)
MainFrame()

View File

@@ -18,7 +18,11 @@
#===============================================================================
import threading
import config
import os
import eos.types
import eos.db.migration as migration
class PrefetchThread(threading.Thread):
def run(self):
# We're a daemon thread, as such, interpreter might get shut down while we do stuff
@@ -31,3 +35,24 @@ class PrefetchThread(threading.Thread):
prefetch = PrefetchThread()
prefetch.daemon = True
prefetch.start()
########
# The following code does not belong here, however until we rebuild skeletons
# to include modified pyfa.py, this is the best place to put it. See GH issue
# #176
# @ todo: move this to pyfa.py
########
#Make sure the saveddata db exists
if not os.path.exists(config.savePath):
os.mkdir(config.savePath)
if os.path.isfile(config.saveDB):
# If database exists, run migration after init'd database
eos.db.saveddata_meta.create_all()
migration.update(eos.db.saveddata_engine)
else:
# If database does not exist, do not worry about migration. Simply
# create and set version
eos.db.saveddata_meta.create_all()
eos.db.saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)