projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
895ec26
)
verbose flag, and output proxies if it is set
author
Philipp Hagemeister
<phihag@phihag.de>
Sun, 26 Feb 2012 22:33:19 +0000
(23:33 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sun, 26 Feb 2012 22:33:19 +0000
(23:33 +0100)
youtube_dl/__init__.py
patch
|
blob
|
history
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 52da3b859287cb3f1fd8fb8eedb6015019be8da4..4c9c237d91d0086077e54d763117c508460eda75 100755
(executable)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-4351,6
+4351,8
@@
def parseOpts():
verbosity.add_option('--console-title',
action='store_true', dest='consoletitle',
help='display progress in console titlebar', default=False)
verbosity.add_option('--console-title',
action='store_true', dest='consoletitle',
help='display progress in console titlebar', default=False)
+ verbosity.add_option('-v', '--verbose',
+ action='store_true', dest='verbose', help='print various debugging information', default=False)
filesystem.add_option('-t', '--title',
filesystem.add_option('-t', '--title',
@@
-4487,10
+4489,14
@@
def _real_main():
# General configuration
cookie_processor = urllib2.HTTPCookieProcessor(jar)
# General configuration
cookie_processor = urllib2.HTTPCookieProcessor(jar)
- opener = urllib2.build_opener(urllib2.ProxyHandler(), cookie_processor, YoutubeDLHandler())
+ proxy_handler = urllib2.ProxyHandler()
+ opener = urllib2.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
urllib2.install_opener(opener)
socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
urllib2.install_opener(opener)
socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+ if opts.verbose:
+ print(u'[debug] Proxy map: ' + str(proxy_handler.proxies))
+
extractors = gen_extractors()
if opts.list_extractors:
extractors = gen_extractors()
if opts.list_extractors: