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

polished finding music directory to follow the freedesktop standard

Browse Source
This commit is contained in:
Hellow 2023-04-13 19:09:41 +02:00
parent 6d26be674b
commit 73c75c6598
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/music_kraken/utils/path_manager/music_directory.py
View File

@ -1,4 +1,7 @@
import os
from pathlib import Path from pathlib import Path
from typing import Optional
from sys import platform from sys import platform
import logging import logging
from os.path import expandvars from os.path import expandvars
@ -14,14 +17,17 @@ def get_xdg_music_directory() -> Path:
Thanks to Distant Thunder, as well as Kevin Gruber for making that pull request: Thanks to Distant Thunder, as well as Kevin Gruber for making that pull request:
https://github.com/HeIIow2/music-downloader/pull/6 https://github.com/HeIIow2/music-downloader/pull/6
:return: XDG_USER_DIRS_FILE reference:
https://freedesktop.org/wiki/Software/xdg-user-dirs/
https://web.archive.org/web/20230322012953/https://freedesktop.org/wiki/Software/xdg-user-dirs/
""" """
# XDG_USER_DIRS_FILE reference: https://freedesktop.org/wiki/Software/xdg-user-dirs/ xdg_user_dirs_file = os.environ.get("XDG_CONFIG_HOME") or Path(Path.home(), ".config", "user-dirs.dirs")
xdg_user_dirs_file = Path(Path.home(), ".config", "user-dirs.dirs") xdg_user_dirs_default_file = Path("/etc/xdg/user-dirs.defaults")
def get_music_dir_from_xdg_file(xdg_file_path: os.PathLike) -> Optional[Path]:
try: try:
with open(xdg_user_dirs_file, 'r') as f: with open(xdg_file_path, '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)
@ -30,11 +36,18 @@ def get_xdg_music_directory() -> Path:
except (FileNotFoundError, KeyError) as e: except (FileNotFoundError, KeyError) as e:
logging.warning( logging.warning(
f"Missing file or No entry found for \"xdg_music_dir\" in: \"{xdg_user_dirs_file}\".\n" f"Missing file or No entry found for \"xdg_music_dir\" in: \"{xdg_file_path}\".\n"
f"Will fallback on default \"$HOME/Music\"."
) )
logging.debug(str(e)) logging.debug(str(e))
music_dir = get_music_dir_from_xdg_file(xdg_user_dirs_file)
if music_dir is not None:
return music_dir
music_dir = get_music_dir_from_xdg_file(xdg_user_dirs_default_file)
if music_dir is not None:
return music_dir
logging.warning(f"couldn't find a XDG music dir, falling back to: {DEFAULT_MUSIC_DIRECTORY}")
return DEFAULT_MUSIC_DIRECTORY return DEFAULT_MUSIC_DIRECTORY