Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[nowtv] Fix extraction (Closes #6357)

Browse Source
This commit is contained in:
Sergey M․ 2015-08-02 04:21:16 +06:00
parent 9cc93c64aa
commit cdc682d5a4
1 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
youtube_dl/extractor/nowtv.py
View File

@ -7,6 +7,7 @@ from .common import InfoExtractor
from ..compat import compat_str from ..compat import compat_str
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
determine_ext,
int_or_none, int_or_none,
parse_iso8601, parse_iso8601,
parse_duration, parse_duration,
@ -15,7 +16,7 @@ from ..utils import (
class NowTVIE(InfoExtractor): class NowTVIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?nowtv\.de/(?P<station>rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<id>.+?)/player' _VALID_URL = r'https?://(?:www\.)?nowtv\.de/(?:rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<id>.+?)/player'
_TESTS = [{ _TESTS = [{
# rtl # rtl
@ -23,7 +24,7 @@ class NowTVIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '203519', 'id': '203519',
'display_id': 'bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit', 'display_id': 'bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit',
'ext': 'mp4', 'ext': 'flv',
'title': 'Die neuen Bauern und eine Hochzeit', 'title': 'Die neuen Bauern und eine Hochzeit',
'description': 'md5:e234e1ed6d63cf06be5c070442612e7e', 'description': 'md5:e234e1ed6d63cf06be5c070442612e7e',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
@ -32,7 +33,7 @@ class NowTVIE(InfoExtractor):
'duration': 2786, 'duration': 2786,
}, },
'params': { 'params': {
# m3u8 download # rtmp download
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
@ -41,7 +42,7 @@ class NowTVIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '203481', 'id': '203481',
'display_id': 'berlin-tag-nacht/berlin-tag-nacht-folge-934', 'display_id': 'berlin-tag-nacht/berlin-tag-nacht-folge-934',
'ext': 'mp4', 'ext': 'flv',
'title': 'Berlin - Tag & Nacht (Folge 934)', 'title': 'Berlin - Tag & Nacht (Folge 934)',
'description': 'md5:c85e88c2e36c552dfe63433bc9506dd0', 'description': 'md5:c85e88c2e36c552dfe63433bc9506dd0',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
@ -50,7 +51,7 @@ class NowTVIE(InfoExtractor):
'duration': 2641, 'duration': 2641,
}, },
'params': { 'params': {
# m3u8 download # rtmp download
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
@ -59,7 +60,7 @@ class NowTVIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '165780', 'id': '165780',
'display_id': 'alarm-fuer-cobra-11-die-autobahnpolizei/hals-und-beinbruch-2014-08-23-21-10-00', 'display_id': 'alarm-fuer-cobra-11-die-autobahnpolizei/hals-und-beinbruch-2014-08-23-21-10-00',
'ext': 'mp4', 'ext': 'flv',
'title': 'Hals- und Beinbruch', 'title': 'Hals- und Beinbruch',
'description': 'md5:b50d248efffe244e6f56737f0911ca57', 'description': 'md5:b50d248efffe244e6f56737f0911ca57',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
@ -68,7 +69,7 @@ class NowTVIE(InfoExtractor):
'duration': 2742, 'duration': 2742,
}, },
'params': { 'params': {
# m3u8 download # rtmp download
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
@ -77,7 +78,7 @@ class NowTVIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '99205', 'id': '99205',
'display_id': 'medicopter-117/angst', 'display_id': 'medicopter-117/angst',
'ext': 'mp4', 'ext': 'flv',
'title': 'Angst!', 'title': 'Angst!',
'description': 'md5:30cbc4c0b73ec98bcd73c9f2a8c17c4e', 'description': 'md5:30cbc4c0b73ec98bcd73c9f2a8c17c4e',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
@ -86,7 +87,7 @@ class NowTVIE(InfoExtractor):
'duration': 3025, 'duration': 3025,
}, },
'params': { 'params': {
# m3u8 download # rtmp download
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
@ -95,7 +96,7 @@ class NowTVIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '203521', 'id': '203521',
'display_id': 'ratgeber-geld/thema-ua-der-erste-blick-die-apple-watch', 'display_id': 'ratgeber-geld/thema-ua-der-erste-blick-die-apple-watch',
'ext': 'mp4', 'ext': 'flv',
'title': 'Thema u.a.: Der erste Blick: Die Apple Watch', 'title': 'Thema u.a.: Der erste Blick: Die Apple Watch',
'description': 'md5:4312b6c9d839ffe7d8caf03865a531af', 'description': 'md5:4312b6c9d839ffe7d8caf03865a531af',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
@ -104,7 +105,7 @@ class NowTVIE(InfoExtractor):
'duration': 1083, 'duration': 1083,
}, },
'params': { 'params': {
# m3u8 download # rtmp download
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
@ -113,7 +114,7 @@ class NowTVIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '128953', 'id': '128953',
'display_id': 'der-hundeprofi/buero-fall-chihuahua-joel', 'display_id': 'der-hundeprofi/buero-fall-chihuahua-joel',
'ext': 'mp4', 'ext': 'flv',
'title': "Büro-Fall / Chihuahua 'Joel'", 'title': "Büro-Fall / Chihuahua 'Joel'",
'description': 'md5:e62cb6bf7c3cc669179d4f1eb279ad8d', 'description': 'md5:e62cb6bf7c3cc669179d4f1eb279ad8d',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
@ -122,15 +123,13 @@ class NowTVIE(InfoExtractor):
'duration': 3092, 'duration': 3092,
}, },
'params': { 'params': {
# m3u8 download # rtmp download
'skip_download': True, 'skip_download': True,
}, },
}] }]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) display_id = self._match_id(url)
display_id = mobj.group('id')
station = mobj.group('station')
info = self._download_json( info = self._download_json(
'https://api.nowtv.de/v3/movies/%s?fields=id,title,free,geoblocked,articleLong,articleShort,broadcastStartDate,seoUrl,duration,format,files' % display_id, 'https://api.nowtv.de/v3/movies/%s?fields=id,title,free,geoblocked,articleLong,articleShort,broadcastStartDate,seoUrl,duration,format,files' % display_id,
@ -148,29 +147,19 @@ class NowTVIE(InfoExtractor):
raise ExtractorError( raise ExtractorError(
'Video %s is not available for free' % video_id, expected=True) 'Video %s is not available for free' % video_id, expected=True)
f = info.get('format', {})
station = f.get('station') or station
STATIONS = {
'rtl': 'rtlnow',
'rtl2': 'rtl2now',
'vox': 'voxnow',
'nitro': 'rtlnitronow',
'ntv': 'n-tvnow',
'superrtl': 'superrtlnow'
}
formats = [] formats = []
for item in files['items']: for item in files['items']:
item_path = remove_start(item['path'], '/') if determine_ext(item['path']) != 'f4v':
tbr = int_or_none(item['bitrate']) continue
m3u8_url = 'http://hls.fra.%s.de/hls-vod-enc/%s.m3u8' % (STATIONS[station], item_path) app, play_path = remove_start(item['path'], '/').split('/', 1)
m3u8_url = m3u8_url.replace('now/', 'now/videos/')
formats.append({ formats.append({
'url': m3u8_url, 'url': 'rtmpe://fms.rtl.de',
'format_id': '%s-%sk' % (item['id'], tbr), 'app': app,
'ext': 'mp4', 'play_path': 'mp4:%s' % play_path,
'tbr': tbr, 'ext': 'flv',
'page_url': url,
'player_url': 'http://rtl-now.rtl.de/includes/nc_player.swf',
'tbr': int_or_none(item.get('bitrate')),
}) })
self._sort_formats(formats) self._sort_formats(formats)
@ -178,6 +167,8 @@ class NowTVIE(InfoExtractor):
description = info.get('articleLong') or info.get('articleShort') description = info.get('articleLong') or info.get('articleShort')
timestamp = parse_iso8601(info.get('broadcastStartDate'), ' ') timestamp = parse_iso8601(info.get('broadcastStartDate'), ' ')
duration = parse_duration(info.get('duration')) duration = parse_duration(info.get('duration'))
f = info.get('format', {})
thumbnail = f.get('defaultImage169Format') or f.get('defaultImage169Logo') thumbnail = f.get('defaultImage169Format') or f.get('defaultImage169Logo')
return { return {