clean up path stuff

This commit is contained in:
blitzman
2016-12-11 23:03:09 -05:00
parent b1bba74c5a
commit d3e360b7c0

View File

@@ -134,31 +134,16 @@ def defPaths(customSavePath):
eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False" eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
def getPyfaPath(Append=None): def getPyfaPath(append=None):
base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0] base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
root = os.path.dirname(os.path.realpath(os.path.abspath(base))) root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
if type(root) == str: # leave unicode ones alone return _getPath(root, append)
try:
root = root.decode('utf8')
except UnicodeDecodeError:
root = root.decode('windows-1252')
if not Append: def getSavePath(append=None):
return root
if type(root) == str: # leave unicode ones alone
try:
path = os.path.abspath(os.path.join(root, Append)).decode('utf8')
except UnicodeDecodeError:
path = os.path.abspath(os.path.join(root, Append)).decode('windows-1252')
else:
path = os.path.abspath(os.path.join(root, Append))
return path
def getSavePath(Append=None):
root = os.path.expanduser(os.path.join("~", ".pyfa")) root = os.path.expanduser(os.path.join("~", ".pyfa"))
return _getPath(root, append)
def _getPath(root, Append=None):
if type(root) == str: # leave unicode ones alone if type(root) == str: # leave unicode ones alone
try: try:
root = root.decode('utf8') root = root.decode('utf8')