R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DW] Update extractor with /playersources API

Browse Source
This commit is contained in:
Logan Fleur 2018-06-01 07:11:56 +02:00
parent 0bfdcc1495
commit 60dca1b0c0
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
youtube_dl/extractor/dw.py
View File

@ -5,6 +5,7 @@ from .common import InfoExtractor
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
unified_strdate, unified_strdate,
ExtractorError
) )
from ..compat import compat_urlparse from ..compat import compat_urlparse
@ -12,6 +13,7 @@ from ..compat import compat_urlparse
class DWIE(InfoExtractor): class DWIE(InfoExtractor):
IE_NAME = 'dw' IE_NAME = 'dw'
_VALID_URL = r'https?://(?:www\.)?dw\.com/(?:[^/]+/)+(?:av|e)-(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?dw\.com/(?:[^/]+/)+(?:av|e)-(?P<id>\d+)'
_SOURCES_URL = 'http://www.dw.com/playersources/%s-%s'
_TESTS = [{ _TESTS = [{
# video # video
'url': 'http://www.dw.com/en/intelligent-light/av-19112290', 'url': 'http://www.dw.com/en/intelligent-light/av-19112290',
@ -21,7 +23,18 @@ class DWIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'Intelligent light', 'title': 'Intelligent light',
'description': 'md5:90e00d5881719f2a6a5827cb74985af1', 'description': 'md5:90e00d5881719f2a6a5827cb74985af1',
'upload_date': '20160311', 'upload_date': '20160605',
}
}, {
# 720 video
'url': 'http://www.dw.com/en/hamburg-imposes-germanys-first-diesel-ban/av-44026376',
'md5': '09299d024c4003145247d02b45a2bd3f',
'info_dict': {
'id': '44026376',
'ext': 'mp4',
'title': 'Hamburg imposes Germany\'s first diesel ban',
'description': 'md5:a455cf13a29a11d5abff2c9a57981198',
'upload_date': '20180531',
} }
}, { }, {
# audio # audio
@ -55,13 +68,30 @@ class DWIE(InfoExtractor):
title = hidden_inputs['media_title'] title = hidden_inputs['media_title']
media_id = hidden_inputs.get('media_id') or media_id media_id = hidden_inputs.get('media_id') or media_id
if hidden_inputs.get('player_type') == 'video' and hidden_inputs.get('stream_file') == '1': if hidden_inputs.get('player_type') == 'video':
formats = self._extract_smil_formats( if hidden_inputs.get('stream_file') == '1':
'http://www.dw.com/smil/v-%s' % media_id, media_id, formats = self._extract_smil_formats(
transform_source=lambda s: s.replace( 'http://www.dw.com/smil/v-%s' % media_id, media_id,
'rtmp://tv-od.dw.de/flash/', transform_source=lambda s: s.replace(
'http://tv-download.dw.de/dwtv_video/flv/')) 'rtmp://tv-od.dw.de/flash/',
self._sort_formats(formats) 'http://tv-download.dw.de/dwtv_video/flv/'))
self._sort_formats(formats)
else:
media = self._download_json(self._SOURCES_URL % ('v', media_id), media_id)
formats = []
for medium in media:
formats.append({
'url': medium.get('file'),
'format_id': medium.get('label')
})
self._sort_formats(formats, 'label')
elif hidden_inputs.get('player_type') == 'audio':
media = self._download_json(self._SOURCES_URL % ('a', media_id), media_id)
formats = []
for medium in media:
formats.append({
'url': medium.get('file'),
})
else: else:
formats = [{'url': hidden_inputs['file_name']}] formats = [{'url': hidden_inputs['file_name']}]