summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-24 14:17:33 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-24 14:17:33 +0200
commiteb73f2649f41e80063d6f2f3e4b6345eb90f9777 (patch)
treea40bf393b41c7564c946686ce1700f7c23c78289
parentf0b5d6af74469d8216aebfe8079dbe1516188b89 (diff)
downloadyoutube-dl-eb73f2649f41e80063d6f2f3e4b6345eb90f9777.tar.gz
youtube-dl-eb73f2649f41e80063d6f2f3e4b6345eb90f9777.tar.xz
youtube-dl-eb73f2649f41e80063d6f2f3e4b6345eb90f9777.zip
[vevo] Skip SMIL download
-rw-r--r--youtube_dl/extractor/vevo.py24
1 files changed, 0 insertions, 24 deletions
diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py
index 5e54a35d4..1edeece3f 100644
--- a/youtube_dl/extractor/vevo.py
+++ b/youtube_dl/extractor/vevo.py
@@ -191,30 +191,6 @@ class VevoIE(InfoExtractor):
         # Download via HLS API
         formats.extend(self._download_api_formats(video_id))
 
-        # Download SMIL
-        smil_blocks = sorted((
-            f for f in video_info['videoVersions']
-            if f['sourceType'] == 13),
-            key=lambda f: f['version'])
-
-        smil_url = '%s/Video/V2/VFILE/%s/%sr.smil' % (
-            self._SMIL_BASE_URL, video_id, video_id.lower())
-        if smil_blocks:
-            smil_url_m = self._search_regex(
-                r'url="([^"]+)"', smil_blocks[-1]['data'], 'SMIL URL',
-                fatal=False)
-            if smil_url_m is not None:
-                smil_url = smil_url_m
-        try:
-            smil_xml = self._download_webpage(smil_url, video_id,
-                                              'Downloading SMIL info')
-            formats.extend(self._formats_from_smil(smil_xml))
-        except ExtractorError as ee:
-            if not isinstance(ee.cause, compat_HTTPError):
-                raise
-            self._downloader.report_warning(
-                'Cannot download SMIL information, falling back to JSON ..')
-
         self._sort_formats(formats)
         timestamp_ms = int(self._search_regex(
             r'/Date\((\d+)\)/', video_info['launchDate'], 'launch date'))