From 1c145357bfea75b7a4614543cdf347f62db75054 Mon Sep 17 00:00:00 2001 From: einstein95 Date: Fri, 12 Jan 2018 07:01:02 +1300 Subject: [PATCH 1/2] [rentv] Fix extractor --- youtube_dl/extractor/rentv.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/rentv.py b/youtube_dl/extractor/rentv.py index d338b3a93..6c9ebb29b 100644 --- a/youtube_dl/extractor/rentv.py +++ b/youtube_dl/extractor/rentv.py @@ -26,9 +26,20 @@ class RENTVIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage('http://ren.tv/player/' + video_id, video_id) - jw_config = self._parse_json(self._search_regex( - r'config\s*=\s*({.+});', webpage, 'jw config'), video_id) - return self._parse_jwplayer_data(jw_config, video_id, m3u8_id='hls') + config = self._parse_json(self._search_regex( + r'config\s*=\s*({.+});', webpage, 'config'), video_id) + formats = [] + for video in config['src']: + formats.append({ + 'url': video['src'] + }) + self._sort_formats(formats) + return { + 'id': video_id, + 'formats': formats, + 'title': config['title'], + 'thumbnail': config['image'] + } class RENTVArticleIE(InfoExtractor): From 33118b603aa2f19a4ac404bbbaa0b7e9b1fd2cac Mon Sep 17 00:00:00 2001 From: einstein95 Date: Sat, 13 Jan 2018 01:06:46 +1300 Subject: [PATCH 2/2] replace explicit dict gets with .get and blank fallback --- youtube_dl/extractor/rentv.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/rentv.py b/youtube_dl/extractor/rentv.py index 6c9ebb29b..df528b09e 100644 --- a/youtube_dl/extractor/rentv.py +++ b/youtube_dl/extractor/rentv.py @@ -29,16 +29,16 @@ class RENTVIE(InfoExtractor): config = self._parse_json(self._search_regex( r'config\s*=\s*({.+});', webpage, 'config'), video_id) formats = [] - for video in config['src']: + for video in config.get('src', ''): formats.append({ - 'url': video['src'] + 'url': video.get('src', '') }) self._sort_formats(formats) return { 'id': video_id, 'formats': formats, - 'title': config['title'], - 'thumbnail': config['image'] + 'title': config.get('title', ''), + 'thumbnail': config.get('image', '') }