diff options
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/common.py | 8 | ||||
| -rw-r--r-- | youtube_dl/extractor/rtlnl.py | 6 | ||||
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 15 | ||||
| -rw-r--r-- | youtube_dl/extractor/wat.py | 1 |
4 files changed, 26 insertions, 4 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 4d5b48167..69d5f687c 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -620,11 +620,15 @@ class InfoExtractor(object): 'Unable to download f4m manifest') formats = [] - for media_el in manifest.findall('{http://ns.adobe.com/f4m/1.0}media'): + media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media') + for i, media_el in enumerate(media_nodes): + tbr = int_or_none(media_el.attrib.get('bitrate')) + format_id = 'f4m-%d' % (i if tbr is None else tbr) formats.append({ + 'format_id': format_id, 'url': manifest_url, 'ext': 'flv', - 'tbr': int_or_none(media_el.attrib.get('bitrate')), + 'tbr': tbr, 'width': int_or_none(media_el.attrib.get('width')), 'height': int_or_none(media_el.attrib.get('height')), }) diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index 190c8f226..2d9511d5e 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor +from ..utils import parse_duration class RtlXlIE(InfoExtractor): @@ -20,6 +21,7 @@ class RtlXlIE(InfoExtractor): 'onze mobiele apps.', 'timestamp': 1408051800, 'upload_date': '20140814', + 'duration': 576.880, }, 'params': { # We download the first bytes of the first fragment, it can't be @@ -35,6 +37,7 @@ class RtlXlIE(InfoExtractor): info = self._download_json( 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/fmt=flash/' % uuid, uuid) + material = info['material'][0] episode_info = info['episodes'][0] @@ -44,8 +47,9 @@ class RtlXlIE(InfoExtractor): return { 'id': uuid, - 'title': '%s - %s' % (progname, subtitle), + 'title': '%s - %s' % (progname, subtitle), 'formats': self._extract_f4m_formats(f4m_url, uuid), 'timestamp': material['original_date'], 'description': episode_info['synopsis'], + 'duration': parse_duration(material.get('duration')), } diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index 11c7d7e81..55f6cd0d8 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -151,6 +151,19 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor): 'duration': 62, } }, + { + 'note': 'video player needs Referer', + 'url': 'http://vimeo.com/user22258446/review/91613211/13f927e053', + 'md5': '6295fdab8f4bf6a002d058b2c6dce276', + 'info_dict': { + 'id': '91613211', + 'ext': 'mp4', + 'title': 'Death by dogma versus assembling agile - Sander Hoogendoorn', + 'uploader': 'DevWeek Events', + 'duration': 2773, + 'thumbnail': 're:^https?://.*\.jpg$', + } + } ] @classmethod @@ -205,6 +218,8 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor): if data is not None: headers = headers.copy() headers.update(data) + if 'Referer' not in headers: + headers['Referer'] = url # Extract ID from URL mobj = re.match(self._VALID_URL, url) diff --git a/youtube_dl/extractor/wat.py b/youtube_dl/extractor/wat.py index 76744215f..6462d2e81 100644 --- a/youtube_dl/extractor/wat.py +++ b/youtube_dl/extractor/wat.py @@ -7,7 +7,6 @@ import hashlib from .common import InfoExtractor from ..utils import ( - ExtractorError, unified_strdate, ) |