|
@ -354,7 +354,7 @@ def parseOpts(overrideArguments=None): |
|
|
if overrideArguments is not None: |
|
|
if overrideArguments is not None: |
|
|
opts, args = parser.parse_args(overrideArguments) |
|
|
opts, args = parser.parse_args(overrideArguments) |
|
|
if opts.verbose: |
|
|
if opts.verbose: |
|
|
sys.stderr.write(u'[debug] Override config: ' + repr(overrideArguments) + '\n') |
|
|
|
|
|
|
|
|
write_string(u'[debug] Override config: ' + repr(overrideArguments) + '\n') |
|
|
else: |
|
|
else: |
|
|
xdg_config_home = os.environ.get('XDG_CONFIG_HOME') |
|
|
xdg_config_home = os.environ.get('XDG_CONFIG_HOME') |
|
|
if xdg_config_home: |
|
|
if xdg_config_home: |
|
@ -367,9 +367,9 @@ def parseOpts(overrideArguments=None): |
|
|
argv = systemConf + userConf + commandLineConf |
|
|
argv = systemConf + userConf + commandLineConf |
|
|
opts, args = parser.parse_args(argv) |
|
|
opts, args = parser.parse_args(argv) |
|
|
if opts.verbose: |
|
|
if opts.verbose: |
|
|
sys.stderr.write(u'[debug] System config: ' + repr(_hide_login_info(systemConf)) + '\n') |
|
|
|
|
|
sys.stderr.write(u'[debug] User config: ' + repr(_hide_login_info(userConf)) + '\n') |
|
|
|
|
|
sys.stderr.write(u'[debug] Command-line args: ' + repr(_hide_login_info(commandLineConf)) + '\n') |
|
|
|
|
|
|
|
|
write_string(u'[debug] System config: ' + repr(_hide_login_info(systemConf)) + '\n') |
|
|
|
|
|
write_string(u'[debug] User config: ' + repr(_hide_login_info(userConf)) + '\n') |
|
|
|
|
|
write_string(u'[debug] Command-line args: ' + repr(_hide_login_info(commandLineConf)) + '\n') |
|
|
|
|
|
|
|
|
return parser, opts, args |
|
|
return parser, opts, args |
|
|
|
|
|
|
|
@ -392,7 +392,7 @@ def _real_main(argv=None): |
|
|
except (IOError, OSError) as err: |
|
|
except (IOError, OSError) as err: |
|
|
if opts.verbose: |
|
|
if opts.verbose: |
|
|
traceback.print_exc() |
|
|
traceback.print_exc() |
|
|
sys.stderr.write(u'ERROR: unable to open cookie file\n') |
|
|
|
|
|
|
|
|
write_string(u'ERROR: unable to open cookie file\n') |
|
|
sys.exit(101) |
|
|
sys.exit(101) |
|
|
# Set user agent |
|
|
# Set user agent |
|
|
if opts.user_agent is not None: |
|
|
if opts.user_agent is not None: |
|
@ -419,7 +419,7 @@ def _real_main(argv=None): |
|
|
batchurls = [x.strip() for x in batchurls] |
|
|
batchurls = [x.strip() for x in batchurls] |
|
|
batchurls = [x for x in batchurls if len(x) > 0 and not re.search(r'^[#/;]', x)] |
|
|
batchurls = [x for x in batchurls if len(x) > 0 and not re.search(r'^[#/;]', x)] |
|
|
if opts.verbose: |
|
|
if opts.verbose: |
|
|
sys.stderr.write(u'[debug] Batch file urls: ' + repr(batchurls) + u'\n') |
|
|
|
|
|
|
|
|
write_string(u'[debug] Batch file urls: ' + repr(batchurls) + u'\n') |
|
|
except IOError: |
|
|
except IOError: |
|
|
sys.exit(u'ERROR: batch file could not be read') |
|
|
sys.exit(u'ERROR: batch file could not be read') |
|
|
all_urls = batchurls + args |
|
|
all_urls = batchurls + args |
|
@ -611,7 +611,7 @@ def _real_main(argv=None): |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
if opts.verbose: |
|
|
if opts.verbose: |
|
|
sys.stderr.write(u'[debug] youtube-dl version ' + __version__ + u'\n') |
|
|
|
|
|
|
|
|
write_string(u'[debug] youtube-dl version ' + __version__ + u'\n') |
|
|
try: |
|
|
try: |
|
|
sp = subprocess.Popen( |
|
|
sp = subprocess.Popen( |
|
|
['git', 'rev-parse', '--short', 'HEAD'], |
|
|
['git', 'rev-parse', '--short', 'HEAD'], |
|
@ -620,14 +620,14 @@ def _real_main(argv=None): |
|
|
out, err = sp.communicate() |
|
|
out, err = sp.communicate() |
|
|
out = out.decode().strip() |
|
|
out = out.decode().strip() |
|
|
if re.match('[0-9a-f]+', out): |
|
|
if re.match('[0-9a-f]+', out): |
|
|
sys.stderr.write(u'[debug] Git HEAD: ' + out + u'\n') |
|
|
|
|
|
|
|
|
write_string(u'[debug] Git HEAD: ' + out + u'\n') |
|
|
except: |
|
|
except: |
|
|
try: |
|
|
try: |
|
|
sys.exc_clear() |
|
|
sys.exc_clear() |
|
|
except: |
|
|
except: |
|
|
pass |
|
|
pass |
|
|
sys.stderr.write(u'[debug] Python version %s - %s' %(platform.python_version(), platform_name()) + u'\n') |
|
|
|
|
|
sys.stderr.write(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n') |
|
|
|
|
|
|
|
|
write_string(u'[debug] Python version %s - %s' %(platform.python_version(), platform_name()) + u'\n') |
|
|
|
|
|
write_string(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n') |
|
|
|
|
|
|
|
|
ydl.add_default_info_extractors() |
|
|
ydl.add_default_info_extractors() |
|
|
|
|
|
|
|
|