From 7fada6e36e29aad3af3bd6b5357a0ae75501a425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Wed, 23 Mar 2016 10:56:12 +0100 Subject: [PATCH] [options] Read ini files in windows --- youtube_dl/options.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index cbc752190..0d7340b4e 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -781,16 +781,21 @@ def parseOpts(overrideArguments=None): userConf = _readOptions(userConfFile, None) userIni = _readIni(userIniFile, None) - if userConf is None: + if userConf is None or userIni is None: appdata_dir = compat_getenv('appdata') if appdata_dir: - userConf = _readOptions( - os.path.join(appdata_dir, 'youtube-dl', 'config'), - default=None) + if userConf is None: + userConf = _readOptions( + os.path.join(appdata_dir, 'youtube-dl', 'config'), + default=None) if userConf is None: userConf = _readOptions( os.path.join(appdata_dir, 'youtube-dl', 'config.txt'), default=None) + if userIni is None: + userIni = _readIni( + os.path.join(appdata_dir, 'youtube-dl', 'config.ini'), + default=None) if userConf is None: userConf = _readOptions( @@ -801,6 +806,15 @@ def parseOpts(overrideArguments=None): os.path.join(compat_expanduser('~'), 'youtube-dl.conf.txt'), default=None) + if userIni is None: + userIni = _readIni( + os.path.join(compat_expanduser('~'), 'youtube-dl.ini'), + default=None) + if userIni is None: + userIni = _readIni( + os.path.join(compat_expanduser('~'), 'youtube-dl.ini.txt'), + default=None) + if userConf is None: userConf = []