From c438ea87e4db650f5c44526b155ea335ea49d006 Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 23 Oct 2020 20:07:43 -0400 Subject: [PATCH 01/22] [fix] Remove copyright infringing content --- test/test_all_urls.py | 1 - youtube_dl/extractor/youtube.py | 131 -------------------------------- 2 files changed, 132 deletions(-) diff --git a/test/test_all_urls.py b/test/test_all_urls.py index 81056a999d..4f448b4f61 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -33,7 +33,6 @@ def test_youtube_playlist_matching(self): assertPlaylist = lambda url: self.assertMatch(url, ['youtube:playlist']) assertPlaylist('ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') assertPlaylist('UUBABnxM4Ar9ten8Mdjj1j0Q') # 585 - assertPlaylist('PL63F0C78739B09958') assertPlaylist('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q') assertPlaylist('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8') assertPlaylist('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC') diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index bd15153806..95849ef454 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -578,48 +578,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor): 'end_time': 9, } }, - { - 'url': 'https://www.youtube.com/watch?v=UxxajLWwzqY', - 'note': 'Test generic use_cipher_signature video (#897)', - 'info_dict': { - 'id': 'UxxajLWwzqY', - 'ext': 'mp4', - 'upload_date': '20120506', - 'title': 'Icona Pop - I Love It (feat. Charli XCX) [OFFICIAL VIDEO]', - 'alt_title': 'I Love It (feat. Charli XCX)', - 'description': 'md5:19a2f98d9032b9311e686ed039564f63', - 'tags': ['Icona Pop i love it', 'sweden', 'pop music', 'big beat records', 'big beat', 'charli', - 'xcx', 'charli xcx', 'girls', 'hbo', 'i love it', "i don't care", 'icona', 'pop', - 'iconic ep', 'iconic', 'love', 'it'], - 'duration': 180, - 'uploader': 'Icona Pop', - 'uploader_id': 'IconaPop', - 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/IconaPop', - 'creator': 'Icona Pop', - 'track': 'I Love It (feat. Charli XCX)', - 'artist': 'Icona Pop', - } - }, - { - 'url': 'https://www.youtube.com/watch?v=07FYdnEawAQ', - 'note': 'Test VEVO video with age protection (#956)', - 'info_dict': { - 'id': '07FYdnEawAQ', - 'ext': 'mp4', - 'upload_date': '20130703', - 'title': 'Justin Timberlake - Tunnel Vision (Official Music Video) (Explicit)', - 'alt_title': 'Tunnel Vision', - 'description': 'md5:07dab3356cde4199048e4c7cd93471e1', - 'duration': 419, - 'uploader': 'justintimberlakeVEVO', - 'uploader_id': 'justintimberlakeVEVO', - 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/justintimberlakeVEVO', - 'creator': 'Justin Timberlake', - 'track': 'Tunnel Vision', - 'artist': 'Justin Timberlake', - 'age_limit': 18, - } - }, { 'url': '//www.YouTube.com/watch?v=yZIXLfi8CZQ', 'note': 'Embed-only video (#1746)', @@ -677,42 +635,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor): }, 'skip': 'format 141 not served anymore', }, - # DASH manifest with encrypted signature - { - 'url': 'https://www.youtube.com/watch?v=IB3lcPjvWLA', - 'info_dict': { - 'id': 'IB3lcPjvWLA', - 'ext': 'm4a', - 'title': 'Afrojack, Spree Wilson - The Spark (Official Music Video) ft. Spree Wilson', - 'description': 'md5:8f5e2b82460520b619ccac1f509d43bf', - 'duration': 244, - 'uploader': 'AfrojackVEVO', - 'uploader_id': 'AfrojackVEVO', - 'upload_date': '20131011', - }, - 'params': { - 'youtube_include_dash_manifest': True, - 'format': '141/bestaudio[ext=m4a]', - }, - }, - # JS player signature function name containing $ - { - 'url': 'https://www.youtube.com/watch?v=nfWlot6h_JM', - 'info_dict': { - 'id': 'nfWlot6h_JM', - 'ext': 'm4a', - 'title': 'Taylor Swift - Shake It Off', - 'description': 'md5:307195cd21ff7fa352270fe884570ef0', - 'duration': 242, - 'uploader': 'TaylorSwiftVEVO', - 'uploader_id': 'TaylorSwiftVEVO', - 'upload_date': '20140818', - }, - 'params': { - 'youtube_include_dash_manifest': True, - 'format': '141/bestaudio[ext=m4a]', - }, - }, # Controversy video { 'url': 'https://www.youtube.com/watch?v=T4XJQO3qol8', @@ -728,59 +650,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor): 'description': 'SUBSCRIBE: http://www.youtube.com/saturninefilms\n\nEven Obama has taken a stand against freedom on this issue: http://www.huffingtonpost.com/2010/09/09/obama-gma-interview-quran_n_710282.html', } }, - # Normal age-gate video (No vevo, embed allowed) - { - 'url': 'https://youtube.com/watch?v=HtVdAasjOgU', - 'info_dict': { - 'id': 'HtVdAasjOgU', - 'ext': 'mp4', - 'title': 'The Witcher 3: Wild Hunt - The Sword Of Destiny Trailer', - 'description': r're:(?s).{100,}About the Game\n.*?The Witcher 3: Wild Hunt.{100,}', - 'duration': 142, - 'uploader': 'The Witcher', - 'uploader_id': 'WitcherGame', - 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/WitcherGame', - 'upload_date': '20140605', - 'age_limit': 18, - }, - }, - # Age-gate video with encrypted signature - { - 'url': 'https://www.youtube.com/watch?v=6kLq3WMV1nU', - 'info_dict': { - 'id': '6kLq3WMV1nU', - 'ext': 'mp4', - 'title': 'Dedication To My Ex (Miss That) (Lyric Video)', - 'description': 'md5:33765bb339e1b47e7e72b5490139bb41', - 'duration': 246, - 'uploader': 'LloydVEVO', - 'uploader_id': 'LloydVEVO', - 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/LloydVEVO', - 'upload_date': '20110629', - 'age_limit': 18, - }, - }, - # video_info is None (https://github.com/ytdl-org/youtube-dl/issues/4421) - # YouTube Red ad is not captured for creator - { - 'url': '__2ABJjxzNo', - 'info_dict': { - 'id': '__2ABJjxzNo', - 'ext': 'mp4', - 'duration': 266, - 'upload_date': '20100430', - 'uploader_id': 'deadmau5', - 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/deadmau5', - 'creator': 'Dada Life, deadmau5', - 'description': 'md5:12c56784b8032162bb936a5f76d55360', - 'uploader': 'deadmau5', - 'title': 'Deadmau5 - Some Chords (HD)', - 'alt_title': 'This Machine Kills Some Chords', - }, - 'expected_warnings': [ - 'DASH manifest missing', - ] - }, # Olympics (https://github.com/ytdl-org/youtube-dl/issues/4431) { 'url': 'lqQg6PlCWgI', From 3f8bb8677f0635d056bdfd298bb96ae274f31ff3 Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 23 Oct 2020 20:14:17 -0400 Subject: [PATCH 02/22] [license] Update license to add conditions for copyright laws --- LICENSE | 13 +++++++++---- README.md | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 68a49daad8..37a4a43411 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,16 @@ -This is free and unencumbered software released into the public domain. +This is free and unencumbered software released into the public domain, +under the following conditions: + +The software must not be used or distrbuted in binary or source form +for the intention of circumventing Intellectual Property laws in any +jurisdictions that recognize copyright laws, nor can it be used for +the intention of downloading copywrited content which is not released +in the Public Domain. Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any -means. +means, with the exception of the aforementioned conditions. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the @@ -20,5 +27,3 @@ IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/README.md b/README.md index cd8856828f..c600ca4ea0 100644 --- a/README.md +++ b/README.md @@ -1441,6 +1441,6 @@ It may sound strange, but some bug reports we receive are completely unrelated t # COPYRIGHT -youtube-dl is released into the public domain by the copyright holders. +youtube-dl is released into the public domain by the copyright holders, under several conditions. Please read the [LICENSE](https://github.com/l1ving/youtube-dl/blob/master/LICENSE) This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain. From 3c45145f98e60d37abdc7cfc6266209348aba6da Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 23 Oct 2020 20:19:24 -0400 Subject: [PATCH 03/22] [fix] Fix Travis CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c600ca4ea0..6ae8a01f91 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/ytdl-org/youtube-dl.svg?branch=master)](https://travis-ci.org/ytdl-org/youtube-dl) +[![Build Status](https://travis-ci.org/l1ving/youtube-dl.svg?branch=master)](https://travis-ci.org/l1ving/youtube-dl) youtube-dl - download videos from youtube.com or other video platforms From 22d5d9f5d0aacf0e85dba79f7aaf72024a06888f Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 23 Oct 2020 20:20:55 -0400 Subject: [PATCH 04/22] [test] Trigger Travis CI build From b46d3c2282046deac96a57c43c261222cf5be1cc Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 23 Oct 2020 20:22:10 -0400 Subject: [PATCH 05/22] [fix] Typo in LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 37a4a43411..5cde317c0e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ This is free and unencumbered software released into the public domain, under the following conditions: -The software must not be used or distrbuted in binary or source form +The software must not be used or distributed in binary or source form for the intention of circumventing Intellectual Property laws in any jurisdictions that recognize copyright laws, nor can it be used for the intention of downloading copywrited content which is not released From 24553a9aee74cd4418720e0544b670283955f636 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 23 Oct 2020 19:41:29 -0600 Subject: [PATCH 06/22] Fix license problems while still discouraging illegal use --- LICENSE | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 5cde317c0e..d0df347414 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,19 @@ -This is free and unencumbered software released into the public domain, -under the following conditions: +The authors of this software recognize that most technologies can be +used for lawful and unlawful purposes. The authors request that this +software not be used to violate any local laws. The authors recognize +that this is public domain code, that they have no real power +to dictate how it is used other than a polite non-binding request, +and therefore that they cannot be held responsible for what anyone +chooses to do with it. -The software must not be used or distributed in binary or source form -for the intention of circumventing Intellectual Property laws in any -jurisdictions that recognize copyright laws, nor can it be used for -the intention of downloading copywrited content which is not released -in the Public Domain. +--- + +This is free and unencumbered software released into the public domain. Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any -means, with the exception of the aforementioned conditions. +means. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the @@ -27,3 +30,5 @@ IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to From bbcb43946d4c49f43a57611929dca75be847d333 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 23 Oct 2020 21:36:35 -0600 Subject: [PATCH 07/22] Add download mirror links (#3) --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6ae8a01f91..27301e39c9 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,18 @@ To install it right away for all UNIX users (Linux, macOS, etc.), type: sudo curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl + +Mirror: + + sudo curl -L https://dl.netsyms.net/programs/youtube-dl/latest/youtube-dl -o /usr/local/bin/youtube-dl + sudo chmod a+rx /usr/local/bin/youtube-dl If you do not have curl, you can alternatively use a recent wget: sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl -Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.exe) and place it in any location on their [PATH](https://en.wikipedia.org/wiki/PATH_%28variable%29) except for `%SYSTEMROOT%\System32` (e.g. **do not** put in `C:\Windows\System32`). +Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.exe) ([mirror](https://dl.netsyms.net/programs/youtube-dl/latest/youtube-dl.exe)) and place it in any location on their [PATH](https://en.wikipedia.org/wiki/PATH_%28variable%29) except for `%SYSTEMROOT%\System32` (e.g. **do not** put in `C:\Windows\System32`). You can also use pip: @@ -1441,6 +1446,6 @@ It may sound strange, but some bug reports we receive are completely unrelated t # COPYRIGHT -youtube-dl is released into the public domain by the copyright holders, under several conditions. Please read the [LICENSE](https://github.com/l1ving/youtube-dl/blob/master/LICENSE) +youtube-dl is released into the public domain by the copyright holders. This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain. From 259734bfe84e42be975bccae27f477c9f90303f2 Mon Sep 17 00:00:00 2001 From: Dominika Date: Sat, 24 Oct 2020 22:23:19 -0400 Subject: [PATCH 08/22] [cleanup] Remove unnecessary mirrors, yt-dl's website is updated --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 27301e39c9..da0f7b7274 100644 --- a/README.md +++ b/README.md @@ -21,18 +21,13 @@ To install it right away for all UNIX users (Linux, macOS, etc.), type: sudo curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl - -Mirror: - - sudo curl -L https://dl.netsyms.net/programs/youtube-dl/latest/youtube-dl -o /usr/local/bin/youtube-dl - sudo chmod a+rx /usr/local/bin/youtube-dl If you do not have curl, you can alternatively use a recent wget: sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl -Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.exe) ([mirror](https://dl.netsyms.net/programs/youtube-dl/latest/youtube-dl.exe)) and place it in any location on their [PATH](https://en.wikipedia.org/wiki/PATH_%28variable%29) except for `%SYSTEMROOT%\System32` (e.g. **do not** put in `C:\Windows\System32`). +Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.exe) and place it in any location on their [PATH](https://en.wikipedia.org/wiki/PATH_%28variable%29) except for `%SYSTEMROOT%\System32` (e.g. **do not** put in `C:\Windows\System32`). You can also use pip: From 4fcd20a46cbf35ebbeaf06dde3999ad4309d7a8e Mon Sep 17 00:00:00 2001 From: Dominika Date: Sun, 25 Oct 2020 14:34:37 -0400 Subject: [PATCH 09/22] [feature] Add changes to README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index da0f7b7274..392ec68043 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ youtube-dl - download videos from youtube.com or other video platforms +- [CHANGES](#changes) - [INSTALLATION](#installation) - [DESCRIPTION](#description) - [OPTIONS](#options) @@ -15,6 +16,10 @@ youtube-dl - download videos from youtube.com or other video platforms - [BUGS](#bugs) - [COPYRIGHT](#copyright) +# CHANGES + +You can view the changes made to ytdl-org/youtube-dl [here](https://github.com/l1ving/youtube-dl/compare/416da574ec0df3388f652e44f7fe71b1e3a4701f...master) + # INSTALLATION To install it right away for all UNIX users (Linux, macOS, etc.), type: From 6787397ab0878afc44f430090da899fa0ccbbb32 Mon Sep 17 00:00:00 2001 From: Dominika Date: Tue, 27 Oct 2020 13:19:32 -0400 Subject: [PATCH 10/22] [ci] Switch from travis-ci.org to travis-ci.com Closes #8 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 392ec68043..d7a3fdb3ed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/l1ving/youtube-dl.svg?branch=master)](https://travis-ci.org/l1ving/youtube-dl) +[![Build Status](https://travis-ci.com/l1ving/youtube-dl.svg?branch=master)](https://travis-ci.com/l1ving/youtube-dl) youtube-dl - download videos from youtube.com or other video platforms From 8462b9408afef9a838d2f36ad4b1ac51515a271b Mon Sep 17 00:00:00 2001 From: living Date: Tue, 27 Oct 2020 13:29:51 -0400 Subject: [PATCH 11/22] [docs] Added links to archive and tags --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index d7a3fdb3ed..ac739e4a13 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,10 @@ youtube-dl - download videos from youtube.com or other video platforms You can view the changes made to ytdl-org/youtube-dl [here](https://github.com/l1ving/youtube-dl/compare/416da574ec0df3388f652e44f7fe71b1e3a4701f...master) +You can view the archived tags here: [youtube-dl/releases](https://github.com/l1ving/youtube-dl/releases) + +You can view the archived unmerged pull requests here: [youtube-dl/tree/archive/recovered-github-prs](https://github.com/l1ving/youtube-dl/tree/archive/recovered-github-prs) + # INSTALLATION To install it right away for all UNIX users (Linux, macOS, etc.), type: From 6a82b63f29dc3014038d79f814477a33b0189aa8 Mon Sep 17 00:00:00 2001 From: Dominika Date: Thu, 29 Oct 2020 11:08:31 -0400 Subject: [PATCH 12/22] [fix] Unable to extract JS player URL Closes #12 --- youtube_dl/extractor/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 95849ef454..1e0a8f9918 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1955,7 +1955,7 @@ def _extract_filesize(media_url): if cipher: if 's' in url_data or self._downloader.params.get('youtube_include_dash_manifest', True): - ASSETS_RE = r'"assets":.+?"js":\s*("[^"]+")' + ASSETS_RE = [ r'"assets":.+?"js":\s*("[^"]+")', r'"jsUrl":("[^"]+")' ] jsplayer_url_json = self._search_regex( ASSETS_RE, embed_webpage if age_gate else video_webpage, From c61a20804ddd5e1248516811a5038c0775245389 Mon Sep 17 00:00:00 2001 From: living Date: Thu, 29 Oct 2020 15:00:23 -0400 Subject: [PATCH 13/22] [fix] Build fail. --- youtube_dl/extractor/youtube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 1e0a8f9918..0649dc6e3e 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1955,7 +1955,7 @@ def _extract_filesize(media_url): if cipher: if 's' in url_data or self._downloader.params.get('youtube_include_dash_manifest', True): - ASSETS_RE = [ r'"assets":.+?"js":\s*("[^"]+")', r'"jsUrl":("[^"]+")' ] + ASSETS_RE = [r'"assets":.+?"js":\s*("[^"]+")', r'"jsUrl":("[^"]+")'] jsplayer_url_json = self._search_regex( ASSETS_RE, embed_webpage if age_gate else video_webpage, From 161722ebda2198941f30a034412adf9fd0348d5d Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 30 Oct 2020 21:50:23 -0400 Subject: [PATCH 14/22] [bump] 2020.10.30 --- ChangeLog | 5 +++++ youtube_dl/version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9b52b7bd2f..f7b7668a07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +version 2020.10.30 + +Extractors +* [youtube] Fix "Unable to extract JS player URL" (#12) + version 2020.09.20 Core diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 709e5c74ca..a3f0cb69a4 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2020.09.20' +__version__ = '2020.10.30' From 2f2d50289c920d4b27cdd52f7ce85e5bb5375e40 Mon Sep 17 00:00:00 2001 From: Ali Sherief Date: Sat, 31 Oct 2020 04:08:20 +0200 Subject: [PATCH 15/22] [youtube] Re-add age protection test (#14) Co-authored-by: Dominika --- youtube_dl/extractor/youtube.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 0649dc6e3e..731efbc5a7 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -578,6 +578,22 @@ class YoutubeIE(YoutubeBaseInfoExtractor): 'end_time': 9, } }, + { + 'url': 'https://www.youtube.com/watch?v=PA4gbtKWNAI', + 'note': 'Test video with age protection', + 'info_dict': { + 'id': 'PA4gbtKWNAI', + 'ext': 'mp4', + 'upload_date': '20201028', + 'title': 'Big Buck Bunny (TEST) (Age-restricted)', + 'description': 'An age restricted test video for youtube-dl', + 'duration': 635, + 'uploader': 'Ali Sherief', + 'uploader_id': 'UCi1TsEkfcMaYSadGms3UnqA', + 'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UCi1TsEkfcMaYSadGms3UnqA', + 'age_limit': 18, + } + }, { 'url': '//www.YouTube.com/watch?v=yZIXLfi8CZQ', 'note': 'Embed-only video (#1746)', From 181dd919499d93b67e7d8472f51e940506e55ec2 Mon Sep 17 00:00:00 2001 From: Dominika Date: Fri, 30 Oct 2020 22:14:34 -0400 Subject: [PATCH 16/22] [release] 2020.10.30 --- .github/ISSUE_TEMPLATE/1_broken_site.md | 6 +++--- .github/ISSUE_TEMPLATE/2_site_support_request.md | 4 ++-- .github/ISSUE_TEMPLATE/3_site_feature_request.md | 4 ++-- .github/ISSUE_TEMPLATE/4_bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/5_feature_request.md | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index ce0319fe2d..923cd019f7 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -18,7 +18,7 @@ title: '' - [ ] I'm reporting a broken site support -- [ ] I've verified that I'm running youtube-dl version **2020.09.20** +- [ ] I've verified that I'm running youtube-dl version **2020.10.30** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar issues including closed ones @@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v < [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2020.09.20 + [debug] youtube-dl version 2020.10.30 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md index a4002603cc..f06b0f65e4 100644 --- a/.github/ISSUE_TEMPLATE/2_site_support_request.md +++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md @@ -19,7 +19,7 @@ labels: 'site-support-request' - [ ] I'm reporting a new site support request -- [ ] I've verified that I'm running youtube-dl version **2020.09.20** +- [ ] I've verified that I'm running youtube-dl version **2020.10.30** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that none of provided URLs violate any copyrights - [ ] I've searched the bugtracker for similar site support requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md index 3f8b6ce2e7..3f764898cb 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -18,13 +18,13 @@ title: '' - [ ] I'm reporting a site feature request -- [ ] I've verified that I'm running youtube-dl version **2020.09.20** +- [ ] I've verified that I'm running youtube-dl version **2020.10.30** - [ ] I've searched the bugtracker for similar site feature requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md index d880c225a2..65f5166574 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -18,7 +18,7 @@ title: '' - [ ] I'm reporting a broken site support issue -- [ ] I've verified that I'm running youtube-dl version **2020.09.20** +- [ ] I've verified that I'm running youtube-dl version **2020.10.30** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar bug reports including closed ones @@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v < [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2020.09.20 + [debug] youtube-dl version 2020.10.30 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md index dd5fb51444..60bf34adb0 100644 --- a/.github/ISSUE_TEMPLATE/5_feature_request.md +++ b/.github/ISSUE_TEMPLATE/5_feature_request.md @@ -19,13 +19,13 @@ labels: 'request' - [ ] I'm reporting a feature request -- [ ] I've verified that I'm running youtube-dl version **2020.09.20** +- [ ] I've verified that I'm running youtube-dl version **2020.10.30** - [ ] I've searched the bugtracker for similar feature requests including closed ones From 61442148a256fecc6d7f8a203a7f2b11c59adabc Mon Sep 17 00:00:00 2001 From: FastedCoyote <68086117+FastedCoyote@users.noreply.github.com> Date: Sat, 31 Oct 2020 13:40:14 -0600 Subject: [PATCH 17/22] [fix] Download link for Unix users (#21) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac739e4a13..496bacf9c3 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ You can view the archived unmerged pull requests here: [youtube-dl/tree/archive/ To install it right away for all UNIX users (Linux, macOS, etc.), type: - sudo curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl + sudo curl -L https://github.com/l1ving/youtube-dl/releases/latest/download/youtube-dl -o /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl If you do not have curl, you can alternatively use a recent wget: - sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl + sudo wget https://github.com/l1ving/youtube-dl/releases/latest/download/youtube-dl -O /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.exe) and place it in any location on their [PATH](https://en.wikipedia.org/wiki/PATH_%28variable%29) except for `%SYSTEMROOT%\System32` (e.g. **do not** put in `C:\Windows\System32`). @@ -761,7 +761,7 @@ As a last resort, you can also uninstall the version installed by your package m Afterwards, simply follow [our manual installation instructions](https://ytdl-org.github.io/youtube-dl/download.html): ``` -sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl +sudo wget https://github.com/l1ving/youtube-dl/releases/latest/download/youtube-dl -O /usr/local/bin/youtube-dl sudo chmod a+rx /usr/local/bin/youtube-dl hash -r ``` From e87ce51b0b9efbaf997e7d804c74993ed3270ca4 Mon Sep 17 00:00:00 2001 From: "Johnny A. Solbu" Date: Sat, 31 Oct 2020 20:44:52 +0100 Subject: [PATCH 18/22] [fix] The Makefile does not properly generate a release tarball (#18) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3e17365b83..e57ab9b390 100644 --- a/Makefile +++ b/Makefile @@ -117,8 +117,9 @@ _EXTRACTOR_FILES = $(shell find youtube_dl/extractor -iname '*.py' -and -not -in youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES) $(PYTHON) devscripts/make_lazy_extractors.py $@ -youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish ChangeLog AUTHORS - @tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \ +VERSION = $(shell grep version youtube_dl/version.py |cut -f2 -d "'") +youtube-dl.tar.gz: README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish ChangeLog AUTHORS + @tar -czf youtube-dl-$(VERSION).tar.gz --transform "s|^|youtube-dl-$(VERSION)/|" --owner 0 --group 0 \ --exclude '*.DS_Store' \ --exclude '*.kate-swp' \ --exclude '*.pyc' \ @@ -132,4 +133,3 @@ youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash- ChangeLog AUTHORS LICENSE README.md README.txt \ Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \ youtube-dl.zsh youtube-dl.fish setup.py setup.cfg \ - youtube-dl From 5167567de0cf95bc2735ab9da5bf74cd33822c9c Mon Sep 17 00:00:00 2001 From: Dominika Date: Sat, 31 Oct 2020 15:55:52 -0400 Subject: [PATCH 19/22] [release] 2020.10.31 --- .github/ISSUE_TEMPLATE/1_broken_site.md | 6 +++--- .github/ISSUE_TEMPLATE/2_site_support_request.md | 4 ++-- .github/ISSUE_TEMPLATE/3_site_feature_request.md | 4 ++-- .github/ISSUE_TEMPLATE/4_bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/5_feature_request.md | 4 ++-- ChangeLog | 9 +++++++++ youtube_dl/version.py | 2 +- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index 923cd019f7..5b574a889f 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -18,7 +18,7 @@ title: '' - [ ] I'm reporting a broken site support -- [ ] I've verified that I'm running youtube-dl version **2020.10.30** +- [ ] I've verified that I'm running youtube-dl version **2020.10.31** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar issues including closed ones @@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v < [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2020.10.30 + [debug] youtube-dl version 2020.10.31 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md index f06b0f65e4..dff105ca10 100644 --- a/.github/ISSUE_TEMPLATE/2_site_support_request.md +++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md @@ -19,7 +19,7 @@ labels: 'site-support-request' - [ ] I'm reporting a new site support request -- [ ] I've verified that I'm running youtube-dl version **2020.10.30** +- [ ] I've verified that I'm running youtube-dl version **2020.10.31** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that none of provided URLs violate any copyrights - [ ] I've searched the bugtracker for similar site support requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md index 3f764898cb..75de8f7ac6 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -18,13 +18,13 @@ title: '' - [ ] I'm reporting a site feature request -- [ ] I've verified that I'm running youtube-dl version **2020.10.30** +- [ ] I've verified that I'm running youtube-dl version **2020.10.31** - [ ] I've searched the bugtracker for similar site feature requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md index 65f5166574..fd2bd49930 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -18,7 +18,7 @@ title: '' - [ ] I'm reporting a broken site support issue -- [ ] I've verified that I'm running youtube-dl version **2020.10.30** +- [ ] I've verified that I'm running youtube-dl version **2020.10.31** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar bug reports including closed ones @@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v < [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2020.10.30 + [debug] youtube-dl version 2020.10.31 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md index 60bf34adb0..9f470495cd 100644 --- a/.github/ISSUE_TEMPLATE/5_feature_request.md +++ b/.github/ISSUE_TEMPLATE/5_feature_request.md @@ -19,13 +19,13 @@ labels: 'request' - [ ] I'm reporting a feature request -- [ ] I've verified that I'm running youtube-dl version **2020.10.30** +- [ ] I've verified that I'm running youtube-dl version **2020.10.31** - [ ] I've searched the bugtracker for similar feature requests including closed ones diff --git a/ChangeLog b/ChangeLog index f7b7668a07..c91afb8526 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +version 2020.10.31 + +Core ++ [release] Fix release tarball not being properly generated +* [readme] Fix download link for Unix users + +Extractors +* [youtube] Re-add age restriction test (#14) + version 2020.10.30 Extractors diff --git a/youtube_dl/version.py b/youtube_dl/version.py index a3f0cb69a4..6fd6d8b92b 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2020.10.30' +__version__ = '2020.10.31' From ae4bbff637a7e30fca6cd1db3e16490318a1747f Mon Sep 17 00:00:00 2001 From: Dominika Date: Sun, 1 Nov 2020 12:06:39 -0500 Subject: [PATCH 20/22] [fix] JS player extraction again --- youtube_dl/extractor/youtube.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 731efbc5a7..e6ca51dee3 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1971,7 +1971,10 @@ def _extract_filesize(media_url): if cipher: if 's' in url_data or self._downloader.params.get('youtube_include_dash_manifest', True): - ASSETS_RE = [r'"assets":.+?"js":\s*("[^"]+")', r'"jsUrl":("[^"]+")'] + ASSETS_RE = ( + r']+\bsrc=("[^"]+")[^>]+\bname=["\']player_ias/base', + r'"jsUrl"\s*:\s*("[^"]+")', + r'"assets":.+?"js":\s*("[^"]+")') jsplayer_url_json = self._search_regex( ASSETS_RE, embed_webpage if age_gate else video_webpage, From 8106dc7cd5770181cdf92ffa00850da2dceaa4bc Mon Sep 17 00:00:00 2001 From: Dominika Date: Sun, 1 Nov 2020 12:16:18 -0500 Subject: [PATCH 21/22] [release] 2020.11.01 --- .github/ISSUE_TEMPLATE/1_broken_site.md | 6 +++--- .../ISSUE_TEMPLATE/2_site_support_request.md | 4 ++-- .../ISSUE_TEMPLATE/3_site_feature_request.md | 4 ++-- .github/ISSUE_TEMPLATE/4_bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/5_feature_request.md | 4 ++-- ChangeLog | 17 +++++++++++++++++ youtube_dl/version.py | 2 +- 7 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index 5b574a889f..8bf96cb243 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -18,7 +18,7 @@ title: '' - [ ] I'm reporting a broken site support -- [ ] I've verified that I'm running youtube-dl version **2020.10.31** +- [ ] I've verified that I'm running youtube-dl version **2020.11.01** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar issues including closed ones @@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v < [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2020.10.31 + [debug] youtube-dl version 2020.11.01 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md index dff105ca10..61c005e918 100644 --- a/.github/ISSUE_TEMPLATE/2_site_support_request.md +++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md @@ -19,7 +19,7 @@ labels: 'site-support-request' - [ ] I'm reporting a new site support request -- [ ] I've verified that I'm running youtube-dl version **2020.10.31** +- [ ] I've verified that I'm running youtube-dl version **2020.11.01** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that none of provided URLs violate any copyrights - [ ] I've searched the bugtracker for similar site support requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md index 75de8f7ac6..c7eabe344f 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -18,13 +18,13 @@ title: '' - [ ] I'm reporting a site feature request -- [ ] I've verified that I'm running youtube-dl version **2020.10.31** +- [ ] I've verified that I'm running youtube-dl version **2020.11.01** - [ ] I've searched the bugtracker for similar site feature requests including closed ones diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md index fd2bd49930..446b82e642 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -18,7 +18,7 @@ title: '' - [ ] I'm reporting a broken site support issue -- [ ] I've verified that I'm running youtube-dl version **2020.10.31** +- [ ] I've verified that I'm running youtube-dl version **2020.11.01** - [ ] I've checked that all provided URLs are alive and playable in a browser - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped - [ ] I've searched the bugtracker for similar bug reports including closed ones @@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v < [debug] User config: [] [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj'] [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251 - [debug] youtube-dl version 2020.10.31 + [debug] youtube-dl version 2020.11.01 [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2 [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4 [debug] Proxy map: {} diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md index 9f470495cd..69657448ad 100644 --- a/.github/ISSUE_TEMPLATE/5_feature_request.md +++ b/.github/ISSUE_TEMPLATE/5_feature_request.md @@ -19,13 +19,13 @@ labels: 'request' - [ ] I'm reporting a feature request -- [ ] I've verified that I'm running youtube-dl version **2020.10.31** +- [ ] I've verified that I'm running youtube-dl version **2020.11.01** - [ ] I've searched the bugtracker for similar feature requests including closed ones diff --git a/ChangeLog b/ChangeLog index c91afb8526..950042345b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +version 2020.11.01 + +Core +* [utils] Don't attempt to coerce JS strings to numbers in js_to_json (#26851) +* [downloader/http] Properly handle missing message in SSLError (#26646) +* [downloader/http] Fix access to not yet opened stream in retry + +Extractors +* [youtube] Fix JS player URL extraction +* [ytsearch] Fix extraction (#26920) +* [afreecatv] Fix typo (#26970) +* [23video] Relax URL regular expression (#26870) ++ [ustream] Add support for video.ibm.com (#26894) +* [iqiyi] Fix typo (#26884) ++ [expressen] Add support for di.se (#26670) +* [iprima] Improve video id extraction (#26507, #26494) + version 2020.10.31 Core diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 6fd6d8b92b..7d89dd3e11 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2020.10.31' +__version__ = '2020.11.01' From 1b39e948fbe01a130ce0c3c7dbcf2cf1840ae4b2 Mon Sep 17 00:00:00 2001 From: Fai <4016742+aicest@users.noreply.github.com> Date: Tue, 3 Nov 2020 12:26:13 +0800 Subject: [PATCH 22/22] [xiami] raise expressive error thrown by vendor (#24) Avoid confusing error message. --- youtube_dl/extractor/xiami.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/xiami.py b/youtube_dl/extractor/xiami.py index 618da8382b..c848cbf8f9 100644 --- a/youtube_dl/extractor/xiami.py +++ b/youtube_dl/extractor/xiami.py @@ -3,7 +3,7 @@ from .common import InfoExtractor from ..compat import compat_urllib_parse_unquote -from ..utils import int_or_none +from ..utils import int_or_none, ExtractorError class XiamiBaseIE(InfoExtractor): @@ -46,6 +46,8 @@ def _extract_tracks(self, item_id, referer, typ=None): item_id, headers={ 'Referer': referer, }) + if 'message' in playlist and playlist['message']: + raise ExtractorError(playlist['message'], expected=True) return [ self._extract_track(track, item_id) for track in playlist['data']['trackList']]