mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ndr] add support for embeds

Browse Source
This commit is contained in:
remitamine 2015-09-07 20:53:37 +01:00
parent 3b18f539a7
commit 64997815c4
2 changed files with 73 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/__init__.py
View File

@ -368,6 +368,8 @@ from .nbc import (
from .ndr import (
NDRIE,
NJoyIE,
NDREmbedIE,
NJoyEmbedIE,
)
from .ndtv import NDTVIE
from .netzkino import NetzkinoIE

84
youtube_dl/extractor/ndr.py
View File

@ -12,21 +12,18 @@ preferences = {'xl': 4, 'l': 3, 'm': 2, 's': 1, 'xs': 0,}
class NDRBaseIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
json_data = self._download_json('http://www.ndr.de/%s-ppjson.json' % video_id, video_id, 'Downloading page')
def extract_video_info(self, playlist, video_id):
formats = []
objetType = json_data.get('config').get('objectType')
if objetType == 'video':
for key, f in json_data.get('playlist').items():
streamType = playlist.get('config').get('streamType')
if streamType == 'httpVideo':
for key, f in playlist.items():
if key != 'config':
src = f['src']
if '.f4m' in src:
formats.extend(self._extract_f4m_formats(src, video_id))
elif '.m3u8' in src:
formats.extend(self._extract_m3u8_formats(src, video_id))
formats.extend(self._extract_m3u8_formats(src, video_id, fatal=False))
else:
quality = f.get('quality')
formats.append({
@ -34,20 +31,20 @@ class NDRBaseIE(InfoExtractor):
'format_id': quality,
'preference': preferences.get(quality),
})
elif objetType == 'audio':
for key, f in json_data.get('playlist').items():
elif streamType == 'httpAudio':
for key, f in playlist.items():
if key != 'config':
formats.append({
'url': f['src'],
'format_id': 'mp3',
'vcodec': 'none',
})
else:
raise ExtractorError('No media links available for %s' % video_id)
self._sort_formats(formats)
config = json_data.get('playlist').get('config')
config = playlist.get('config')
title = config['title']
duration = int_or_none(config.get('duration'))
@ -65,6 +62,25 @@ class NDRBaseIE(InfoExtractor):
'formats': formats,
}
def _real_extract(self, url):
video_id = self._match_id(url)
json_data = self._download_json('http://www.ndr.de/%s-ppjson.json' % video_id, video_id, fatal=False)
if not json_data:
webpage = self._download_webpage(url, video_id)
embed_url = self._html_search_regex(r'<iframe[^>]+id="pp_\w+"[^>]+src="(/.*)"', webpage, 'embed url', None, False)
if not embed_url:
embed_url = self._html_search_meta('embedURL', webpage, fatal=False)
if embed_url:
if embed_url.startswith('/'):
return self.url_result('http://www.ndr.de%s' % embed_url, 'NDREmbed')
else:
return self.url_result(embed_url, 'NDREmbed')
raise ExtractorError('No media links available for %s' % video_id)
return self.extract_video_info(json_data['playlist'], video_id)
class NDRIE(NDRBaseIE):
IE_NAME = 'ndr'
@ -116,9 +132,51 @@ class NJoyIE(NDRBaseIE):
'url': 'http://www.n-joy.de/entertainment/comedy/comedy_contest/Benaissa-beim-NDR-Comedy-Contest,comedycontest2480.html',
'md5': 'cb63be60cd6f9dd75218803146d8dc67',
'info_dict': {
'id': '2480',
'id': 'comedycontest2480',
'ext': 'mp4',
'title': 'Benaissa beim NDR Comedy Contest',
'duration': 654,
}
}
class NDREmbedBaseIE(NDRBaseIE):
def _real_extract(self, url):
video_id = self._match_id(url)
json_data = self._download_json('http://www.ndr.de/%s-ppjson.json' % video_id, video_id, fatal=False)
if not json_data:
raise ExtractorError('No media links available for %s' % video_id)
return self.extract_video_info(json_data['playlist'], video_id)
class NDREmbedIE(NDREmbedBaseIE):
IE_NAME = 'ndr:embed'
_VALID_URL = r'https?://www\.ndr\.de/(?:[^/]+/)+(?P<id>\w+)'
_TEST = {
'url': 'http://www.ndr.de/fernsehen/sendungen/ndr_aktuell/ndraktuell28488-player.html',
'md5': 'cb63be60cd6f9dd75218803146d8dc67',
'info_dict': {
'id': 'ndraktuell28488',
'ext': 'mp4',
'title': 'Norddeutschland begrüßt Flüchtlinge',
'duration': 132,
}
}
class NJoyEmbedIE(NDREmbedBaseIE):
IE_NAME = 'N-JOY:embed'
_VALID_URL = r'https?://www\.n-joy\.de/(?:[^/]+/)(?P<id>\w+)'
_TEST = {
'url': 'http://www.n-joy.de/entertainment/film/portraet374-player_image-832d9b79-fa8a-4026-92e2-e0fd99deb2f9_theme-n-joy.html',
'md5': 'cb63be60cd6f9dd75218803146d8dc67',
'info_dict': {
'id': 'portraet374',
'ext': 'mp4',
'title': 'Viviane Andereggen - "Schuld um Schuld"',
'duration': 129,
}
}