From 773c272d66d0874eae76795a3742f3eec1a950a8 Mon Sep 17 00:00:00 2001 From: Simon Sawicki Date: Fri, 6 Jan 2023 20:01:00 +0100 Subject: Fix config locations (#5933) Bug in 8e40b9d1ec132ae1bcac50b3ee520ece46ac9c55 Closes #5953 Authored by: Grub4k, coletdjnz, pukkandan --- yt_dlp/utils.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'yt_dlp/utils.py') diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 0180954ef..15e1f97cb 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -5387,36 +5387,22 @@ def get_executable_path(): def get_user_config_dirs(package_name): - locations = set() - # .config (e.g. ~/.config/package_name) xdg_config_home = os.getenv('XDG_CONFIG_HOME') or compat_expanduser('~/.config') - config_dir = os.path.join(xdg_config_home, package_name) - if os.path.isdir(config_dir): - locations.add(config_dir) + yield os.path.join(xdg_config_home, package_name) # appdata (%APPDATA%/package_name) appdata_dir = os.getenv('appdata') if appdata_dir: - config_dir = os.path.join(appdata_dir, package_name) - if os.path.isdir(config_dir): - locations.add(config_dir) + yield os.path.join(appdata_dir, package_name) # home (~/.package_name) - user_config_directory = os.path.join(compat_expanduser('~'), '.%s' % package_name) - if os.path.isdir(user_config_directory): - locations.add(user_config_directory) - - return locations + yield os.path.join(compat_expanduser('~'), f'.{package_name}') def get_system_config_dirs(package_name): - locations = set() # /etc/package_name - system_config_directory = os.path.join('/etc', package_name) - if os.path.isdir(system_config_directory): - locations.add(system_config_directory) - return locations + yield os.path.join('/etc', package_name) def traverse_obj( -- cgit v1.2.3