Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-01-28 10:22:58 +08:00
Code Issues Releases Wiki Activity

Read /etc/youtube-dl.ini config file

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2016-04-01 14:01:45 +02:00
parent 7fada6e36e
commit 14d77aaab2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/options.py
View File

@ -854,6 +854,9 @@ def parseOpts(overrideArguments=None):
user_sections = {} user_sections = {}
else: else:
system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf')) system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf'))
system_global, system_sections = _readIni('/etc/youtube-dl.ini')
system_conf.extend(system_global)
if '--ignore-config' in system_conf: if '--ignore-config' in system_conf:
user_conf = [] user_conf = []
user_sections = {} user_sections = {}
@ -865,6 +868,8 @@ def parseOpts(overrideArguments=None):
opts, args = parser.parse_args(argv) opts, args = parser.parse_args(argv)
if opts.verbose: if opts.verbose:
write_string('[debug] System config: ' + repr(_hide_login_info(system_conf)) + '\n') write_string('[debug] System config: ' + repr(_hide_login_info(system_conf)) + '\n')
for section, section_args in system_sections.items():
write_string('[debug] System config for "' + section + '": ' + repr(_hide_login_info(section_args)) + '\n')
write_string('[debug] User config: ' + repr(_hide_login_info(user_conf)) + '\n') write_string('[debug] User config: ' + repr(_hide_login_info(user_conf)) + '\n')
for section, section_args in user_sections.items(): for section, section_args in user_sections.items():
write_string('[debug] User config for "' + section + '": ' + repr(_hide_login_info(section_args)) + '\n') write_string('[debug] User config for "' + section + '": ' + repr(_hide_login_info(section_args)) + '\n')
@ -873,6 +878,7 @@ def parseOpts(overrideArguments=None):
def build_section_args(*sections): def build_section_args(*sections):
res = system_conf + user_conf res = system_conf + user_conf
for section in sections: for section in sections:
res.extend(system_sections.get(section, []))
res.extend(user_sections.get(section, [])) res.extend(user_sections.get(section, []))
res.extend(command_line_conf) res.extend(command_line_conf)
return res return res