diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-10 15:55:51 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-10 15:55:51 +0100 |
| commit | 9650885be954b3cc626205aa67f24c31f21da7b6 (patch) | |
| tree | 3233b7855b836a01228dca99c0b197956be74772 /youtube_dl | |
| parent | 596ac6e31f6baaadf8280e2c54ca90a7cf2fbc2a (diff) | |
| download | youtube-dl-9650885be954b3cc626205aa67f24c31f21da7b6.tar.xz | |
[escapist] Filter video differently (Fixes #4919)
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/common.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/escapist.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 382e846c5..8d71494b4 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -271,7 +271,7 @@ class InfoExtractor(object): raise except compat_http_client.IncompleteRead as e: raise ExtractorError('A network error has occured.', cause=e, expected=True) - except (KeyError,) as e: + except (KeyError, StopIteration) as e: raise ExtractorError('An extractor error has occured.', cause=e) def set_downloader(self, downloader): diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py index 98b698277..4303feccd 100644 --- a/youtube_dl/extractor/escapist.py +++ b/youtube_dl/extractor/escapist.py @@ -54,8 +54,11 @@ class EscapistIE(InfoExtractor): transform_source=js_to_json) playlist = config['playlist'] + video_url = next( + p['url'] for p in playlist + if p.get('eventCategory') == 'Video') formats.append({ - 'url': playlist[1]['url'], + 'url': video_url, 'format_id': name, 'quality': quality, }) |