[r7] Fix extraction and add support for articles (Closes #9826)

This commit is contained in:
Sergey M․ 2016-06-19 02:25:34 +07:00
parent cb23192bc4
commit 7577d849a6
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
2 changed files with 64 additions and 36 deletions

View file

@ -631,7 +631,10 @@ from .qqmusic import (
QQMusicToplistIE, QQMusicToplistIE,
QQMusicPlaylistIE, QQMusicPlaylistIE,
) )
from .r7 import R7IE from .r7 import (
R7IE,
R7ArticleIE,
)
from .radiocanada import ( from .radiocanada import (
RadioCanadaIE, RadioCanadaIE,
RadioCanadaAudioVideoIE, RadioCanadaAudioVideoIE,

View file

@ -2,22 +2,19 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import int_or_none
js_to_json,
unescapeHTML,
int_or_none,
)
class R7IE(InfoExtractor): class R7IE(InfoExtractor):
_VALID_URL = r'''(?x)https?:// _VALID_URL = r'''(?x)
https?://
(?: (?:
(?:[a-zA-Z]+)\.r7\.com(?:/[^/]+)+/idmedia/| (?:[a-zA-Z]+)\.r7\.com(?:/[^/]+)+/idmedia/|
noticias\.r7\.com(?:/[^/]+)+/[^/]+-| noticias\.r7\.com(?:/[^/]+)+/[^/]+-|
player\.r7\.com/video/i/ player\.r7\.com/video/i/
) )
(?P<id>[\da-f]{24}) (?P<id>[\da-f]{24})
''' '''
_TESTS = [{ _TESTS = [{
'url': 'http://videos.r7.com/policiais-humilham-suspeito-a-beira-da-morte-morre-com-dignidade-/idmedia/54e7050b0cf2ff57e0279389.html', 'url': 'http://videos.r7.com/policiais-humilham-suspeito-a-beira-da-morte-morre-com-dignidade-/idmedia/54e7050b0cf2ff57e0279389.html',
'md5': '403c4e393617e8e8ddc748978ee8efde', 'md5': '403c4e393617e8e8ddc748978ee8efde',
@ -25,6 +22,7 @@ class R7IE(InfoExtractor):
'id': '54e7050b0cf2ff57e0279389', 'id': '54e7050b0cf2ff57e0279389',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Policiais humilham suspeito à beira da morte: "Morre com dignidade"', 'title': 'Policiais humilham suspeito à beira da morte: "Morre com dignidade"',
'description': 'md5:01812008664be76a6479aa58ec865b72',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
'duration': 98, 'duration': 98,
'like_count': int, 'like_count': int,
@ -44,45 +42,72 @@ class R7IE(InfoExtractor):
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( video = self._download_json(
'http://player.r7.com/video/i/%s' % video_id, video_id) 'http://player-api.r7.com/video/i/%s' % video_id, video_id)
item = self._parse_json(js_to_json(self._search_regex( title = video['title']
r'(?s)var\s+item\s*=\s*({.+?});', webpage, 'player')), video_id)
title = unescapeHTML(item['title'])
thumbnail = item.get('init', {}).get('thumbUri')
duration = None
statistics = item.get('statistics', {})
like_count = int_or_none(statistics.get('likes'))
view_count = int_or_none(statistics.get('views'))
formats = [] formats = []
for format_key, format_dict in item['playlist'][0].items(): media_url_hls = video.get('media_url_hls')
src = format_dict.get('src') if media_url_hls:
if not src: formats.extend(self._extract_m3u8_formats(
continue media_url_hls, video_id, 'mp4', entry_protocol='m3u8_native',
format_id = format_dict.get('format') or format_key m3u8_id='hls', fatal=False))
if duration is None: media_url = video.get('media_url')
duration = format_dict.get('duration') if media_url:
if '.f4m' in src: f = {
formats.extend(self._extract_f4m_formats(src, video_id, preference=-1)) 'url': media_url,
elif src.endswith('.m3u8'): 'format_id': 'http',
formats.extend(self._extract_m3u8_formats(src, video_id, 'mp4', preference=-2)) }
else: # m3u8 format always matches the http format, let's copy metadata from
formats.append({ # one to another
'url': src, m3u8_formats = list(filter(
'format_id': format_id, lambda f: f.get('vcodec') != 'none' and f.get('resolution') != 'multiple',
}) formats))
if len(m3u8_formats) == 1:
f_copy = m3u8_formats[0].copy()
f_copy.update(f)
f_copy['protocol'] = 'http'
f = f_copy
formats.append(f)
self._sort_formats(formats) self._sort_formats(formats)
description = video.get('description')
thumbnail = video.get('thumb')
duration = int_or_none(video.get('media_duration'))
like_count = int_or_none(video.get('likes'))
view_count = int_or_none(video.get('views'))
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': description,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'duration': duration, 'duration': duration,
'like_count': like_count, 'like_count': like_count,
'view_count': view_count, 'view_count': view_count,
'formats': formats, 'formats': formats,
} }
class R7ArticleIE(InfoExtractor):
_VALID_URL = r'https?://(?:[a-zA-Z]+)\.r7\.com/(?:[^/]+/)+[^/?#&]+-(?P<id>\d+)'
_TEST = {
'url': 'http://tv.r7.com/record-play/balanco-geral/videos/policiais-humilham-suspeito-a-beira-da-morte-morre-com-dignidade-16102015',
'only_matching': True,
}
@classmethod
def suitable(cls, url):
return False if R7IE.suitable(url) else super(R7ArticleIE, cls).suitable(url)
def _real_extract(self, url):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
video_id = self._search_regex(
r'<div[^>]+(?:id=["\']player-|class=["\']embed["\'][^>]+id=["\'])([\da-f]{24})',
webpage, 'video id')
return self.url_result('http://player.r7.com/video/i/%s' % video_id, R7IE.ie_key())