From d8707c6424a7547bda9afd38fe5cd706b8bce0f3 Mon Sep 17 00:00:00 2001 From: Marwan Yassin Date: Fri, 4 Oct 2019 23:04:10 +0200 Subject: [PATCH 1/3] Update aparat.py Fix download failures by removing 'plugins' dict dependency and use 'multiSRC' dict directly --- youtube_dl/extractor/aparat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/aparat.py b/youtube_dl/extractor/aparat.py index 883dcee7a..ebc28e1a4 100644 --- a/youtube_dl/extractor/aparat.py +++ b/youtube_dl/extractor/aparat.py @@ -46,13 +46,12 @@ class AparatIE(InfoExtractor): 'http://www.aparat.com/video/video/embed/vt/frame/showvideo/yes/videohash/' + video_id, video_id) - options = self._parse_json( + player = self._parse_json( self._search_regex( r'options\s*=\s*JSON\.parse\(\s*(["\'])(?P(?:(?!\1).)+)\1\s*\)', webpage, 'options', group='value'), video_id) - player = options['plugins']['sabaPlayerPlugin'] formats = [] for sources in player['multiSRC']: @@ -89,7 +88,8 @@ class AparatIE(InfoExtractor): return merge_dicts(info, { 'id': video_id, - 'thumbnail': url_or_none(options.get('poster')), + 'thumbnail': url_or_none(player.get('poster')), 'duration': int_or_none(player.get('duration')), 'formats': formats, }) + From 35da0c4bb8f39e561b07d23cdd135376af12abdf Mon Sep 17 00:00:00 2001 From: Marwan Yassin Date: Sun, 15 Mar 2020 05:57:24 +0200 Subject: [PATCH 2/3] Update Aparat regex --- youtube_dl/extractor/aparat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/aparat.py b/youtube_dl/extractor/aparat.py index ebc28e1a4..de863a594 100644 --- a/youtube_dl/extractor/aparat.py +++ b/youtube_dl/extractor/aparat.py @@ -48,7 +48,7 @@ class AparatIE(InfoExtractor): player = self._parse_json( self._search_regex( - r'options\s*=\s*JSON\.parse\(\s*(["\'])(?P(?:(?!\1).)+)\1\s*\)', + r'options\s*=\s*(?P.*\w*\W*)\;', webpage, 'options', group='value'), video_id) From ed1503f71ec26219696ddeea53e8d8ee372b90cc Mon Sep 17 00:00:00 2001 From: Marwan Yassin Date: Sun, 15 Mar 2020 06:05:12 +0200 Subject: [PATCH 3/3] Update Aparat regex Fix end of file newline for CI checks --- youtube_dl/extractor/aparat.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/aparat.py b/youtube_dl/extractor/aparat.py index de863a594..74cfd78f0 100644 --- a/youtube_dl/extractor/aparat.py +++ b/youtube_dl/extractor/aparat.py @@ -92,4 +92,3 @@ class AparatIE(InfoExtractor): 'duration': int_or_none(player.get('duration')), 'formats': formats, }) -