mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-28 20:15:10 +02:00
Arguments as parameter to function _real_main so it can be used programmatically
This commit is contained in:
parent
b625bc2c31
commit
b8ad4f02a2
@ -47,7 +47,7 @@ from .FileDownloader import *
|
||||
from .InfoExtractors import gen_extractors
|
||||
from .PostProcessor import *
|
||||
|
||||
def parseOpts():
|
||||
def parseOpts(arguments):
|
||||
def _readOptions(filename_bytes):
|
||||
try:
|
||||
optionf = open(filename_bytes)
|
||||
@ -299,7 +299,7 @@ def parseOpts():
|
||||
systemConf = _readOptions('/etc/youtube-dl.conf')
|
||||
userConf = _readOptions(userConfFile)
|
||||
commandLineConf = sys.argv[1:]
|
||||
argv = systemConf + userConf + commandLineConf
|
||||
argv = systemConf + userConf + commandLineConf if not arguments else arguments
|
||||
opts, args = parser.parse_args(argv)
|
||||
|
||||
if opts.verbose:
|
||||
@ -309,8 +309,8 @@ def parseOpts():
|
||||
|
||||
return parser, opts, args
|
||||
|
||||
def _real_main():
|
||||
parser, opts, args = parseOpts()
|
||||
def _real_main(argv=None):
|
||||
parser, opts, args = parseOpts(argv)
|
||||
|
||||
# Open appropriate CookieJar
|
||||
if opts.cookiefile is None:
|
||||
@ -544,9 +544,9 @@ def _real_main():
|
||||
|
||||
sys.exit(retcode)
|
||||
|
||||
def main():
|
||||
def main(argv=None):
|
||||
try:
|
||||
_real_main()
|
||||
_real_main(argv)
|
||||
except DownloadError:
|
||||
sys.exit(1)
|
||||
except SameFileError:
|
||||
|
Loading…
Reference in New Issue
Block a user