MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-27 10:56:48 +01:00
Code Issues Releases Wiki Activity

Arguments as parameter to function _real_main so it can be used programmatically

Browse Source
This commit is contained in:
Finn Petersen 2013-04-16 19:26:48 +02:00
parent b625bc2c31
commit b8ad4f02a2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/__init__.py
View File

@ -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)
@ -298,8 +298,8 @@ def parseOpts():
userConfFile = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl.conf')
systemConf = _readOptions('/etc/youtube-dl.conf')
userConf = _readOptions(userConfFile)
commandLineConf = sys.argv[1:]
argv = systemConf + userConf + commandLineConf
commandLineConf = sys.argv[1:]
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: