1
0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-10 01:13:21 +08:00

Optionally process sys and user config in embedded app

This commit is contained in:
Cliff Avey 2016-07-19 22:45:39 -04:00
parent 4e51ec5f57
commit 68becf5ea2
2 changed files with 712 additions and 714 deletions

View File

@ -43,7 +43,7 @@ from .extractor import gen_extractors, list_extractors
from .YoutubeDL import YoutubeDL
def _real_main(argv=None):
def _real_main(argv=None, ignoreConfig=True):
# Compatibility fixes for Windows
if sys.platform == 'win32':
# https://github.com/rg3/youtube-dl/issues/820
@ -53,7 +53,7 @@ def _real_main(argv=None):
setproctitle('youtube-dl')
parser, opts, args = parseOpts(argv)
parser, opts, args = parseOpts(argv, ignoreConfig)
# Set user agent
if opts.user_agent is not None:
@ -382,8 +382,6 @@ def _real_main(argv=None):
'external_downloader_args': external_downloader_args,
'postprocessor_args': postprocessor_args,
'cn_verification_proxy': opts.cn_verification_proxy,
'geo_verification_proxy': opts.geo_verification_proxy,
}
with YoutubeDL(ydl_opts) as ydl:
@ -417,9 +415,9 @@ def _real_main(argv=None):
sys.exit(retcode)
def main(argv=None):
def main(argv=None, ignoreConfig=True):
try:
_real_main(argv)
_real_main(argv, ignoreConfig)
except DownloadError:
sys.exit(1)
except SameFileError:

File diff suppressed because it is too large Load Diff