R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make socket timeout configurable, and bump default to 10 minutes (#1862)

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-12-01 11:42:02 +01:00
parent 355e4fd07e
commit e344693b65
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/parameters.json
View File

@ -39,5 +39,6 @@
"writeinfojson": true,
"writesubtitles": false,
"allsubtitles": false,
"listssubtitles": false
"listssubtitles": false,
"socket_timeout": 20
}

4
youtube_dl/YoutubeDL.py
View File

@ -132,6 +132,7 @@ class YoutubeDL(object):
cookiefile: File name where cookies should be read from and dumped to.
nocheckcertificate:Do not verify SSL certificates
proxy: URL of the proxy server to use
socket_timeout: Time to wait for unresponsive hosts, in seconds
The following parameters are not used by YoutubeDL itself, they are used by
the FileDownloader:
@ -969,7 +970,8 @@ class YoutubeDL(object):
proxy_map.update(handler.proxies)
write_string(u'[debug] Proxy map: ' + compat_str(proxy_map) + u'\n')
def _setup_opener(self, timeout=20):
def _setup_opener(self):
timeout = float(self.params.get('socket_timeout', 600))
opts_cookiefile = self.params.get('cookiefile')
opts_proxy = self.params.get('proxy')