Skip to content

Commit 0bbc35c

Browse files
committed
Bump to v1.5.1 stable, fix for #176 (pyfa update breaks skeletons)
1 parent 9b8c1ff commit 0bbc35c

3 files changed

Lines changed: 27 additions & 11 deletions

File tree

config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Version data
1616
version = "1.5.1"
17-
tag = "git"
17+
tag = "Stable"
1818
expansionName = "Oceanus"
1919
expansionVersion = "1.0"
2020
evemonMinVersion = "4081"

pyfa.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,14 @@
8484
import os.path
8585

8686
import eos.db
87-
import eos.db.migration as migration
8887
import service.prefetch
8988
from gui.mainFrame import MainFrame
9089

9190
#Make sure the saveddata db exists
9291
if not os.path.exists(config.savePath):
9392
os.mkdir(config.savePath)
9493

95-
if os.path.isfile(config.saveDB):
96-
# If database exists, run migration after init'd database
97-
eos.db.saveddata_meta.create_all()
98-
migration.update(eos.db.saveddata_engine)
99-
else:
100-
# If database does not exist, do not worry about migration. Simply
101-
# create and set version
102-
eos.db.saveddata_meta.create_all()
103-
eos.db.saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)
94+
eos.db.saveddata_meta.create_all()
10495

10596
pyfa = wx.App(False)
10697
MainFrame()

service/prefetch.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
#===============================================================================
1919

2020
import threading
21+
import config
22+
import os
2123
import eos.types
24+
import eos.db.migration as migration
25+
2226
class PrefetchThread(threading.Thread):
2327
def run(self):
2428
# We're a daemon thread, as such, interpreter might get shut down while we do stuff
@@ -31,3 +35,24 @@ def run(self):
3135
prefetch = PrefetchThread()
3236
prefetch.daemon = True
3337
prefetch.start()
38+
39+
########
40+
# The following code does not belong here, however until we rebuild skeletons
41+
# to include modified pyfa.py, this is the best place to put it. See GH issue
42+
# #176
43+
# @ todo: move this to pyfa.py
44+
########
45+
46+
#Make sure the saveddata db exists
47+
if not os.path.exists(config.savePath):
48+
os.mkdir(config.savePath)
49+
50+
if os.path.isfile(config.saveDB):
51+
# If database exists, run migration after init'd database
52+
eos.db.saveddata_meta.create_all()
53+
migration.update(eos.db.saveddata_engine)
54+
else:
55+
# If database does not exist, do not worry about migration. Simply
56+
# create and set version
57+
eos.db.saveddata_meta.create_all()
58+
eos.db.saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)

0 commit comments

Comments
 (0)