From 7342463626de8d34f629f59afbe8101ac5b6b56e Mon Sep 17 00:00:00 2001 From: Argn0 Date: Fri, 23 Jun 2017 11:53:19 +0200 Subject: [PATCH 1/6] Update ign.py --- youtube_dl/extractor/ign.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py index dc9f7800e..38fa10a96 100644 --- a/youtube_dl/extractor/ign.py +++ b/youtube_dl/extractor/ign.py @@ -97,8 +97,7 @@ class IGNIE(InfoExtractor): r'class="hero-poster[^"]*?"[^>]*id="(.+?)"', r'data-video-id="(.+?)"', r' Date: Fri, 23 Jun 2017 11:55:07 +0200 Subject: [PATCH 2/6] request.py _parse ValueError (empty URL) --- youtube_dl/YoutubeDL.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index c05103bb6..f13844e64 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -812,7 +812,6 @@ class YoutubeDL(object): Returns the resolved ie_result. """ result_type = ie_result.get('_type', 'video') - if result_type in ('url', 'url_transparent'): ie_result['url'] = sanitize_url(ie_result['url']) extract_flat = self.params.get('extract_flat', False) @@ -1322,8 +1321,8 @@ class YoutubeDL(object): if add_headers: res.update(add_headers) - cookies = self._calc_cookies(info_dict) - if cookies: + if info_dict['url']: + cookies = self._calc_cookies(info_dict) res['Cookie'] = cookies if 'X-Forwarded-For' not in res: From f45423cba55dc1d2c084c3edc78c2a6f33b99611 Mon Sep 17 00:00:00 2001 From: Argn0 Date: Fri, 23 Jun 2017 12:02:23 +0200 Subject: [PATCH 3/6] Update ign.py --- youtube_dl/extractor/ign.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py index 38fa10a96..c45c68c1d 100644 --- a/youtube_dl/extractor/ign.py +++ b/youtube_dl/extractor/ign.py @@ -97,7 +97,7 @@ class IGNIE(InfoExtractor): r'class="hero-poster[^"]*?"[^>]*id="(.+?)"', r'data-video-id="(.+?)"', r' Date: Fri, 23 Jun 2017 12:06:21 +0200 Subject: [PATCH 4/6] Update YoutubeDL.py --- youtube_dl/YoutubeDL.py | 1 + 1 file changed, 1 insertion(+) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index f13844e64..70f60365c 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -812,6 +812,7 @@ class YoutubeDL(object): Returns the resolved ie_result. """ result_type = ie_result.get('_type', 'video') + if result_type in ('url', 'url_transparent'): ie_result['url'] = sanitize_url(ie_result['url']) extract_flat = self.params.get('extract_flat', False) From 31121459bf2a622a1c803c491e92e8f4446d29f5 Mon Sep 17 00:00:00 2001 From: Argn0 Date: Fri, 23 Jun 2017 12:08:12 +0200 Subject: [PATCH 5/6] Update YoutubeDL.py --- youtube_dl/YoutubeDL.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 70f60365c..27554ad99 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -812,7 +812,7 @@ class YoutubeDL(object): Returns the resolved ie_result. """ result_type = ie_result.get('_type', 'video') - + if result_type in ('url', 'url_transparent'): ie_result['url'] = sanitize_url(ie_result['url']) extract_flat = self.params.get('extract_flat', False) From e9b40d29649502d4421a9633e588532fc4f6e8dd Mon Sep 17 00:00:00 2001 From: Argn0 Date: Fri, 23 Jun 2017 12:20:15 +0200 Subject: [PATCH 6/6] Update YoutubeDL.py --- youtube_dl/YoutubeDL.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 27554ad99..850f44457 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1324,6 +1324,9 @@ class YoutubeDL(object): if info_dict['url']: cookies = self._calc_cookies(info_dict) + else: + cookies = None + if cookies: res['Cookie'] = cookies if 'X-Forwarded-For' not in res: