From faf7f36b731b9398f18ef06f1808879a06300b41 Mon Sep 17 00:00:00 2001 From: adirizka7 Date: Mon, 10 Dec 2018 02:00:23 +0700 Subject: [PATCH 1/2] remove ads embedded in json if any (closes #18430) --- youtube_dl/extractor/rudo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/rudo.py b/youtube_dl/extractor/rudo.py index f036f6757..3819f6186 100644 --- a/youtube_dl/extractor/rudo.py +++ b/youtube_dl/extractor/rudo.py @@ -38,8 +38,8 @@ class RudoIE(InfoExtractor): webpage = self._download_webpage(url, video_id, encoding='iso-8859-1') - jwplayer_data = self._parse_json(self._search_regex( - r'(?s)playerInstance\.setup\(({.+?})\)', webpage, 'jwplayer data'), video_id, + jwplayer_data = self._parse_json(re.sub('events: {(.|\n)*},\nabouttext', 'abouttext', + self._search_regex(r'(?s)playerInstance\.setup\(({.+?})\)', webpage, 'jwplayer data')), video_id, transform_source=lambda s: js_to_json(re.sub(r'encodeURI\([^)]+\)', '""', s))) info_dict = self._parse_jwplayer_data( From 6cccba3c3a4fe74b2bcbc3589c8e184ceb7e4076 Mon Sep 17 00:00:00 2001 From: adirizka7 Date: Mon, 10 Dec 2018 03:28:50 +0000 Subject: [PATCH 2/2] fix syntax (based on flake8) --- youtube_dl/extractor/rudo.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/rudo.py b/youtube_dl/extractor/rudo.py index 3819f6186..74317ca45 100644 --- a/youtube_dl/extractor/rudo.py +++ b/youtube_dl/extractor/rudo.py @@ -38,8 +38,12 @@ class RudoIE(InfoExtractor): webpage = self._download_webpage(url, video_id, encoding='iso-8859-1') - jwplayer_data = self._parse_json(re.sub('events: {(.|\n)*},\nabouttext', 'abouttext', - self._search_regex(r'(?s)playerInstance\.setup\(({.+?})\)', webpage, 'jwplayer data')), video_id, + jwplayer_data = self._parse_json( + re.sub( + 'events: {(.|\n)*},\nabouttext', + 'abouttext', + self._search_regex(r'(?s)playerInstance\.setup\(({.+?})\)', webpage, 'jwplayer data')), + video_id, transform_source=lambda s: js_to_json(re.sub(r'encodeURI\([^)]+\)', '""', s))) info_dict = self._parse_jwplayer_data(