minhngoc25a
/
yt-dlc
mirror of https://github.com/blackjack4494/yt-dlc
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #792 from fp7/master 

Parameters as arguments to main
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-04-22 13:44:05 -07:00
parent c15e024141 30f2999962
commit 4469666780
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/__init__.py
View File

@ -47,7 +47,7 @@ from .FileDownloader import *
from .InfoExtractors import gen_extractors from .InfoExtractors import gen_extractors
from .PostProcessor import * from .PostProcessor import *
def parseOpts(): def parseOpts(arguments):
def _readOptions(filename_bytes): def _readOptions(filename_bytes):
try: try:
optionf = open(filename_bytes) optionf = open(filename_bytes)
@ -308,7 +308,7 @@ def parseOpts():
systemConf = _readOptions('/etc/youtube-dl.conf') systemConf = _readOptions('/etc/youtube-dl.conf')
userConf = _readOptions(userConfFile) userConf = _readOptions(userConfFile)
commandLineConf = sys.argv[1:] commandLineConf = sys.argv[1:]
argv = systemConf + userConf + commandLineConf argv = (systemConf + userConf + commandLineConf) if not arguments else arguments
opts, args = parser.parse_args(argv) opts, args = parser.parse_args(argv)
if opts.verbose: if opts.verbose:
@ -318,8 +318,8 @@ def parseOpts():
return parser, opts, args return parser, opts, args
def _real_main(): def _real_main(argv=None):
parser, opts, args = parseOpts() parser, opts, args = parseOpts(argv)
# Open appropriate CookieJar # Open appropriate CookieJar
if opts.cookiefile is None: if opts.cookiefile is None:
@ -553,9 +553,9 @@ def _real_main():
sys.exit(retcode) sys.exit(retcode)
def main(): def main(argv=None):
try: try:
_real_main() _real_main(argv)
except DownloadError: except DownloadError:
sys.exit(1) sys.exit(1)
except SameFileError: except SameFileError: