From 1c4804ef9b03e92ef6b1d6720f9a93bb54d98324 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Thu, 14 Dec 2017 23:05:07 +0100 Subject: [voot] fix format extraction(closes #14758) --- youtube_dl/extractor/voot.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'youtube_dl/extractor/voot.py') diff --git a/youtube_dl/extractor/voot.py b/youtube_dl/extractor/voot.py index 5de3deb8c..5fd1c3d80 100644 --- a/youtube_dl/extractor/voot.py +++ b/youtube_dl/extractor/voot.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from .common import InfoExtractor -from .kaltura import KalturaIE from ..utils import ( ExtractorError, int_or_none, @@ -17,11 +16,10 @@ class VootIE(InfoExtractor): _TESTS = [{ 'url': 'https://www.voot.com/shows/ishq-ka-rang-safed/1/360558/is-this-the-end-of-kamini-/441353', 'info_dict': { - 'id': '0_8ledb18o', + 'id': '441353', 'ext': 'mp4', 'title': 'Ishq Ka Rang Safed - Season 01 - Episode 340', 'description': 'md5:06291fbbbc4dcbe21235c40c262507c1', - 'uploader_id': 'batchUser', 'timestamp': 1472162937, 'upload_date': '20160825', 'duration': 1146, @@ -61,8 +59,10 @@ class VootIE(InfoExtractor): media = media_info['assets'] - entry_id = media['EntryId'] title = media['MediaName'] + formats = self._extract_m3u8_formats( + 'https://cdnapisec.kaltura.com/p/1982551/playManifest/pt/https/f/applehttp/t/web/e/' + media['EntryId'], + video_id, 'mp4', m3u8_id='hls', fatal=False) description, series, season_number, episode, episode_number = [None] * 5 @@ -82,9 +82,7 @@ class VootIE(InfoExtractor): episode_number = int_or_none(value) return { - '_type': 'url_transparent', - 'url': 'kaltura:1982551:%s' % entry_id, - 'ie_key': KalturaIE.ie_key(), + 'id': video_id, 'title': title, 'description': description, 'series': series, @@ -95,4 +93,5 @@ class VootIE(InfoExtractor): 'duration': int_or_none(media.get('Duration')), 'view_count': int_or_none(media.get('ViewCounter')), 'like_count': int_or_none(media.get('like_counter')), + 'formats': formats, } -- cgit v1.2.3 From 23f511f5c74d85222e69259996666b7ef97b9421 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Fri, 15 Dec 2017 09:05:59 +0100 Subject: [voot] sort formats --- youtube_dl/extractor/voot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'youtube_dl/extractor/voot.py') diff --git a/youtube_dl/extractor/voot.py b/youtube_dl/extractor/voot.py index 5fd1c3d80..426754489 100644 --- a/youtube_dl/extractor/voot.py +++ b/youtube_dl/extractor/voot.py @@ -62,7 +62,8 @@ class VootIE(InfoExtractor): title = media['MediaName'] formats = self._extract_m3u8_formats( 'https://cdnapisec.kaltura.com/p/1982551/playManifest/pt/https/f/applehttp/t/web/e/' + media['EntryId'], - video_id, 'mp4', m3u8_id='hls', fatal=False) + video_id, 'mp4', m3u8_id='hls') + self._sort_formats(formats) description, series, season_number, episode, episode_number = [None] * 5 -- cgit v1.2.3 From 5c5e60cff894e5372f89e6ba45d7ab6575c0a0b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sat, 23 Dec 2017 20:59:14 +0700 Subject: [voot] Fix video identification --- youtube_dl/extractor/voot.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'youtube_dl/extractor/voot.py') diff --git a/youtube_dl/extractor/voot.py b/youtube_dl/extractor/voot.py index 426754489..751b21ee5 100644 --- a/youtube_dl/extractor/voot.py +++ b/youtube_dl/extractor/voot.py @@ -16,7 +16,7 @@ class VootIE(InfoExtractor): _TESTS = [{ 'url': 'https://www.voot.com/shows/ishq-ka-rang-safed/1/360558/is-this-the-end-of-kamini-/441353', 'info_dict': { - 'id': '441353', + 'id': '0_8ledb18o', 'ext': 'mp4', 'title': 'Ishq Ka Rang Safed - Season 01 - Episode 340', 'description': 'md5:06291fbbbc4dcbe21235c40c262507c1', @@ -59,9 +59,10 @@ class VootIE(InfoExtractor): media = media_info['assets'] + entry_id = media['EntryId'] title = media['MediaName'] formats = self._extract_m3u8_formats( - 'https://cdnapisec.kaltura.com/p/1982551/playManifest/pt/https/f/applehttp/t/web/e/' + media['EntryId'], + 'https://cdnapisec.kaltura.com/p/1982551/playManifest/pt/https/f/applehttp/t/web/e/' + entry_id, video_id, 'mp4', m3u8_id='hls') self._sort_formats(formats) @@ -83,7 +84,8 @@ class VootIE(InfoExtractor): episode_number = int_or_none(value) return { - 'id': video_id, + 'extractor_key': 'Kaltura', + 'id': entry_id, 'title': title, 'description': description, 'series': series, -- cgit v1.2.3