diff options
author | Sergey M․ <[email protected]> | 2015-01-26 00:34:31 +0600 |
---|---|---|
committer | Sergey M․ <[email protected]> | 2015-01-26 00:34:31 +0600 |
commit | d862a4f94fac46e5c6de790a9b66d78d463d666d (patch) | |
tree | 5a3372f779ac5d62334e28b8aaaab80a227d68f5 /youtube_dl/extractor/spiegel.py | |
parent | a57e8ce6580202c179c38a15abc31f84ca471521 (diff) | |
download | youtube-dl-d862a4f94fac46e5c6de790a9b66d78d463d666d.tar.gz youtube-dl-d862a4f94fac46e5c6de790a9b66d78d463d666d.zip |
[spiegel] Use generalized formats pre-testing
Diffstat (limited to 'youtube_dl/extractor/spiegel.py')
-rw-r--r-- | youtube_dl/extractor/spiegel.py | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/youtube_dl/extractor/spiegel.py b/youtube_dl/extractor/spiegel.py index f345883c7..b868241d5 100644 --- a/youtube_dl/extractor/spiegel.py +++ b/youtube_dl/extractor/spiegel.py @@ -4,14 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..compat import ( - compat_urlparse, - compat_HTTPError, -) -from ..utils import ( - HEADRequest, - ExtractorError, -) +from ..compat import compat_urlparse from .spiegeltv import SpiegeltvIE @@ -72,16 +65,6 @@ class SpiegelIE(InfoExtractor): if n.tag.startswith('type') and n.tag != 'type6': format_id = n.tag.rpartition('type')[2] video_url = base_url + n.find('./filename').text - # Test video URLs beforehand as some of them are invalid - try: - self._request_webpage( - HEADRequest(video_url), video_id, - 'Checking %s video URL' % format_id) - except ExtractorError as e: - if isinstance(e.cause, compat_HTTPError) and e.cause.code == 404: - self.report_warning( - '%s video URL is invalid, skipping' % format_id, video_id) - continue formats.append({ 'format_id': format_id, 'url': video_url, @@ -94,6 +77,7 @@ class SpiegelIE(InfoExtractor): }) duration = float(idoc[0].findall('./duration')[0].text) + self._check_formats(formats, video_id) self._sort_formats(formats) return { |