Made -p cli argument create only that folder and not the default one
Moved default download folder inside music Check XDG first, then fallback to untranslated 'Music' folder This fixes #82
This commit is contained in:
@ -1,21 +1,38 @@
|
||||
from pathlib import Path
|
||||
import sys
|
||||
from os import getenv
|
||||
import os
|
||||
|
||||
userdata = ""
|
||||
homedata = Path.home()
|
||||
userdata = ""
|
||||
musicdata = ""
|
||||
|
||||
if getenv("APPDATA"):
|
||||
userdata = Path(getenv("APPDATA")) / "deemix"
|
||||
|
||||
if os.getenv("XDG_CONFIG_HOME"):
|
||||
userdata = Path(os.getenv("XDG_CONFIG_HOME")) / 'deemix'
|
||||
elif os.getenv("APPDATA"):
|
||||
userdata = Path(os.getenv("APPDATA")) / "deemix"
|
||||
elif sys.platform.startswith('darwin'):
|
||||
userdata = homedata / 'Library' / 'Application Support' / 'deemix'
|
||||
elif getenv("XDG_CONFIG_HOME"):
|
||||
userdata = Path(getenv("XDG_CONFIG_HOME")) / 'deemix'
|
||||
else:
|
||||
userdata = homedata / '.config' / 'deemix'
|
||||
|
||||
if os.getenv("XDG_MUSIC_DIR"):
|
||||
musicdata = Path(os.getenv("XDG_MUSIC_DIR")) / "deemix Music"
|
||||
elif os.name == 'nt':
|
||||
import winreg
|
||||
sub_key = r'SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
|
||||
music_guid = '{4BD8D571-6D19-48D3-BE97-422220080E43}'
|
||||
with winreg.OpenKey(winreg.HKEY_CURRENT_USER, sub_key) as key:
|
||||
location = winreg.QueryValueEx(key, music_guid)[0]
|
||||
musicdata = Path(location) / "deemix Music"
|
||||
else:
|
||||
musicdata = homedata / "Music" / "deemix Music"
|
||||
|
||||
def getHomeFolder():
|
||||
return homedata
|
||||
|
||||
def getConfigFolder():
|
||||
return userdata
|
||||
|
||||
def getMusicFolder():
|
||||
return musicdata
|
||||
|
Reference in New Issue
Block a user