salfter/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-10-29 09:26:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[urplay] add supprt for urskola.se and fix subtitle extraction(closes #10915)

Browse Source
This commit is contained in:
Remita Amine
2016-10-19 15:05:39 +01:00
parent 0384932e3d
commit efb6242916
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
youtube_dl/extractor/urplay.py
View File

@@ -5,17 +5,20 @@ from .common import InfoExtractor
class URPlayIE(InfoExtractor): class URPlayIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?urplay\.se/program/(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:www\.)?ur(?:play|skola)\.se/(?:program|Produkter)/(?P<id>[0-9]+)'
_TEST = { _TESTS = [{
'url': 'http://urplay.se/program/190031-tripp-trapp-trad-sovkudde', 'url': 'http://urplay.se/program/190031-tripp-trapp-trad-sovkudde',
'md5': '15ca67b63fd8fb320ac2bcd854bad7b6', 'md5': 'ad5f0de86f16ca4c8062cd103959a9eb',
'info_dict': { 'info_dict': {
'id': '190031', 'id': '190031',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Tripp, Trapp, Träd : Sovkudde', 'title': 'Tripp, Trapp, Träd : Sovkudde',
'description': 'md5:b86bffdae04a7e9379d1d7e5947df1d1', 'description': 'md5:b86bffdae04a7e9379d1d7e5947df1d1',
} },
} }, {
'url': 'http://urskola.se/Produkter/155794-Smasagor-meankieli-Grodan-i-vida-varlden',
'only_matching': True,
}]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
@@ -27,30 +30,17 @@ class URPlayIE(InfoExtractor):
formats = [] formats = []
for quality_attr, quality, preference in (('', 'sd', 0), ('_hd', 'hd', 1)): for quality_attr, quality, preference in (('', 'sd', 0), ('_hd', 'hd', 1)):
file_rtmp = urplayer_data.get('file_rtmp' + quality_attr)
if file_rtmp:
formats.append({
'url': 'rtmp://%s/urplay/mp4:%s' % (host, file_rtmp),
'format_id': quality + '-rtmp',
'ext': 'flv',
'preference': preference,
})
file_http = urplayer_data.get('file_http' + quality_attr) or urplayer_data.get('file_http_sub' + quality_attr) file_http = urplayer_data.get('file_http' + quality_attr) or urplayer_data.get('file_http_sub' + quality_attr)
if file_http: if file_http:
file_http_base_url = 'http://%s/%s' % (host, file_http) formats.extend(self._extract_wowza_formats(
formats.extend(self._extract_f4m_formats( 'http://%s/%splaylist.m3u8' % (host, file_http), video_id, skip_protocols=['rtmp', 'rtsp']))
file_http_base_url + 'manifest.f4m', video_id,
preference, '%s-hds' % quality, fatal=False))
formats.extend(self._extract_m3u8_formats(
file_http_base_url + 'playlist.m3u8', video_id, 'mp4',
'm3u8_native', preference, '%s-hls' % quality, fatal=False))
self._sort_formats(formats) self._sort_formats(formats)
subtitles = {} subtitles = {}
for subtitle in urplayer_data.get('subtitles', []): for subtitle in urplayer_data.get('subtitles', []):
subtitle_url = subtitle.get('file') subtitle_url = subtitle.get('file')
kind = subtitle.get('kind') kind = subtitle.get('kind')
if subtitle_url or kind and kind != 'captions': if not subtitle_url or (kind and kind != 'captions'):
continue continue
subtitles.setdefault(subtitle.get('label', 'Svenska'), []).append({ subtitles.setdefault(subtitle.get('label', 'Svenska'), []).append({
'url': subtitle_url, 'url': subtitle_url,