youtube-dl

commit: e344693b65a42436eb40efe85095c01f767a502d
parent 355e4fd07e7f9c0632d9d78415675f8b5cc3c2ce
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sun,  1 Dec 2013 11:42:02 +0100

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

Diffstat:
M
test/parameters.json
3
++-
M
youtube_dl/YoutubeDL.py
4
+++-

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/parameters.json b/test/parameters.json
@@ -39,5 +39,6 @@
     "writeinfojson": true, 
     "writesubtitles": false,
     "allsubtitles": false,
-    "listssubtitles": false
+    "listssubtitles": false,
+    "socket_timeout": 20
 }
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -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')