Updated as per Blitzmanns feedback

https://github.com/pyfa-org/Pyfa/pull/639#issuecomment-225749245
This commit is contained in:
Ebag333
2016-06-15 23:42:38 -07:00
parent 47828c38d2
commit 12ccc96f46
3 changed files with 23 additions and 18 deletions

View File

@@ -36,9 +36,8 @@ class DamagePattern():
def __init__(self):
uniform = eos.db.getDamagePattern("Uniform")
importDBDefaults = loadDefaultDatabaseValues.defaultDatabaseValues()
if uniform is None:
importDBDefaults.importRequiredDefaults()
loadDefaultDatabaseValues.defaultDatabaseValues.importRequiredDefaults()
def getDamagePatternList(self):
return eos.db.getDamagePatternList()

View File

@@ -52,17 +52,19 @@ 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)
# Import default database values
# Import values that must exist otherwise Pyfa breaks
loadDefaultDatabaseValues.defaultDatabaseValues.importRequiredDefaults()
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 = {}'.format(migration.getAppVersion()))
#Import default database values
importDBDefaults = loadDefaultDatabaseValues.defaultDatabaseValues()
#Import values that must exist otherwise Pyfa breaks
importDBDefaults.importRequiredDefaults()
loadDefaultDatabaseValues.defaultDatabaseValues.importRequiredDefaults()
#Import default values for damage profiles
importDBDefaults.importDamageProfileDefaults()
loadDefaultDatabaseValues.defaultDatabaseValues.importDamageProfileDefaults()
#Import default values for target resist profiles
importDBDefaults.importResistProfileDefaults()
loadDefaultDatabaseValues.defaultDatabaseValues.importResistProfileDefaults()