From 90dacedd32021330e7307df4dca6b26d18ac3bd6 Mon Sep 17 00:00:00 2001 From: kzm4269 <4269kzm@gmail.com> Date: Fri, 20 Jul 2018 17:41:43 +0900 Subject: [PATCH 1/3] [Iwara] Update extractor --- youtube_dl/extractor/iwara.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/iwara.py b/youtube_dl/extractor/iwara.py index a7514fc80..8bfa28aeb 100644 --- a/youtube_dl/extractor/iwara.py +++ b/youtube_dl/extractor/iwara.py @@ -76,8 +76,13 @@ class IwaraIE(InfoExtractor): format_id = a_format.get('resolution') height = int_or_none(self._search_regex( r'(\d+)p', format_id, 'height', default=None)) + if a_format['uri'].startswith('//'): + uri = 'https:' + a_format['uri'] + else: + uri = a_format['uri'] + formats.append({ - 'url': a_format['uri'], + 'url': uri, 'format_id': format_id, 'ext': mimetype2ext(a_format.get('mime')) or 'mp4', 'height': height, From 588d6d56605ebfa6aed9cda454673751e2c7ccd2 Mon Sep 17 00:00:00 2001 From: kzm4269 <4269kzm@gmail.com> Date: Sat, 21 Jul 2018 17:42:42 +0900 Subject: [PATCH 2/3] Use `_proto_relative_url` --- youtube_dl/extractor/iwara.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/youtube_dl/extractor/iwara.py b/youtube_dl/extractor/iwara.py index 8bfa28aeb..2b7995ce3 100644 --- a/youtube_dl/extractor/iwara.py +++ b/youtube_dl/extractor/iwara.py @@ -76,13 +76,9 @@ class IwaraIE(InfoExtractor): format_id = a_format.get('resolution') height = int_or_none(self._search_regex( r'(\d+)p', format_id, 'height', default=None)) - if a_format['uri'].startswith('//'): - uri = 'https:' + a_format['uri'] - else: - uri = a_format['uri'] formats.append({ - 'url': uri, + 'url': self._proto_relative_url(a_format['uri'], 'https:'), 'format_id': format_id, 'ext': mimetype2ext(a_format.get('mime')) or 'mp4', 'height': height, From 7881c9ee56a936eb3daf3d92ed708a8919714999 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Sat, 21 Jul 2018 17:39:30 +0700 Subject: [PATCH 3/3] Update iwara.py --- youtube_dl/extractor/iwara.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/iwara.py b/youtube_dl/extractor/iwara.py index 2b7995ce3..250140d91 100644 --- a/youtube_dl/extractor/iwara.py +++ b/youtube_dl/extractor/iwara.py @@ -76,7 +76,6 @@ class IwaraIE(InfoExtractor): format_id = a_format.get('resolution') height = int_or_none(self._search_regex( r'(\d+)p', format_id, 'height', default=None)) - formats.append({ 'url': self._proto_relative_url(a_format['uri'], 'https:'), 'format_id': format_id,