projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b625bc2
)
Arguments as parameter to function _real_main so it can be used programmatically
author
Finn Petersen
<4peterse@googlemail.com>
Tue, 16 Apr 2013 17:26:48 +0000
(19:26 +0200)
committer
Finn Petersen
<4peterse@googlemail.com>
Tue, 16 Apr 2013 17:26:48 +0000
(19:26 +0200)
youtube_dl/__init__.py
patch
|
blob
|
history
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index f46143e01b38c5af7cc2999402bbfa2f2ae51d7e..b339427e818c9546268fe3019aaa627fbc3c2f16 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-47,7
+47,7
@@
from .FileDownloader import *
from .InfoExtractors import gen_extractors
from .PostProcessor import *
from .InfoExtractors import gen_extractors
from .PostProcessor import *
-def parseOpts():
+def parseOpts(
arguments
):
def _readOptions(filename_bytes):
try:
optionf = open(filename_bytes)
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)
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:
opts, args = parser.parse_args(argv)
if opts.verbose:
@@
-309,8
+309,8
@@
def parseOpts():
return parser, opts, args
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:
# Open appropriate CookieJar
if opts.cookiefile is None:
@@
-544,9
+544,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:
sys.exit(1)
except SameFileError:
except DownloadError:
sys.exit(1)
except SameFileError: