lukas
/
deemix-py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-paths' into 'main' 

Directory overrides for docker

See merge request RemixDev/deemix!2
This commit is contained in:
RemixDev 2020-12-02 20:46:34 +03:00
parent 001f1aaf66 863bd54f86
commit f2cc780cec
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deemix/utils/localpaths.py
View File

@ -7,7 +7,9 @@ userdata = ""
musicdata = "" musicdata = ""
if os.getenv("XDG_CONFIG_HOME"): if os.getenv("DEEMIX_DATA_DIR"):
userdata = Path(os.getenv("DEEMIX_DATA_DIR"))
elif os.getenv("XDG_CONFIG_HOME"):
userdata = Path(os.getenv("XDG_CONFIG_HOME")) / 'deemix' userdata = Path(os.getenv("XDG_CONFIG_HOME")) / 'deemix'
elif os.getenv("APPDATA"): elif os.getenv("APPDATA"):
userdata = Path(os.getenv("APPDATA")) / "deemix" userdata = Path(os.getenv("APPDATA")) / "deemix"
@ -16,7 +18,9 @@ elif sys.platform.startswith('darwin'):
else: else:
userdata = homedata / '.config' / 'deemix' userdata = homedata / '.config' / 'deemix'
if os.getenv("XDG_MUSIC_DIR"): if os.getenv("DEEMIX_MUSIC_DIR"):
musicdata = Path(os.getenv("DEEMIX_MUSIC_DIR"))
elif os.getenv("XDG_MUSIC_DIR"):
musicdata = Path(os.getenv("XDG_MUSIC_DIR")) / "deemix Music" musicdata = Path(os.getenv("XDG_MUSIC_DIR")) / "deemix Music"
elif os.name == 'nt': elif os.name == 'nt':
import winreg import winreg
@ -33,9 +37,6 @@ elif os.name == 'nt':
else: else:
musicdata = homedata / "Music" / "deemix Music" musicdata = homedata / "Music" / "deemix Music"
def getHomeFolder():
return homedata
def getConfigFolder(): def getConfigFolder():
return userdata return userdata