xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 06:10:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong user config (Closes #32)

Browse Source 
:ci skip dl
This commit is contained in:
pukkandan 2021-01-25 01:37:09 +05:30
parent a392adf56c
commit b5d265633d
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dlc/options.py
View File

@ -1217,19 +1217,15 @@ def get_configs():
return return
def read_options(path, user=False): def read_options(path, user=False):
func = _readUserConf if user else _readOptions for package in ('yt-dlp', 'youtube-dlc'):
current_path = os.path.join(path, 'yt-dlp.conf')
config = func(current_path, default=None)
if user:
config, current_path = config
if config is None:
current_path = os.path.join(path, 'youtube-dlc.conf')
config = func(current_path, default=None)
if user: if user:
config, current_path = config config, current_path = _readUserConf(package, default=None)
if config is None: else:
return [], None current_path = os.path.join(path, '%s.conf' % package)
return config, current_path config = _readOptions(current_path, default=None)
if config is not None:
return config, current_path
return [], None
configs['portable'], paths['portable'] = read_options(get_executable_path()) configs['portable'], paths['portable'] = read_options(get_executable_path())
if '--ignore-config' in configs['portable']: if '--ignore-config' in configs['portable']: