music-kraken/music-kraken-core
3
2
Fork 0
Code Issues 10 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

XDG_USER_DIRS_FILE refactor + doc

Browse Source
This commit is contained in:
darkeox 2022-11-28 15:16:04 +01:00
parent 0dc255594f
commit ebae24e865
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/music_kraken/utils/shared.py
View File

@ -43,11 +43,12 @@ NOT_A_GENRE = ".", "..", "misc_scripts", "Music", "script", ".git", ".idea"
MUSIC_DIR = os.path.join("~", ".config", "user-dirs.dirs") MUSIC_DIR = os.path.join("~", ".config", "user-dirs.dirs")
if current_os == "linux": if current_os == "linux":
USER_XDG_DIR_FILE = os.path.expanduser("~/.config/user-dirs.dirs") # XDG_USER_DIRS_FILE reference: https://freedesktop.org/wiki/Software/xdg-user-dirs/
XDG_USER_DIRS_FILE = os.path.expanduser("~/.config/user-dirs.dirs")
logger = logging.getLogger("init_path") logger = logging.getLogger("init_path")
logger.setLevel(logging.WARNING) logger.setLevel(logging.WARNING)
try: try:
with open(USER_XDG_DIR_FILE, 'r') as f: with open(XDG_USER_DIRS_FILE, 'r') as f:
data = "[XDG_USER_DIRS]\n" + f.read() data = "[XDG_USER_DIRS]\n" + f.read()
config = configparser.ConfigParser(allow_no_value=True) config = configparser.ConfigParser(allow_no_value=True)
config.read_string(data) config.read_string(data)
@ -55,7 +56,7 @@ if current_os == "linux":
MUSIC_DIR = os.path.expandvars(xdg_config['xdg_music_dir'].strip('"')) MUSIC_DIR = os.path.expandvars(xdg_config['xdg_music_dir'].strip('"'))
except (FileNotFoundError, KeyError) as E: except (FileNotFoundError, KeyError) as E:
logger.warning(f''' logger.warning(f'''
Missing file or key at: '{USER_XDG_DIR_FILE}'. Missing file or key at: '{XDG_USER_DIRS_FILE}'.
Will fallback on default '$HOME/Music'. Will fallback on default '$HOME/Music'.
---- ----
''') ''')