diff --git a/config.py b/config.py index 504aaeaf5..a96ac8f06 100644 --- a/config.py +++ b/config.py @@ -1,82 +1,82 @@ -import os -import sys - -# Load variable overrides specific to distribution type -try: - import configforced -except ImportError: - configforced = None - -# Turns on debug mode -debug = False -# Defines if our saveddata will be in pyfa root or not -saveInRoot = False - -# Version data -version = "1.1.12" -tag = "git" -expansionName = "Retribution" -expansionVersion = "1.0.2" - -pyfaPath = None -savePath = None -staticPath = None -saveDB = None -gameDB = None - -def defPaths(): - global pyfaPath - global savePath - global staticPath - global saveDB - global gameDB - global saveInRoot - # The main pyfa directory which contains run.py - # Python 2.X uses ANSI by default, so we need to convert the character encoding - pyfaPath = getattr(configforced, "pyfaPath", None) - if pyfaPath is None: - pyfaPath = unicode(os.path.dirname(os.path.abspath(sys.modules['__main__'].__file__)), sys.getfilesystemencoding()) - - # Where we store the saved fits etc, default is the current users home directory - if saveInRoot is True: - savePath = getattr(configforced, "savePath", None) - if savePath is None: - savePath = os.path.join(pyfaPath, "saveddata") - else: - savePath = getattr(configforced, "savePath", None) - if savePath is None: - savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding()) - - # Redirect stderr to file if we're requested to do so - stderrToFile = getattr(configforced, "stderrToFile", None) - if stderrToFile is True: - if not os.path.exists(savePath): - os.mkdir(savePath) - sys.stderr = open(os.path.join(savePath, "error_log.txt"), "w") - - # Same for stdout - stdoutToFile = getattr(configforced, "stdoutToFile", None) - if stdoutToFile is True: - if not os.path.exists(savePath): - os.mkdir(savePath) - sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w") - - # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory - staticPath = os.path.join(pyfaPath, "staticdata") - - # The database where we store all the fits etc - saveDB = os.path.join(savePath, "saveddata.db") - - # 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(staticPath, "eve.db") - - ## DON'T MODIFY ANYTHING BELOW ## - import eos.config - - #Caching modifiers, disable all gamedata caching, its unneeded. - eos.config.gamedataCache = False - # saveddata db location modifier, shouldn't ever need to touch this - eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False" - eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False" +import os +import sys + +# Load variable overrides specific to distribution type +try: + import configforced +except ImportError: + configforced = None + +# Turns on debug mode +debug = False +# Defines if our saveddata will be in pyfa root or not +saveInRoot = False + +# Version data +version = "1.1.13" +tag = "git" +expansionName = "Retribution" +expansionVersion = "1.1.6" + +pyfaPath = None +savePath = None +staticPath = None +saveDB = None +gameDB = None + +def defPaths(): + global pyfaPath + global savePath + global staticPath + global saveDB + global gameDB + global saveInRoot + # The main pyfa directory which contains run.py + # Python 2.X uses ANSI by default, so we need to convert the character encoding + pyfaPath = getattr(configforced, "pyfaPath", None) + if pyfaPath is None: + pyfaPath = unicode(os.path.dirname(os.path.abspath(sys.modules['__main__'].__file__)), sys.getfilesystemencoding()) + + # Where we store the saved fits etc, default is the current users home directory + if saveInRoot is True: + savePath = getattr(configforced, "savePath", None) + if savePath is None: + savePath = os.path.join(pyfaPath, "saveddata") + else: + savePath = getattr(configforced, "savePath", None) + if savePath is None: + savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding()) + + # Redirect stderr to file if we're requested to do so + stderrToFile = getattr(configforced, "stderrToFile", None) + if stderrToFile is True: + if not os.path.exists(savePath): + os.mkdir(savePath) + sys.stderr = open(os.path.join(savePath, "error_log.txt"), "w") + + # Same for stdout + stdoutToFile = getattr(configforced, "stdoutToFile", None) + if stdoutToFile is True: + if not os.path.exists(savePath): + os.mkdir(savePath) + sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w") + + # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory + staticPath = os.path.join(pyfaPath, "staticdata") + + # The database where we store all the fits etc + saveDB = os.path.join(savePath, "saveddata.db") + + # 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(staticPath, "eve.db") + + ## DON'T MODIFY ANYTHING BELOW ## + import eos.config + + #Caching modifiers, disable all gamedata caching, its unneeded. + eos.config.gamedataCache = False + # saveddata db location modifier, shouldn't ever need to touch this + eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False" + eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"