projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option --config-location
[youtube-dl]
/
youtube_dl
/
options.py
diff --git
a/youtube_dl/options.py
b/youtube_dl/options.py
index 4144454e578797437549766f38abfffc042bf645..4941abe8322d3a65452c7523b9a71cf19f6ebd5f 100644
(file)
--- a/
youtube_dl/options.py
+++ b/
youtube_dl/options.py
@@
-178,6
+178,10
@@
def parseOpts(overrideArguments=None):
'When given in the global configuration file /etc/youtube-dl.conf: '
'Do not read the user configuration in ~/.config/youtube-dl/config '
'(%APPDATA%/youtube-dl/config.txt on Windows)')
'When given in the global configuration file /etc/youtube-dl.conf: '
'Do not read the user configuration in ~/.config/youtube-dl/config '
'(%APPDATA%/youtube-dl/config.txt on Windows)')
+ general.add_option(
+ '--config-file',
+ dest='configfile', metavar='FILE',
+ help='File to read configuration from.')
general.add_option(
'--flat-playlist',
action='store_const', dest='extract_flat', const='in_playlist',
general.add_option(
'--flat-playlist',
action='store_const', dest='extract_flat', const='in_playlist',
@@
-845,19
+849,29
@@
def parseOpts(overrideArguments=None):
return conf
command_line_conf = compat_conf(sys.argv[1:])
return conf
command_line_conf = compat_conf(sys.argv[1:])
+ opts, args = parser.parse_args(command_line_conf)
if '--ignore-config' in command_line_conf:
system_conf = []
user_conf = []
if '--ignore-config' in command_line_conf:
system_conf = []
user_conf = []
+ elif '--config-file' in command_line_conf:
+ if not os.path.isfile(opts.configfile):
+ parser.error('Config file {0} not found.'.format(opts.configfile))
+ else:
+ user_conf = _readOptions(opts.configfile)
+ system_conf = []
+
else:
system_conf = _readOptions('/etc/youtube-dl.conf')
if '--ignore-config' in system_conf:
user_conf = []
else:
user_conf = _readUserConf()
else:
system_conf = _readOptions('/etc/youtube-dl.conf')
if '--ignore-config' in system_conf:
user_conf = []
else:
user_conf = _readUserConf()
+
argv = system_conf + user_conf + command_line_conf
opts, args = parser.parse_args(argv)
argv = system_conf + user_conf + command_line_conf
opts, args = parser.parse_args(argv)
+
if opts.verbose:
write_string('[debug] System config: ' + repr(_hide_login_info(system_conf)) + '\n')
write_string('[debug] User config: ' + repr(_hide_login_info(user_conf)) + '\n')
if opts.verbose:
write_string('[debug] System config: ' + repr(_hide_login_info(system_conf)) + '\n')
write_string('[debug] User config: ' + repr(_hide_login_info(user_conf)) + '\n')