Browse Source

[rte] Make more robust and add a new testcase (#4015)

totalwebcasting
Philipp Hagemeister 10 years ago
parent
commit
ea1d5bdcdd
1 changed files with 21 additions and 17 deletions
  1. +21
    -17
      youtube_dl/extractor/rte.py

+ 21
- 17
youtube_dl/extractor/rte.py View File

@ -9,34 +9,38 @@ from ..utils import (
class RteIE(InfoExtractor): class RteIE(InfoExtractor):
_VALID_URL = r'http?://(?:www\.)?rte\.ie/player/in/show/(?P<id>[0-9]+)/'
_VALID_URL = r'http?://(?:www\.)?rte\.ie/player/[^/]{2,3}/show/(?P<id>[0-9]+)/'
_TEST = { _TEST = {
'url': 'http://www.rte.ie/player/in/show/10336191/',
'url': 'http://www.rte.ie/player/de/show/10363114/',
'info_dict': { 'info_dict': {
'id': '10336191',
'id': '10363114',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Nine News',
'title': 'One News',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
'description': 'The One O\'Clock News followed by Weather.', 'description': 'The One O\'Clock News followed by Weather.',
'duration': 1622.963,
'duration': 436.844,
},
'params': {
'skip_download': 'f4m fails with --test atm'
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
description = self._search_regex(r'<meta name="description" content="(.*?)" />', webpage, 'description')
duration = float_or_none(self._html_search_meta('duration', webpage, 'duration'), 1000)
thumbnail_id = self._search_regex(r'<meta name="thumbnail" content="uri:irus:(.*?)" />', webpage, 'thumbnail')
thumbnail = 'http://img.rasset.ie/' + thumbnail_id + '.jpg'
description = self._html_search_meta('description', webpage, 'description')
duration = float_or_none(self._html_search_meta(
'duration', webpage, 'duration', fatal=False), 1000)
thumbnail_id = self._search_regex(
r'<meta name="thumbnail" content="uri:irus:(.*?)" />', webpage, 'thumbnail')
thumbnail = 'http://img.rasset.ie/' + thumbnail_id + '.jpg'
feeds_url = self._html_search_meta("feeds-prefix", webpage, 'feeds url') + video_id feeds_url = self._html_search_meta("feeds-prefix", webpage, 'feeds url') + video_id
json_string = self._download_json(feeds_url, video_id) json_string = self._download_json(feeds_url, video_id)
# f4m_url = server + relative_url # f4m_url = server + relative_url
f4m_url = json_string['shows'][0]['media:group'][0]['rte:server'] + json_string['shows'][0]['media:group'][0]['url'] f4m_url = json_string['shows'][0]['media:group'][0]['rte:server'] + json_string['shows'][0]['media:group'][0]['url']
f4m_formats = self._extract_f4m_formats(f4m_url, video_id) f4m_formats = self._extract_f4m_formats(f4m_url, video_id)
@ -46,8 +50,8 @@ class RteIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'width': f['width'], 'width': f['width'],
'height': f['height'], 'height': f['height'],
} for f in f4m_formats ]
} for f in f4m_formats]
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
@ -55,4 +59,4 @@ class RteIE(InfoExtractor):
'description': description, 'description': description,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'duration': duration, 'duration': duration,
}
}

Loading…
Cancel
Save