Release 2022.08.18.36

This reverts commit 6929b41a21.

.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,13 +18,13 @@ body:
       options:
         - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I'm running yt-dlp version **2023.02.17** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -62,7 +62,7 @@ body:
         [debug] Command-line config: ['-vU', 'test:youtube']
         [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2023.02.17 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
         [debug] Checking exe version: ffmpeg -bsfs
         [debug] Checking exe version: ffprobe -bsfs
@@ -70,8 +70,8 @@ body:
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2023.02.17, Current version: 2023.02.17
+        Latest version: 2022.08.19, Current version: 2022.08.19
-        yt-dlp is up to date (2023.02.17)
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,13 +18,13 @@ body:
       options:
         - label: I'm reporting a new site support request
           required: true
-        - label: I've verified that I'm running yt-dlp version **2023.02.17** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
+        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -74,7 +74,7 @@ body:
         [debug] Command-line config: ['-vU', 'test:youtube']
         [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2023.02.17 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
         [debug] Checking exe version: ffmpeg -bsfs
         [debug] Checking exe version: ffprobe -bsfs
@@ -82,8 +82,8 @@ body:
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2023.02.17, Current version: 2023.02.17
+        Latest version: 2022.08.19, Current version: 2022.08.19
-        yt-dlp is up to date (2023.02.17)
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,11 +18,11 @@ body:
       options:
         - label: I'm requesting a site-specific feature
           required: true
-        - label: I've verified that I'm running yt-dlp version **2023.02.17** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -70,7 +70,7 @@ body:
         [debug] Command-line config: ['-vU', 'test:youtube']
         [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2023.02.17 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
         [debug] Checking exe version: ffmpeg -bsfs
         [debug] Checking exe version: ffprobe -bsfs
@@ -78,8 +78,8 @@ body:
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2023.02.17, Current version: 2023.02.17
+        Latest version: 2022.08.19, Current version: 2022.08.19
-        yt-dlp is up to date (2023.02.17)
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,13 +18,13 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I'm running yt-dlp version **2023.02.17** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -55,7 +55,7 @@ body:
         [debug] Command-line config: ['-vU', 'test:youtube']
         [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2023.02.17 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
         [debug] Checking exe version: ffmpeg -bsfs
         [debug] Checking exe version: ffprobe -bsfs
@@ -63,8 +63,8 @@ body:
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2023.02.17, Current version: 2023.02.17
+        Latest version: 2022.08.19, Current version: 2022.08.19
-        yt-dlp is up to date (2023.02.17)
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -20,9 +20,9 @@ body:
           required: true
         - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
           required: true
-        - label: I've verified that I'm running yt-dlp version **2023.02.17** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -51,7 +51,7 @@ body:
         [debug] Command-line config: ['-vU', 'test:youtube']
         [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2023.02.17 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
         [debug] Checking exe version: ffmpeg -bsfs
         [debug] Checking exe version: ffprobe -bsfs
@@ -59,7 +59,7 @@ body:
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2023.02.17, Current version: 2023.02.17
+        Latest version: 2022.08.19, Current version: 2022.08.19
-        yt-dlp is up to date (2023.02.17)
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell

.github/ISSUE_TEMPLATE/6_question.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: markdown
     attributes:
@@ -26,9 +26,9 @@ body:
           required: true
         - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
           required: true
-        - label: I've verified that I'm running yt-dlp version **2023.02.17** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -57,7 +57,7 @@ body:
         [debug] Command-line config: ['-vU', 'test:youtube']
         [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2023.02.17 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
         [debug] Checking exe version: ffmpeg -bsfs
         [debug] Checking exe version: ffprobe -bsfs
@@ -65,7 +65,7 @@ body:
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2023.02.17, Current version: 2023.02.17
+        Latest version: 2022.08.19, Current version: 2022.08.19
-        yt-dlp is up to date (2023.02.17)
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -16,9 +16,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -16,9 +16,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
+        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -16,7 +16,7 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -16,9 +16,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -16,7 +16,7 @@ body:
           required: true
         - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -22,7 +22,7 @@ body:
           required: true
         - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,8 @@
 
 ### Description of your *pull request* and other information
 
+</details>
+
 <!--
 
 Explanation of your *pull request* in arbitrary form goes here. Please **make sure the description explains the purpose and effect** of your *pull request* and is worded well enough to be understood. Provide as much **context and examples** as possible
@@ -30,7 +32,7 @@ Fixes #
 - [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
 - [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8) and [ran relevant tests](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions)
 
-### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check all of the following options that apply:
+### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options:
 - [ ] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)
 - [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
 
@@ -39,5 +41,3 @@ Fixes #
 - [ ] New extractor ([Piracy websites will not be accepted](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy))
 - [ ] Core bug fix/improvement
 - [ ] New feature (It is strongly [recommended to open an issue first](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#adding-new-feature-or-making-overarching-changes))
-
-</details>

.github/workflows/build.yml

@@ -1,12 +1,8 @@
 name: Build
 on: workflow_dispatch
-permissions:
-  contents: read
 
 jobs:
   prepare:
-    permissions:
-      contents: write  # for push_release
     runs-on: ubuntu-latest
     outputs:
       version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
@@ -25,7 +21,7 @@ jobs:
       env:
         PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
       if: "env.PUSH_VERSION_COMMIT == ''"
-      run: echo "version_suffix=$(date -u +"%H%M%S")" >> "$GITHUB_OUTPUT"
+      run: echo ::set-output name=version_suffix::$(date -u +"%H%M%S")
     - name: Bump version
       id: bump_version
       run: |
@@ -40,7 +36,7 @@ jobs:
         git add -u
         git commit -m "[version] update" -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
         git push origin --force ${{ github.event.ref }}:release
-        echo "head_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+        echo ::set-output name=head_sha::$(git rev-parse HEAD)
     - name: Update master
       env:
         PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
@@ -50,46 +46,32 @@ jobs:
 
   build_unix:
     needs: prepare
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04  # Standalone executable should be built on minimum supported OS
 
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
           python-version: '3.10'
-    - uses: conda-incubator/setup-miniconda@v2
-      with:
-          miniforge-variant: Mambaforge
-          use-mamba: true
-          channels: conda-forge
-          auto-update-conda: true
-          activate-environment: ''
-          auto-activate-base: false
     - name: Install Requirements
       run: |
-          sudo apt-get -y install zip pandoc man sed
+          sudo apt-get -y install zip pandoc man
-          python -m pip install -U pip setuptools wheel twine
+          python -m pip install --upgrade pip setuptools wheel twine
-          python -m pip install -U Pyinstaller -r requirements.txt
+          python -m pip install Pyinstaller -r requirements.txt
-          reqs=$(mktemp)
-          echo -e 'python=3.10.*\npyinstaller' >$reqs
-          sed 's/^brotli.*/brotli-python/' <requirements.txt >>$reqs
-          mamba create -n build --file $reqs
 
     - name: Prepare
       run: |
           python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python devscripts/make_lazy_extractors.py
-    - name: Build Unix platform-independent binary
+    - name: Build Unix executables
       run: |
           make all tar
-    - name: Build Unix standalone binary
-      shell: bash -l {0}
-      run: |
-          unset LD_LIBRARY_PATH  # Harmful; set by setup-python
-          conda activate build
           python pyinst.py --onedir
           (cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
           python pyinst.py
+    - name: Get SHA2-SUMS
+      id: get_sha
+      run: |
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
@@ -131,49 +113,6 @@ jobs:
         git -C taps/ push
 
 
-  build_linux_arm:
-    permissions:
-      packages: write  # for Creating cache
-    runs-on: ubuntu-latest
-    needs: prepare
-    strategy:
-      matrix:
-        architecture:
-        - armv7
-        - aarch64
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        path: ./repo
-    - name: Virtualized Install, Prepare & Build
-      uses: yt-dlp/run-on-arch-action@v2
-      with:
-        githubToken: ${{ github.token }}  # To cache image
-        arch: ${{ matrix.architecture }}
-        distro: ubuntu18.04  # Standalone executable should be built on minimum supported OS
-        dockerRunArgs: --volume "${PWD}/repo:/repo"
-        install: |  # Installing Python 3.10 from the Deadsnakes repo raises errors
-          apt update
-          apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip
-          python3.8 -m pip install -U pip setuptools wheel
-          # Cannot access requirements.txt from the repo directory at this stage
-          python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi
-
-        run: |
-          cd repo
-          python3.8 -m pip install -U Pyinstaller -r requirements.txt  # Cached version may be out of date
-          python3.8 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
-          python3.8 devscripts/make_lazy_extractors.py
-          python3.8 pyinst.py
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        path: |  # run-on-arch-action designates armv7l as armv7
-          repo/dist/yt-dlp_linux_${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }}
-
-
   build_macos:
     runs-on: macos-11
     needs: prepare
@@ -254,8 +193,8 @@ jobs:
           python-version: '3.8'
     - name: Install Requirements
       run: |  # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
-          python -m pip install -U pip setuptools wheel py2exe
+          python -m pip install --upgrade pip setuptools wheel py2exe
-          pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.8.0-py3-none-any.whl" -r requirements.txt
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
 
     - name: Prepare
       run: |
@@ -290,8 +229,8 @@ jobs:
           architecture: 'x86'
     - name: Install Requirements
       run: |
-          python -m pip install -U pip setuptools wheel
+          python -m pip install --upgrade pip setuptools wheel
-          pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.8.0-py3-none-any.whl" -r requirements.txt
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
 
     - name: Prepare
       run: |
@@ -309,10 +248,8 @@ jobs:
 
 
   publish_release:
-    permissions:
-      contents: write  # for action-gh-release
     runs-on: ubuntu-latest
-    needs: [prepare, build_unix, build_linux_arm, build_windows, build_windows32, build_macos, build_macos_legacy]
+    needs: [prepare, build_unix, build_windows, build_windows32, build_macos, build_macos_legacy]
 
     steps:
     - uses: actions/checkout@v3
@@ -327,7 +264,7 @@ jobs:
     - name: Make Update spec
       run: |
         echo "# This file is used for regulating self-update" >> _update_spec
-        echo "lock 2022.07.18 .+ Python 3.6" >> _update_spec
+        echo "lock 2022.08.18.36 .+ Python 3.6" >> _update_spec
     - name: Make SHA2-SUMS files
       run: |
           sha256sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-256SUMS
@@ -339,8 +276,6 @@ jobs:
           sha256sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-256SUMS
           sha256sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-256SUMS
           sha256sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_linux_armv7l | awk '{print $1 "  yt-dlp_linux_armv7l"}' >> SHA2-256SUMS
-          sha256sum artifact/yt-dlp_linux_aarch64 | awk '{print $1 "  yt-dlp_linux_aarch64"}' >> SHA2-256SUMS
           sha256sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-256SUMS
           sha256sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-256SUMS
           sha512sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-512SUMS
@@ -352,8 +287,6 @@ jobs:
           sha512sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-512SUMS
           sha512sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-512SUMS
           sha512sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_linux_armv7l | awk '{print $1 "  yt-dlp_linux_armv7l"}' >> SHA2-512SUMS
-          sha512sum artifact/yt-dlp_linux_aarch64 | awk '{print $1 "  yt-dlp_linux_aarch64"}' >> SHA2-512SUMS
           sha512sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-512SUMS
           sha512sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-512SUMS
 
@@ -386,8 +319,6 @@ jobs:
           artifact/yt-dlp_macos
           artifact/yt-dlp_macos.zip
           artifact/yt-dlp_macos_legacy
-          artifact/yt-dlp_linux_armv7l
-          artifact/yt-dlp_linux_aarch64
           artifact/dist/yt-dlp_linux
           artifact/dist/yt-dlp_linux.zip
           _update_spec

.github/workflows/core.yml

@@ -1,8 +1,5 @@
 name: Core Tests
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
   tests:
     name: Core Tests
@@ -12,13 +9,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        # CPython 3.11 is in quick-test
+        # CPython 3.9 is in quick-test
-        python-version: ['3.8', '3.9', '3.10', pypy-3.7, pypy-3.8]
+        python-version: ['3.6', '3.7', '3.10', 3.11-dev, pypy-3.6, pypy-3.7, pypy-3.8]
         run-tests-ext: [sh]
         include:
         # atleast one of each CPython/PyPy tests must be in windows
         - os: windows-latest
-          python-version: '3.7'
+          python-version: '3.8'
           run-tests-ext: bat
         - os: windows-latest
           python-version: pypy-3.9
@@ -33,6 +30,5 @@ jobs:
       run: pip install pytest
     - name: Run tests
       continue-on-error: False
-      run: |
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} core
-        python3 -m yt_dlp -v || true  # Print debug head
+  # Linter is in quick-test
-        ./devscripts/run_tests.${{ matrix.run-tests-ext }} core

.github/workflows/download.yml

@@ -1,8 +1,5 @@
 name: Download Tests
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
   quick:
     name: Quick Download Tests
@@ -28,7 +25,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.7', '3.10', 3.11-dev, pypy-3.7, pypy-3.8]
+        python-version: ['3.6', '3.7', '3.10', 3.11-dev, pypy-3.6, pypy-3.7, pypy-3.8]
         run-tests-ext: [sh]
         include:
         # atleast one of each CPython/PyPy tests must be in windows

.github/workflows/quick-test.yml

@@ -1,8 +1,5 @@
 name: Quick Test
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
   tests:
     name: Core Test
@@ -10,23 +7,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.11
+    - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: 3.9
     - name: Install test requirements
       run: pip install pytest pycryptodomex
     - name: Run tests
-      run: |
+      run: ./devscripts/run_tests.sh core
-        python3 -m yt_dlp -v || true
-        ./devscripts/run_tests.sh core
   flake8:
     name: Linter
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
     - name: Install flake8
       run: pip install flake8
     - name: Make lazy extractors

.gitignore

@@ -30,18 +30,16 @@ cookies
 *.f4v
 *.flac
 *.flv
-*.gif
 *.jpeg
 *.jpg
 *.m4a
+*.mpga
 *.m4v
 *.mhtml
 *.mkv
 *.mov
 *.mp3
 *.mp4
-*.mpga
-*.oga
 *.ogg
 *.opus
 *.png
@@ -49,7 +47,6 @@ cookies
 *.srt
 *.swf
 *.swp
-*.tt
 *.ttml
 *.url
 *.vtt
@@ -72,7 +69,6 @@ dist/
 zip/
 tmp/
 venv/
-.venv/
 completions/
 
 # Misc
@@ -89,7 +85,6 @@ updates_key.pem
 .tox
 *.class
 *.isorted
-*.stackdump
 
 # Generated
 AUTHORS
@@ -121,5 +116,9 @@ yt-dlp.zip
 */extractor/lazy_extractors.py
 
 # Plugins
-ytdlp_plugins/
+ytdlp_plugins/extractor/*
-yt-dlp-plugins
+!ytdlp_plugins/extractor/__init__.py
+!ytdlp_plugins/extractor/sample.py
+ytdlp_plugins/postprocessor/*
+!ytdlp_plugins/postprocessor/__init__.py
+!ytdlp_plugins/postprocessor/sample.py

CONTRIBUTING.md

@@ -161,7 +161,7 @@ The same applies for changes to the documentation, code style, or overarching ch
 
 ## Adding support for a new site
 
-If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](#is-the-website-primarily-used-for-piracy)**. yt-dlp does **not support** such sites thus pull requests adding support for them **will be rejected**.
+If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](https://www.github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. yt-dlp does **not support** such sites thus pull requests adding support for them **will be rejected**.
 
 After you have ensured this site is distributing its content legally, you can follow this quick list (assuming your service is called `yourextractor`):
 
@@ -351,9 +351,8 @@ Say you extracted a list of thumbnails into `thumbnail_data` and want to iterate
 ```python
 thumbnail_data = data.get('thumbnails') or []
 thumbnails = [{
-    'url': item['url'],
+    'url': item['url']
-    'height': item.get('h'),
+} for item in thumbnail_data]  # correct
-} for item in thumbnail_data if item.get('url')]  # correct
 ```
 
 and not like:
@@ -361,27 +360,12 @@ and not like:
 ```python
 thumbnail_data = data.get('thumbnails')
 thumbnails = [{
-    'url': item['url'],
+    'url': item['url']
-    'height': item.get('h'),
 } for item in thumbnail_data]  # incorrect
 ```
 
 In this case, `thumbnail_data` will be `None` if the field was not found and this will cause the loop `for item in thumbnail_data` to raise a fatal error. Using `or []` avoids this error and results in setting an empty list in `thumbnails` instead.
 
-Alternately, this can be further simplified by using `traverse_obj`
-
-```python
-thumbnails = [{
-    'url': item['url'],
-    'height': item.get('h'),
-} for item in traverse_obj(data, ('thumbnails', lambda _, v: v['url']))]
-```
-
-or, even better,
-
-```python
-thumbnails = traverse_obj(data, ('thumbnails', ..., {'url': 'url', 'height': 'h'}))
-```
 
 ### Provide fallbacks
 

CONTRIBUTORS

@@ -3,8 +3,6 @@ shirt-dev (collaborator)
 coletdjnz/colethedj (collaborator)
 Ashish0804 (collaborator)
 nao20010128nao/Lesmiscore (collaborator)
-bashonly (collaborator)
-Grub4K (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -297,111 +295,7 @@ Mehavoid
 winterbird-code
 yashkc2025
 aldoridhoni
+bashonly
 jacobtruman
 masta79
 palewire
-cgrigis
-DavidH-2022
-dfaker
-jackyyf
-ohaiibuzzle
-SamantazFox
-shreyasminocha
-tejasa97
-xenov
-satan1st
-0xGodspeed
-5736d79
-587021c
-basrieter
-Bobscorn
-CNugteren
-columndeeply
-DoubleCouponDay
-Fabi019
-GautamMKGarg
-itachi-19
-jeroenj
-josanabr
-LiviaMedeiros
-nikita-moor
-snapdgn
-SuperSonicHub1
-tannertechnology
-Timendum
-tobi1805
-TokyoBlackHole
-ajayyy
-Alienmaster
-bsun0000
-changren-wcr
-ClosedPort22
-CrankDatSouljaBoy
-cruel-efficiency
-endotronic
-Generator
-gibson042
-How-Bout-No
-invertico
-jahway603
-jwoglom
-lksj
-megapro17
-mlampe
-MrOctopus
-nosoop
-puc9
-sashashura
-schnusch
-SG5
-the-marenga
-tkgmomosheep
-vitkhab
-glensc
-synthpop123
-tntmod54321
-milkknife
-Bnyro
-CapacitorSet
-stelcodes
-skbeh
-muddi900
-digitall
-chengzhicn
-mexus
-JChris246
-redraskal
-Spicadox
-barsnick
-docbender
-KurtBestor
-Chrissi2812
-FrederikNS
-gschizas
-JC-Chung
-mzhou
-OndrejBakan
-ab4cbef
-aionescu
-amra
-ByteDream
-carusocr
-chexxor
-felixonmars
-FrankZ85
-FriedrichRehren
-gregsadetsky
-LeoniePhiline
-LowSuggestion912
-Matumo
-OIRNOIR
-OMEGARAZER
-oxamun
-pmitchell86
-qbnu
-qulaz
-rebane2001
-road-master
-rohieb
-sdht0
-seproDev

Changelog.md

@@ -10,684 +10,12 @@
 * Dispatch the workflow https://github.com/yt-dlp/yt-dlp/actions/workflows/build.yml on master
 -->
 
-# 2023.02.17
 
-* Merge youtube-dl: Upto [commit/2dd6c6e](https://github.com/ytdl-org/youtube-dl/commit/2dd6c6e)
+### 2022.08.18.36
-* Fix `--concat-playlist`
-* Imply `--no-progress` when `--print`
-* Improve default subtitle language selection by [sdht0](https://github.com/sdht0)
-* Make `title` completely non-fatal
-* Sanitize formats before sorting by [pukkandan](https://github.com/pukkandan)
-* Support module level `__bool__` and `property`
-* [dependencies] Standardize `Cryptodome` imports
-* [hls] Allow extractors to provide AES key by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* [ExtractAudio] Handle outtmpl without ext by [carusocr](https://github.com/carusocr)
-* [extractor/common] Fix `_search_nuxt_data` by [LowSuggestion912](https://github.com/LowSuggestion912)
-* [extractor/generic] Avoid catastrophic backtracking in KVS regex by [bashonly](https://github.com/bashonly)
-* [jsinterp] Support `if` statements
-* [plugins] Fix zip search paths
-* [utils] `traverse_obj`:  Various improvements by [Grub4K](https://github.com/Grub4K)
-* [utils] `traverse_obj`: Fix more bugs
-* [utils] `traverse_obj`: Fix several behavioral problems by [Grub4K](https://github.com/Grub4K)
-* [utils] Don't use Content-length with encoding by [felixonmars](https://github.com/felixonmars)
-* [utils] Fix `time_seconds` to use the provided TZ by [Grub4K](https://github.com/Grub4K), [Lesmiscore](https://github.com/Lesmiscore)
-* [utils] Fix race condition in `make_dir` by [aionescu](https://github.com/aionescu)
-* [utils] Use local kernel32 for file locking on Windows by [Grub4K](https://github.com/Grub4K)
-* [compat_utils] Improve `passthrough_module`
-* [compat_utils] Simplify `EnhancedModule`
-* [build] Update pyinstaller
-* [pyinst] Fix for pyinstaller 5.8
-* [devscripts] Provide `pyinstaller` hooks
-* [devscripts/pyinstaller] Analyze sub-modules of `Cryptodome`
-* [cleanup] Misc fixes and cleanup
-* [extractor/anchorfm] Add episode extractor by [HobbyistDev](https://github.com/HobbyistDev), [bashonly](https://github.com/bashonly)
-* [extractor/boxcast] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/ebay] Add extractor by [JChris246](https://github.com/JChris246)
-* [extractor/hypergryph] Add extractor by [HobbyistDev](https://github.com/HobbyistDev), [bashonly](https://github.com/bashonly)
-* [extractor/NZOnScreen] Add extractor by [gregsadetsky](https://github.com/gregsadetsky), [pukkandan](https://github.com/pukkandan)
-* [extractor/rozhlas] Add extractor RozhlasVltavaIE by [amra](https://github.com/amra)
-* [extractor/tempo] Add IVXPlayer extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/txxx] Add extractors by [chio0hai](https://github.com/chio0hai)
-* [extractor/vocaroo] Add extractor by [SuperSonicHub1](https://github.com/SuperSonicHub1), [qbnu](https://github.com/qbnu)
-* [extractor/wrestleuniverse] Add extractors by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* [extractor/yappy] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* **[extractor/youtube] Fix `uploader_id` extraction** by [bashonly](https://github.com/bashonly)
-* [extractor/youtube] Add hyperpipe instances by [Generator](https://github.com/Generator)
-* [extractor/youtube] Handle `consent.youtube`
-* [extractor/youtube] Support `/live/` URL
-* [extractor/youtube] Update invidious and piped instances by [rohieb](https://github.com/rohieb)
-* [extractor/91porn] Fix title and comment extraction by [pmitchell86](https://github.com/pmitchell86)
-* [extractor/AbemaTV] Cache user token whenever appropriate by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/bfmtv] Support `rmc` prefix by [carusocr](https://github.com/carusocr)
-* [extractor/biliintl] Add intro and ending chapters by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/clyp] Support `wav` by [qulaz](https://github.com/qulaz)
-* [extractor/crunchyroll] Add intro chapter by [ByteDream](https://github.com/ByteDream)
-* [extractor/crunchyroll] Better message for premium videos
-* [extractor/crunchyroll] Fix incorrect premium-only error by [Grub4K](https://github.com/Grub4K)
-* [extractor/DouyuTV] Use new API by [hatienl0i261299](https://github.com/hatienl0i261299)
-* [extractor/embedly] Embedded links may be for other extractors
-* [extractor/freesound] Workaround invalid URL in webpage by [rebane2001](https://github.com/rebane2001)
-* [extractor/GoPlay] Use new API by [jeroenj](https://github.com/jeroenj)
-* [extractor/Hidive] Fix subtitles and age-restriction by [chexxor](https://github.com/chexxor)
-* [extractor/huya] Support HD streams by [felixonmars](https://github.com/felixonmars)
-* [extractor/moviepilot] Fix extractor by [panatexxa](https://github.com/panatexxa)
-* [extractor/nbc] Fix `NBC` and `NBCStations` extractors by [bashonly](https://github.com/bashonly)
-* [extractor/nbc] Fix XML parsing by [bashonly](https://github.com/bashonly)
-* [extractor/nebula] Remove broken cookie support by [hheimbuerger](https://github.com/hheimbuerger)
-* [extractor/nfl] Add `NFLPlus` extractors by [bashonly](https://github.com/bashonly)
-* [extractor/niconico] Add support for like history by [Matumo](https://github.com/Matumo), [pukkandan](https://github.com/pukkandan)
-* [extractor/nitter] Update instance list by [OIRNOIR](https://github.com/OIRNOIR)
-* [extractor/npo] Fix extractor and add HD support by [seproDev](https://github.com/seproDev)
-* [extractor/odkmedia] Add `OnDemandChinaEpisodeIE` by [HobbyistDev](https://github.com/HobbyistDev), [pukkandan](https://github.com/pukkandan)
-* [extractor/pornez] Handle relative URLs in iframe by [JChris246](https://github.com/JChris246)
-* [extractor/radiko] Fix format sorting for Time Free by [road-master](https://github.com/road-master)
-* [extractor/rcs] Fix extractors by [nixxo](https://github.com/nixxo), [pukkandan](https://github.com/pukkandan)
-* [extractor/reddit] Support user posts by [OMEGARAZER](https://github.com/OMEGARAZER)
-* [extractor/rumble] Fix format sorting by [pukkandan](https://github.com/pukkandan)
-* [extractor/servus] Rewrite extractor by [Ashish0804](https://github.com/Ashish0804), [FrankZ85](https://github.com/FrankZ85), [StefanLobbenmeier](https://github.com/StefanLobbenmeier)
-* [extractor/slideslive] Fix slides and chapters/duration by [bashonly](https://github.com/bashonly)
-* [extractor/SportDeutschland] Fix extractor by [FriedrichRehren](https://github.com/FriedrichRehren)
-* [extractor/Stripchat] Fix extractor by [JChris246](https://github.com/JChris246), [bashonly](https://github.com/bashonly)
-* [extractor/tnaflix] Fix extractor by [bashonly](https://github.com/bashonly), [oxamun](https://github.com/oxamun)
-* [extractor/tvp] Support `stream.tvp.pl` by [selfisekai](https://github.com/selfisekai)
-* [extractor/twitter] Fix `--no-playlist` and add media `view_count` when using GraphQL by [Grub4K](https://github.com/Grub4K)
-* [extractor/twitter] Fix graphql extraction on some tweets by [selfisekai](https://github.com/selfisekai)
-* [extractor/vimeo] Fix `playerConfig` extraction by [LeoniePhiline](https://github.com/LeoniePhiline), [bashonly](https://github.com/bashonly)
-* [extractor/viu] Add `ViuOTTIndonesiaIE` extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/vk] Fix playlists for new API by [the-marenga](https://github.com/the-marenga)
-* [extractor/vlive] Replace with `VLiveWebArchiveIE` by [seproDev](https://github.com/seproDev)
-* [extractor/ximalaya] Update album `_VALID_URL` by [carusocr](https://github.com/carusocr)
-* [extractor/zdf] Use android API endpoint for UHD downloads by [seproDev](https://github.com/seproDev)
-* [extractor/drtv] Fix bug in [ab4cbef](https://github.com/yt-dlp/yt-dlp/commit/ab4cbef) by [bashonly](https://github.com/bashonly)
-
-
-### 2023.02.17
-
-#### Core changes
-### Core changes
-- [Bugfix for 39f32f1715c0dffb7626dda7307db6388bb7abaa](https://github.com/yt-dlp/yt-dlp/commit/9ebac35577e61c3d25fafc959655fa3ab04ca7ef) by [pukkandan](https://github.com/pukkandan)
-- [Bugfix for 39f32f1715c0dffb7626dda7307db6388bb7abaa](https://github.com/yt-dlp/yt-dlp/commit/c154302c588c3d4362cec4fc5545e7e5d2bcf7a3) by [pukkandan](https://github.com/pukkandan)
-- [Fix `--concat-playlist`](https://github.com/yt-dlp/yt-dlp/commit/59d7de0da545944c48a82fc2937b996d7cd8cc9c) by [pukkandan](https://github.com/pukkandan)
-- [Imply `--no-progress` when `--print`](https://github.com/yt-dlp/yt-dlp/commit/5712943b764ba819ef479524c32700228603817a) by [pukkandan](https://github.com/pukkandan)
-- [Improve default subtitle language selection](https://github.com/yt-dlp/yt-dlp/commit/376aa24b1541e2bfb23337c0ae9bafa5bb3787f1) ([#6240](https://github.com/yt-dlp/yt-dlp/issues/6240)) by [sdht0](https://github.com/sdht0)
-- [Make `title` completely non-fatal](https://github.com/yt-dlp/yt-dlp/commit/7aefd19afed357c80743405ec2ace2148cba42e3) by [pukkandan](https://github.com/pukkandan)
-- [Sanitize formats before sorting](https://github.com/yt-dlp/yt-dlp/commit/39f32f1715c0dffb7626dda7307db6388bb7abaa) by [pukkandan](https://github.com/pukkandan)
-- [Support module level `__bool__` and `property`](https://github.com/yt-dlp/yt-dlp/commit/754c84e2e416cf6609dd0e4632b4985a08d34043) by [pukkandan](https://github.com/pukkandan)
-- [Update to ytdl-commit-2dd6c6e](https://github.com/yt-dlp/yt-dlp/commit/48fde8ac4ccbaaea868f6378814dde395f649fbf) by [pukkandan](https://github.com/pukkandan)
-- [extractor/douyutv]: [Use new API](https://github.com/yt-dlp/yt-dlp/commit/f14c2333481c63c24017a41ded7d8f36726504b7) ([#6074](https://github.com/yt-dlp/yt-dlp/issues/6074)) by [hatienl0i261299](https://github.com/hatienl0i261299)
-- compat_utils
-    - [Improve `passthrough_module`](https://github.com/yt-dlp/yt-dlp/commit/88426d9446758c707fb511408f2d6f56de952db4) by [pukkandan](https://github.com/pukkandan)
-    - [Simplify `EnhancedModule`](https://github.com/yt-dlp/yt-dlp/commit/768a00178109508893488e53a0e720b117fbccf6) by [pukkandan](https://github.com/pukkandan)
-- dependencies
-    - [Standardize `Cryptodome` imports](https://github.com/yt-dlp/yt-dlp/commit/f6a765ceb59c55aea06921880c1c87d1ff36e5de) by [pukkandan](https://github.com/pukkandan)
-- jsinterp
-    - [Support `if` statements](https://github.com/yt-dlp/yt-dlp/commit/8b008d62544b82e24a0ba36c30e8e51855d93419) by [pukkandan](https://github.com/pukkandan)
-- plugins
-    - [Fix zip search paths](https://github.com/yt-dlp/yt-dlp/commit/88d8928bf7630801865cf8728ae5c77234324b7b) by [pukkandan](https://github.com/pukkandan)
-- utils
-    - [Don't use Content-length with encoding](https://github.com/yt-dlp/yt-dlp/commit/65e5c021e7c5f23ecbc6a982b72a02ac6cd6900d) ([#6176](https://github.com/yt-dlp/yt-dlp/issues/6176)) by [felixonmars](https://github.com/felixonmars)
-    - [Fix `time_seconds` to use the provided TZ](https://github.com/yt-dlp/yt-dlp/commit/83c4970e52839ce8761ec61bd19d549aed7d7920) ([#6118](https://github.com/yt-dlp/yt-dlp/issues/6118)) by [Grub4K](https://github.com/Grub4K), [Lesmiscore](https://github.com/Lesmiscore)
-    - [Fix race condition in `make_dir`](https://github.com/yt-dlp/yt-dlp/commit/b25d6cb96337d479bdcb41768356da414c3aa835) ([#6089](https://github.com/yt-dlp/yt-dlp/issues/6089)) by [aionescu](https://github.com/aionescu)
-    - [Use local kernel32 for file locking on Windows](https://github.com/yt-dlp/yt-dlp/commit/37e325b92ff9d784715ac0e5d1f7d96bf5f45ad9) by [Grub4K](https://github.com/Grub4K)
-    - traverse_obj
-        - [Fix more bugs](https://github.com/yt-dlp/yt-dlp/commit/6839ae1f6dde4c0442619e351b3f0442312ab4f9) by [pukkandan](https://github.com/pukkandan)
-        - [Fix several behavioral problems](https://github.com/yt-dlp/yt-dlp/commit/b1bde57bef878478e3503ab07190fd207914ade9) by [Grub4K](https://github.com/Grub4K)
-        - [Various improvements](https://github.com/yt-dlp/yt-dlp/commit/776995bc109c5cd1aa56b684fada2ce718a386ec) by [Grub4K](https://github.com/Grub4K)
-### Extractor changes
-- [Fix `_search_nuxt_data`](https://github.com/yt-dlp/yt-dlp/commit/b23167e7542c177f32b22b29857b637dc4aede69) ([#6062](https://github.com/yt-dlp/yt-dlp/issues/6062)) by [LowSuggestion912](https://github.com/LowSuggestion912)
-- 91porn
-    - [Fix title and comment extraction](https://github.com/yt-dlp/yt-dlp/commit/c085cc2def9862ac8a7619ce8ea5dcc177325719) ([#5932](https://github.com/yt-dlp/yt-dlp/issues/5932)) by [pmitchell86](https://github.com/pmitchell86)
-- abematv
-    - [Cache user token whenever appropriate](https://github.com/yt-dlp/yt-dlp/commit/a4f16832213d9e29beecf685d6cd09a2f0b48c87) ([#6216](https://github.com/yt-dlp/yt-dlp/issues/6216)) by [Lesmiscore](https://github.com/Lesmiscore)
-- anchorfm
-    - [Add episode extractor](https://github.com/yt-dlp/yt-dlp/commit/a4ad59ff2ded208bf33f6fe07299a3449eadccdc) ([#6092](https://github.com/yt-dlp/yt-dlp/issues/6092)) by [bashonly](https://github.com/bashonly), [HobbyistDev](https://github.com/HobbyistDev)
-- bfmtv
-    - [Support `rmc` prefix](https://github.com/yt-dlp/yt-dlp/commit/20266508dd6247dd3cf0e97b9b9f14c3afc046db) ([#6025](https://github.com/yt-dlp/yt-dlp/issues/6025)) by [carusocr](https://github.com/carusocr)
-- biliintl
-    - [Add intro and ending chapters](https://github.com/yt-dlp/yt-dlp/commit/0ba87dd279d3565ed93c559cf7880ad61eb83af8) ([#6018](https://github.com/yt-dlp/yt-dlp/issues/6018)) by [HobbyistDev](https://github.com/HobbyistDev)
-- boxcast
-    - [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/9acca71237f42a4775008e51fe26e42f0a39c552) ([#5983](https://github.com/yt-dlp/yt-dlp/issues/5983)) by [HobbyistDev](https://github.com/HobbyistDev)
-- clyp
-    - [Support `wav`](https://github.com/yt-dlp/yt-dlp/commit/cc13293c2819b5461be211a9729fd02bb1e2f476) ([#6102](https://github.com/yt-dlp/yt-dlp/issues/6102)) by [qulaz](https://github.com/qulaz)
-- crunchyroll
-    - [Add intro chapter](https://github.com/yt-dlp/yt-dlp/commit/93abb7406b95793f6872d12979b91d5f336b4f43) ([#6023](https://github.com/yt-dlp/yt-dlp/issues/6023)) by [ByteDream](https://github.com/ByteDream)
-    - [Better message for premium videos](https://github.com/yt-dlp/yt-dlp/commit/44699d10dc8de9c6a338f4a8e5c63506ec4d2118) by [pukkandan](https://github.com/pukkandan)
-    - [Fix incorrect premium-only error](https://github.com/yt-dlp/yt-dlp/commit/c9d14bd22ab31e2a41f9f8061843668a06db583b) by [Grub4K](https://github.com/Grub4K)
-- drtv
-    - [Fix bug in ab4cbef](https://github.com/yt-dlp/yt-dlp/commit/7481998b169b2a52049fc33bff82034d6563ead4) ([#6034](https://github.com/yt-dlp/yt-dlp/issues/6034)) by [bashonly](https://github.com/bashonly)
-- ebay
-    - [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/da880559a6ecbbf374cc9f3378e696b55b9599af) ([#6170](https://github.com/yt-dlp/yt-dlp/issues/6170)) by [JChris246](https://github.com/JChris246)
-- embedly
-    - [Embedded links may be for other extractors](https://github.com/yt-dlp/yt-dlp/commit/87ebab0615b1bf9b14b478b055e7059d630b4833) by [pukkandan](https://github.com/pukkandan)
-- freesound
-    - [Workaround invalid URL in webpage](https://github.com/yt-dlp/yt-dlp/commit/9cfdbcbf3f17be51f5b6bb9bb6d880b2f3d67362) ([#6147](https://github.com/yt-dlp/yt-dlp/issues/6147)) by [rebane2001](https://github.com/rebane2001)
-- generic
-    - [Avoid catastrophic backtracking in KVS regex](https://github.com/yt-dlp/yt-dlp/commit/8aa0bd5d10627ece3c1815c01d02fb8bf22847a7) by [bashonly](https://github.com/bashonly)
-- goplay
-    - [Use new API](https://github.com/yt-dlp/yt-dlp/commit/d27bde98832e3b7ffb39f3cf6346011b97bb3bc3) ([#6151](https://github.com/yt-dlp/yt-dlp/issues/6151)) by [jeroenj](https://github.com/jeroenj)
-- hidive
-    - [Fix subtitles and age-restriction](https://github.com/yt-dlp/yt-dlp/commit/7708df8da05c94270b43e0630e4e20f6d2d62c55) ([#5828](https://github.com/yt-dlp/yt-dlp/issues/5828)) by [chexxor](https://github.com/chexxor)
-- huya
-    - [Support HD streams](https://github.com/yt-dlp/yt-dlp/commit/fbbb5508ea98ed8709847f5ecced7d70ff05e0ee) ([#6172](https://github.com/yt-dlp/yt-dlp/issues/6172)) by [felixonmars](https://github.com/felixonmars)
-- hypergryph
-    - [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/31c279a2a2c2ef402a9e6dad9992b310d16439a6) ([#6094](https://github.com/yt-dlp/yt-dlp/issues/6094)) by [bashonly](https://github.com/bashonly), [HobbyistDev](https://github.com/HobbyistDev)
-- moviepilot
-    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/c62e64cf0122e52fa2175dd1b004ca6b8e1d82af) ([#5954](https://github.com/yt-dlp/yt-dlp/issues/5954)) by [panatexxa](https://github.com/panatexxa)
-- nbc
-    - [Fix XML parsing](https://github.com/yt-dlp/yt-dlp/commit/176a068cde4f2d9dfa0336168caead0b1edcb8ac) by [bashonly](https://github.com/bashonly)
-    - [Fix `NBC` and `NBCStations` extractors](https://github.com/yt-dlp/yt-dlp/commit/cb73b8460c3ce6d37ab651a4e44bb23b10056154) ([#6033](https://github.com/yt-dlp/yt-dlp/issues/6033)) by [bashonly](https://github.com/bashonly)
-- nebula
-    - [Remove broken cookie support](https://github.com/yt-dlp/yt-dlp/commit/d50ea3ce5abc3b0defc0e5d1e22b22ce9b01b07b) ([#5979](https://github.com/yt-dlp/yt-dlp/issues/5979)) by [hheimbuerger](https://github.com/hheimbuerger)
-- nfl
-    - [Add `NFLPlus` extractors](https://github.com/yt-dlp/yt-dlp/commit/8b37c58f8b5494504acdb5ebe3f8bbd26230f725) ([#6222](https://github.com/yt-dlp/yt-dlp/issues/6222)) by [bashonly](https://github.com/bashonly)
-- niconico
-    - [Add support for like history](https://github.com/yt-dlp/yt-dlp/commit/3b161265add30613bde2e46fca214fe94d09e651) ([#5705](https://github.com/yt-dlp/yt-dlp/issues/5705)) by [Matumo](https://github.com/Matumo), [pukkandan](https://github.com/pukkandan)
-- nitter
-    - [Update instance list](https://github.com/yt-dlp/yt-dlp/commit/a9189510baadf0dccd2d4d363bc6f3a441128bb0) ([#6236](https://github.com/yt-dlp/yt-dlp/issues/6236)) by [OIRNOIR](https://github.com/OIRNOIR)
-- npo
-    - [Fix extractor and add HD support](https://github.com/yt-dlp/yt-dlp/commit/cc2389c8ac72a514d4e002a0f6ca5a7d65c7eff0) ([#6155](https://github.com/yt-dlp/yt-dlp/issues/6155)) by [seproDev](https://github.com/seproDev)
-- nzonscreen
-    - [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/d3bb187f01e1e30db05e639fc23a2e1935d777fe) ([#6208](https://github.com/yt-dlp/yt-dlp/issues/6208)) by [gregsadetsky](https://github.com/gregsadetsky), [pukkandan](https://github.com/pukkandan)
-- odkmedia
-    - [Add `OnDemandChinaEpisodeIE`](https://github.com/yt-dlp/yt-dlp/commit/10fd9e6ee833c88edf6c633f864f42843a708d32) ([#6116](https://github.com/yt-dlp/yt-dlp/issues/6116)) by [HobbyistDev](https://github.com/HobbyistDev), [pukkandan](https://github.com/pukkandan)
-- pornez
-    - [Handle relative URLs in iframe](https://github.com/yt-dlp/yt-dlp/commit/f7efe6dc958eb0689cb9534ff0b4e592040be8df) ([#6171](https://github.com/yt-dlp/yt-dlp/issues/6171)) by [JChris246](https://github.com/JChris246)
-- radiko
-    - [Fix format sorting for Time Free](https://github.com/yt-dlp/yt-dlp/commit/203a06f8554df6db07d8f20f465ecbfe8a14e591) ([#6159](https://github.com/yt-dlp/yt-dlp/issues/6159)) by [road-master](https://github.com/road-master)
-- rcs
-    - [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/c6b657867ad68af6b930ed0aa11ec5d93ee187b7) ([#5700](https://github.com/yt-dlp/yt-dlp/issues/5700)) by [nixxo](https://github.com/nixxo), [pukkandan](https://github.com/pukkandan)
-- reddit
-    - [Support user posts](https://github.com/yt-dlp/yt-dlp/commit/c77df98b1a477a020a57141464d10c0f4d0fdbc9) ([#6173](https://github.com/yt-dlp/yt-dlp/issues/6173)) by [OMEGARAZER](https://github.com/OMEGARAZER)
-- rozhlas
-    - [Add extractor RozhlasVltavaIE](https://github.com/yt-dlp/yt-dlp/commit/355d781bed497cbcb254bf2a2737b83fa51c84ea) ([#5951](https://github.com/yt-dlp/yt-dlp/issues/5951)) by [amra](https://github.com/amra)
-- rumble
-    - [Fix format sorting](https://github.com/yt-dlp/yt-dlp/commit/acacb57c7e173b93c6e0f0c43e61b9b2912719d8) by [pukkandan](https://github.com/pukkandan)
-- servus
-    - [Rewrite extractor](https://github.com/yt-dlp/yt-dlp/commit/f40e32fb1ac67be5bdbc8e32a3c235abfc4be260) ([#6036](https://github.com/yt-dlp/yt-dlp/issues/6036)) by [Ashish0804](https://github.com/Ashish0804), [FrankZ85](https://github.com/FrankZ85), [StefanLobbenmeier](https://github.com/StefanLobbenmeier)
-- slideslive
-    - [Fix slides and chapters/duration](https://github.com/yt-dlp/yt-dlp/commit/5ab3534d44231f7711398bc3cfc520e2efd09f50) ([#6024](https://github.com/yt-dlp/yt-dlp/issues/6024)) by [bashonly](https://github.com/bashonly)
-- sportdeutschland
-    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/5e1a54f63e393c218a40949012ff0de0ce63cb15) ([#6041](https://github.com/yt-dlp/yt-dlp/issues/6041)) by [FriedrichRehren](https://github.com/FriedrichRehren)
-- stripchat
-    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/7d5f919bad07017f4b39b55725491b1e9717d47a) ([#5985](https://github.com/yt-dlp/yt-dlp/issues/5985)) by [bashonly](https://github.com/bashonly), [JChris246](https://github.com/JChris246)
-- tempo
-    - [Add IVXPlayer extractor](https://github.com/yt-dlp/yt-dlp/commit/30031be974d210f451100339699ef03b0ddb5f10) ([#5837](https://github.com/yt-dlp/yt-dlp/issues/5837)) by [HobbyistDev](https://github.com/HobbyistDev)
-- tnaflix
-    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/989f47b6315541989bb507f26b431d9586430995) ([#6086](https://github.com/yt-dlp/yt-dlp/issues/6086)) by [bashonly](https://github.com/bashonly), [oxamun](https://github.com/oxamun)
-- tvp
-    - [Support `stream.tvp.pl`](https://github.com/yt-dlp/yt-dlp/commit/a31d0fa6c315b1145d682361149003d98f1e3782) ([#6139](https://github.com/yt-dlp/yt-dlp/issues/6139)) by [selfisekai](https://github.com/selfisekai)
-- twitter
-    - [Fix `--no-playlist` and add media `view_count` when using GraphQL](https://github.com/yt-dlp/yt-dlp/commit/b6795fd310f1dd61dddc9fd08e52fe485bdc8a3e) ([#6211](https://github.com/yt-dlp/yt-dlp/issues/6211)) by [Grub4K](https://github.com/Grub4K)
-    - [Fix graphql extraction on some tweets](https://github.com/yt-dlp/yt-dlp/commit/7543c9c99bcb116b085fdb1f41b84a0ead04c05d) ([#6075](https://github.com/yt-dlp/yt-dlp/issues/6075)) by [selfisekai](https://github.com/selfisekai)
-- txxx
-    - [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/389896df85ed14eaf74f72531da6c4491d6b73b0) ([#5240](https://github.com/yt-dlp/yt-dlp/issues/5240)) by [chio0hai](https://github.com/chio0hai)
-- vimeo
-    - [Fix `playerConfig` extraction](https://github.com/yt-dlp/yt-dlp/commit/c0cd13fb1c71b842c3d272d0273c03542b467766) ([#6203](https://github.com/yt-dlp/yt-dlp/issues/6203)) by [bashonly](https://github.com/bashonly), [LeoniePhiline](https://github.com/LeoniePhiline)
-- viu
-    - [Add `ViuOTTIndonesiaIE` extractor](https://github.com/yt-dlp/yt-dlp/commit/72671a212d7c939329cb5d34335fa089dd3acbd3) ([#6099](https://github.com/yt-dlp/yt-dlp/issues/6099)) by [HobbyistDev](https://github.com/HobbyistDev)
-- vk
-    - [Fix playlists for new API](https://github.com/yt-dlp/yt-dlp/commit/a9c685453f7019bee94170f936619c6db76c964e) ([#6122](https://github.com/yt-dlp/yt-dlp/issues/6122)) by [the-marenga](https://github.com/the-marenga)
-- vlive
-    - [Replace with `VLiveWebArchiveIE`](https://github.com/yt-dlp/yt-dlp/commit/b3eaab7ca2e118d4db73dcb44afd9c8717db8b67) ([#6196](https://github.com/yt-dlp/yt-dlp/issues/6196)) by [seproDev](https://github.com/seproDev)
-- vocaroo
-    - [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/e4a8b1769e19755acba6d8f212208359905a3159) ([#6117](https://github.com/yt-dlp/yt-dlp/issues/6117)) by [qbnu](https://github.com/qbnu), [SuperSonicHub1](https://github.com/SuperSonicHub1)
-- wrestleuniverse
-    - [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/e61acb40b2cb6ef45508d72235026d458c9d5dff) ([#6158](https://github.com/yt-dlp/yt-dlp/issues/6158)) by [bashonly](https://github.com/bashonly), [Grub4K](https://github.com/Grub4K)
-- ximalaya
-    - [Update album `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/417cdaae08fc447c9d15c53a88e2e9a027cdbf0a) ([#6110](https://github.com/yt-dlp/yt-dlp/issues/6110)) by [carusocr](https://github.com/carusocr)
-- yappy
-    - [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/361630015535026712bdb67f804a15b65ff9ee7e) ([#6111](https://github.com/yt-dlp/yt-dlp/issues/6111)) by [HobbyistDev](https://github.com/HobbyistDev)
-- youtube
-    - [Add hyperpipe instances](https://github.com/yt-dlp/yt-dlp/commit/78a78fa74dbc888d20f1b65e1382bf99131597d5) ([#6020](https://github.com/yt-dlp/yt-dlp/issues/6020)) by [Generator](https://github.com/Generator)
-    - [Fix `uploader_id` extraction](https://github.com/yt-dlp/yt-dlp/commit/149eb0bbf34fa8fdf8d1e2aa28e17479d099e26b) by [bashonly](https://github.com/bashonly)
-    - [Handle `consent.youtube`](https://github.com/yt-dlp/yt-dlp/commit/b032ff0f032512bd6fc70c9c1994d906eacc06cb) by [pukkandan](https://github.com/pukkandan)
-    - [Support `/live/` URL](https://github.com/yt-dlp/yt-dlp/commit/dad2210c0cb9cf03702a9511817ee5ec646d7bc8) by [pukkandan](https://github.com/pukkandan)
-    - [Update invidious and piped instances](https://github.com/yt-dlp/yt-dlp/commit/05799a48c7dec12b34c8bf951c8d2eceedda59f8) ([#6030](https://github.com/yt-dlp/yt-dlp/issues/6030)) by [rohieb](https://github.com/rohieb)
-    - [`uploader_id` includes `@` with handle](https://github.com/yt-dlp/yt-dlp/commit/c61cf091a54d3aa3c611722035ccde5ecfe981bb) by [bashonly](https://github.com/bashonly)
-- zdf
-    - [Use android API endpoint for UHD downloads](https://github.com/yt-dlp/yt-dlp/commit/0fe87a8730638490415d630f48e61d264d89c358) ([#6150](https://github.com/yt-dlp/yt-dlp/issues/6150)) by [seproDev](https://github.com/seproDev)
-### Downloader changes
-- hls
-    - [Allow extractors to provide AES key](https://github.com/yt-dlp/yt-dlp/commit/7e68567e508168b345266c0c19812ad50a829eaa) ([#6158](https://github.com/yt-dlp/yt-dlp/issues/6158)) by [bashonly](https://github.com/bashonly), [Grub4K](https://github.com/Grub4K)
-### Postprocessor changes
-- extractaudio
-    - [Handle outtmpl without ext](https://github.com/yt-dlp/yt-dlp/commit/f737fb16d8234408c85bc189ccc926fea000515b) ([#6005](https://github.com/yt-dlp/yt-dlp/issues/6005)) by [carusocr](https://github.com/carusocr)
-- pyinst
-    - [Fix for pyinstaller 5.8](https://github.com/yt-dlp/yt-dlp/commit/2e269bd998c61efaf7500907d114a56e5e83e65e) by [pukkandan](https://github.com/pukkandan)
-### Misc. changes
-- build
-    - [Update pyinstaller](https://github.com/yt-dlp/yt-dlp/commit/365b9006051ac7d735c20bb63c4907b758233048) by [pukkandan](https://github.com/pukkandan)
-- cleanup
-    - Miscellaneous: [76c9c52](https://github.com/yt-dlp/yt-dlp/commit/76c9c523071150053df7b56956646b680b6a6e05) by [pukkandan](https://github.com/pukkandan)
-- devscripts
-    - [Provide pyinstaller hooks](https://github.com/yt-dlp/yt-dlp/commit/acb1042a9ffa8769fe691beac1011d6da1fcf321) by [pukkandan](https://github.com/pukkandan)
-- pyinstaller
-    - [Analyze sub-modules of `Cryptodome`](https://github.com/yt-dlp/yt-dlp/commit/b85faf6ffb700058e774e99c04304a7a9257cdd0) by [pukkandan](https://github.com/pukkandan)
-
-### 2023.01.06
-
-* Fix config locations by [Grub4k](https://github.com/Grub4k), [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [downloader/aria2c] Disable native progress
-* [utils] `mimetype2ext`: `weba` is not standard
-* [utils] `windows_enable_vt_mode`: Better error handling
-* [build] Add minimal `pyproject.toml`
-* [update] Fix updater file removal on windows by [Grub4K](https://github.com/Grub4K)
-* [cleanup] Misc fixes and cleanup
-* [extractor/aitube] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/drtv] Add series extractors by [FrederikNS](https://github.com/FrederikNS)
-* [extractor/volejtv] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/xanimu] Add extractor by [JChris246](https://github.com/JChris246)
-* [extractor/youtube] Retry manifest refresh for live-from-start by [mzhou](https://github.com/mzhou)
-* [extractor/biliintl] Add `/media` to `VALID_URL` by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/biliIntl] Add fallback to `video_data` by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/crunchyroll:show] Add `language` to entries by [Chrissi2812](https://github.com/Chrissi2812)
-* [extractor/joj] Fix extractor by [OndrejBakan](https://github.com/OndrejBakan), [pukkandan](https://github.com/pukkandan)
-* [extractor/nbc] Update graphql query by [jacobtruman](https://github.com/jacobtruman)
-* [extractor/reddit] Add subreddit as `channel_id` by [gschizas](https://github.com/gschizas)
-* [extractor/tiktok] Add `TikTokLive` extractor by [JC-Chung](https://github.com/JC-Chung)
-
-### 2023.01.02
-
-* **Improve plugin architecture** by [Grub4K](https://github.com/Grub4K), [coletdjnz](https://github.com/coletdjnz), [flashdagger](https://github.com/flashdagger), [pukkandan](https://github.com/pukkandan)
-    * Plugins can be loaded in any distribution of yt-dlp (binary, pip, source, etc.) and can be distributed and installed as packages. See [the readme](https://github.com/yt-dlp/yt-dlp/tree/05997b6e98e638d97d409c65bb5eb86da68f3b64#plugins) for more information
-* Add `--compat-options 2021,2022`
-    * This allows devs to change defaults and make other potentially breaking changes more easily. If you need everything to work exactly as-is, put Use `--compat 2022` in your config to guard against future compat changes.
-* [downloader/aria2c] Native progress for aria2c via RPC by [Lesmiscore](https://github.com/Lesmiscore), [pukkandan](https://github.com/pukkandan)
-* Merge youtube-dl: Upto [commit/195f22f](https://github.com/ytdl-org/youtube-dl/commit/195f22f6) by [Grub4k](https://github.com/Grub4k), [pukkandan](https://github.com/pukkandan)
-* Add pre-processor stage `video`
-* Let `--parse/replace-in-metadata` run at any post-processing stage
-* Add `--enable-file-urls` by [coletdjnz](https://github.com/coletdjnz)
-* Add new field `aspect_ratio`
-* Add `ac4` to known codecs
-* Add `weba` to known extensions
-* [FFmpegVideoConvertor] Add `gif` to `--recode-video`
-* Add message when there are no subtitles/thumbnails
-* Deprioritize HEVC-over-FLV formats by [Lesmiscore](https://github.com/Lesmiscore)
-* Make early reject of `--match-filter` stricter
-* Fix `--cookies-from-browser` CLI parsing
-* Fix `original_url` in playlists
-* Fix bug in writing playlist info-json
-* Fix bugs in `PlaylistEntries`
-* [downloader/ffmpeg] Fix headers for video+audio formats by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* [extractor] Add a way to distinguish IEs that returns only videos
-* [extractor] Implement universal format sorting and deprecate `_sort_formats`
-* [extractor] Let `_extract_format` functions obey `--ignore-no-formats`
-* [extractor/generic] Add `fragment_query` extractor arg for DASH and HLS by [bashonly](https://github.com/bashonly), [pukkandan](https://github.com/pukkandan)
-* [extractor/generic] Decode unicode-escaped embed URLs by [bashonly](https://github.com/bashonly)
-* [extractor/generic] Don't report redirect to https
-* [extractor/generic] Fix JSON LD manifest extraction by [bashonly](https://github.com/bashonly), [pukkandan](https://github.com/pukkandan)
-* [extractor/generic] Use `Accept-Encoding: identity` for initial request by [coletdjnz](https://github.com/coletdjnz)
-* [FormatSort] Add `mov` to `vext`
-* [jsinterp] Escape regex that looks like nested set
-* [webvtt] Handle premature EOF by [flashdagger](https://github.com/flashdagger)
-* [utils] `classproperty`: Add cache support
-* [utils] `get_exe_version`: Detect broken executables by [dirkf](https://github.com/dirkf), [pukkandan](https://github.com/pukkandan)
-* [utils] `js_to_json`: Fix bug in [f55523c](https://github.com/yt-dlp/yt-dlp/commit/f55523c) by [ChillingPepper](https://github.com/ChillingPepper), [pukkandan](https://github.com/pukkandan)
-* [utils] Make `ExtractorError` mutable
-* [utils] Move `FileDownloader.parse_bytes` into utils
-* [utils] Move format sorting code into `utils`
-* [utils] `windows_enable_vt_mode`: Proper implementation by [Grub4K](https://github.com/Grub4K)
-* [update] Workaround [#5632](https://github.com/yt-dlp/yt-dlp/issues/5632)
-* [docs] Improvements
-* [cleanup] Misc fixes and cleanup
-* [cleanup] Use `random.choices` by [freezboltz](https://github.com/freezboltz)
-* [extractor/airtv] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/amazonminitv] Add extractors by [GautamMKGarg](https://github.com/GautamMKGarg), [nyuszika7h](https://github.com/nyuszika7h)
-* [extractor/beatbump] Add extractors by [Bobscorn](https://github.com/Bobscorn), [pukkandan](https://github.com/pukkandan)
-* [extractor/europarl] Add EuroParlWebstream extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/kanal2] Add extractor by [bashonly](https://github.com/bashonly), [glensc](https://github.com/glensc), [pukkandan](https://github.com/pukkandan)
-* [extractor/kankanews] Add extractor by [synthpop123](https://github.com/synthpop123)
-* [extractor/kick] Add extractor by [bashonly](https://github.com/bashonly)
-* [extractor/mediastream] Add extractor by [HobbyistDev](https://github.com/HobbyistDev), [elyse0](https://github.com/elyse0)
-* [extractor/noice] Add NoicePodcast extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/oneplace] Add OnePlacePodcast extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/rumble] Add RumbleIE extractor by [flashdagger](https://github.com/flashdagger)
-* [extractor/screencastify] Add extractor by [bashonly](https://github.com/bashonly)
-* [extractor/trtcocuk] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/Veoh] Add user extractor by [tntmod54321](https://github.com/tntmod54321)
-* [extractor/videoken] Add extractors by [bashonly](https://github.com/bashonly)
-* [extractor/webcamerapl] Add extractor by [milkknife](https://github.com/milkknife)
-* [extractor/amazon] Add `AmazonReviews` extractor by [bashonly](https://github.com/bashonly)
-* [extractor/netverse] Add `NetverseSearch` extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/vimeo] Add `VimeoProIE` by [bashonly](https://github.com/bashonly), [pukkandan](https://github.com/pukkandan)
-* [extractor/xiami] Remove extractors by [synthpop123](https://github.com/synthpop123)
-* [extractor/youtube] Add `piped.video` by [Bnyro](https://github.com/Bnyro)
-* [extractor/youtube] Consider language in format de-duplication
-* [extractor/youtube] Extract DRC formats
-* [extractor/youtube] Fix `ytuser:`
-* [extractor/youtube] Fix bug in handling of music URLs
-* [extractor/youtube] Subtitles cannot be translated to `und`
-* [extractor/youtube:tab] Extract metadata from channel items by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/ARD] Add vtt subtitles by [CapacitorSet](https://github.com/CapacitorSet)
-* [extractor/ArteTV] Extract chapters by [bashonly](https://github.com/bashonly), [iw0nderhow](https://github.com/iw0nderhow)
-* [extractor/bandcamp] Add `album_artist` by [stelcodes](https://github.com/stelcodes)
-* [extractor/bilibili] Fix `--no-playlist` for anthology
-* [extractor/bilibili] Improve `_VALID_URL` by [skbeh](https://github.com/skbeh)
-* [extractor/biliintl:series] Make partial download of series faster
-* [extractor/BiliLive] Fix extractor
-* [extractor/brightcove] Add `BrightcoveNewBaseIE` and fix embed extraction
-* [extractor/cda] Support premium and misc improvements by [selfisekai](https://github.com/selfisekai)
-* [extractor/ciscowebex] Support password-protected videos by [damianoamatruda](https://github.com/damianoamatruda)
-* [extractor/curiositystream] Fix auth by [mnn](https://github.com/mnn)
-* [extractor/embedly] Handle vimeo embeds
-* [extractor/fifa] Fix Preplay extraction by [dirkf](https://github.com/dirkf)
-* [extractor/foxsports] Fix extractor by [bashonly](https://github.com/bashonly)
-* [extractor/gronkh] Fix `_VALID_URL` by [muddi900](https://github.com/muddi900)
-* [extractor/hotstar] Improve format metadata
-* [extractor/iqiyi] Fix `Iq` JS regex by [bashonly](https://github.com/bashonly)
-* [extractor/la7] Improve extractor by [nixxo](https://github.com/nixxo)
-* [extractor/mediaset] Better embed detection and error messages by [nixxo](https://github.com/nixxo)
-* [extractor/mixch] Support `--wait-for-video`
-* [extractor/naver] Improve `_VALID_URL` for `NaverNowIE` by [bashonly](https://github.com/bashonly)
-* [extractor/naver] Treat fan subtitles as separate language
-* [extractor/netverse] Extract comments by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/nosnl] Add support for /video by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/odnoklassniki] Extract subtitles by [bashonly](https://github.com/bashonly)
-* [extractor/pinterest] Fix extractor by [bashonly](https://github.com/bashonly)
-* [extractor/plutotv] Fix videos with non-zero start by [digitall](https://github.com/digitall)
-* [extractor/polskieradio] Adapt to next.js redesigns by [selfisekai](https://github.com/selfisekai)
-* [extractor/reddit] Add vcodec to fallback format by [chengzhicn](https://github.com/chengzhicn)
-* [extractor/reddit] Extract crossposted media by [bashonly](https://github.com/bashonly)
-* [extractor/reddit] Extract video embeds in text posts by [bashonly](https://github.com/bashonly)
-* [extractor/rutube] Support private videos by [mexus](https://github.com/mexus)
-* [extractor/sibnet] Separate from VKIE
-* [extractor/slideslive] Fix extractor by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* [extractor/slideslive] Support embeds and slides by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly), [pukkandan](https://github.com/pukkandan)
-* [extractor/soundcloud] Support user permalink by [nosoop](https://github.com/nosoop)
-* [extractor/spankbang] Fix extractor by [JChris246](https://github.com/JChris246)
-* [extractor/stv] Detect DRM
-* [extractor/swearnet] Fix description bug
-* [extractor/tencent] Fix geo-restricted video by [elyse0](https://github.com/elyse0)
-* [extractor/tiktok] Fix subs, `DouyinIE`, improve `_VALID_URL` by [bashonly](https://github.com/bashonly)
-* [extractor/tiktok] Update `_VALID_URL`, add `api_hostname` arg by [bashonly](https://github.com/bashonly)
-* [extractor/tiktok] Update API hostname by [redraskal](https://github.com/redraskal)
-* [extractor/twitcasting] Fix videos with password by [Spicadox](https://github.com/Spicadox), [bashonly](https://github.com/bashonly)
-* [extractor/twitter] Heed `--no-playlist` for multi-video tweets by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* [extractor/twitter] Refresh guest token when expired by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* [extractor/twitter:spaces] Add `Referer` to m3u8 by [nixxo](https://github.com/nixxo)
-* [extractor/udemy] Fix lectures that have no URL and detect DRM
-* [extractor/unsupported] Add more URLs
-* [extractor/urplay] Support for audio-only formats by [barsnick](https://github.com/barsnick)
-* [extractor/wistia] Improve extension detection by [Grub4k](https://github.com/Grub4k), [bashonly](https://github.com/bashonly), [pukkandan](https://github.com/pukkandan)
-* [extractor/yle_areena] Support restricted videos by [docbender](https://github.com/docbender)
-* [extractor/youku] Fix extractor by [KurtBestor](https://github.com/KurtBestor)
-* [extractor/youporn] Fix metadata by [marieell](https://github.com/marieell)
-* [extractor/redgifs] Fix bug in [8c188d5](https://github.com/yt-dlp/yt-dlp/commit/8c188d5d09177ed213a05c900d3523867c5897fd)
-
-
-### 2022.11.11
-
-* Merge youtube-dl: Upto [commit/de39d12](https://github.com/ytdl-org/youtube-dl/commit/de39d128)
-* Backport SSL configuration from Python 3.10 by [coletdjnz](https://github.com/coletdjnz)
-* Do more processing in `--flat-playlist`
-* Fix `--list` options not implying `-s` in some cases by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly)
-* Fix end time of clips by [cruel-efficiency](https://github.com/cruel-efficiency)
-* Fix for `formats=None`
-* Write API params in debug head
-* [outtmpl] Ensure ASCII in json and add option for Unicode
-* [SponsorBlock] Add `type` field, obey `--retry-sleep extractor`, relax duration check for large segments
-* [SponsorBlock] **Support `chapter` category** by [ajayyy](https://github.com/ajayyy), [pukkandan](https://github.com/pukkandan)
-* [ThumbnailsConvertor] Fix filename escaping by [dirkf](https://github.com/dirkf), [pukkandan](https://github.com/pukkandan)
-* [ModifyChapters] Handle the entire video being marked for removal
-* [embedthumbnail] Fix thumbnail name in mp3 by [How-Bout-No](https://github.com/How-Bout-No)
-* [downloader/fragment] HLS download can continue without first fragment
-* [cookies] Improve `LenientSimpleCookie` by [Grub4K](https://github.com/Grub4K)
-* [jsinterp] Improve separating regex
-* [extractor/common] Fix `fatal=False` for `_search_nuxt_data`
-* [extractor/common] Improve `_generic_title`
-* [extractor/common] Fix `json_ld` type checks by [Grub4K](https://github.com/Grub4K)
-* [extractor/generic] Separate embed extraction into own function
-* [extractor/generic:quoted-html] Add extractor by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [extractor/unsupported] Raise error on known DRM-only sites by [coletdjnz](https://github.com/coletdjnz)
-* [utils] `js_to_json`: Improve escape handling by [Grub4K](https://github.com/Grub4K)
-* [utils] `strftime_or_none`: Workaround Python bug on Windows
-* [utils] `traverse_obj`: Always return list when branching, allow `re.Match` objects by [Grub4K](https://github.com/Grub4K)
-* [build, test] Harden workflows' security by [sashashura](https://github.com/sashashura)
-* [build] `py2exe`: Migrate to freeze API by [SG5](https://github.com/SG5), [pukkandan](https://github.com/pukkandan)
-* [build] Create `armv7l` and `aarch64` releases by [MrOctopus](https://github.com/MrOctopus), [pukkandan](https://github.com/pukkandan)
-* [build] Make linux binary truly standalone using `conda` by [mlampe](https://github.com/mlampe)
-* [build] Replace `set-output` with `GITHUB_OUTPUT` by [Lesmiscore](https://github.com/Lesmiscore)
-* [update] Use error code `100` for update errors
-* [compat] Fix `shutils.move` in restricted ACL mode on BSD by [ClosedPort22](https://github.com/ClosedPort22), [pukkandan](https://github.com/pukkandan)
-* [docs, devscripts] Document `pyinst`'s argument passthrough by [jahway603](https://github.com/jahway603)
-* [test] Allow `extract_flat` in download tests by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [cleanup] Misc fixes and cleanup by [pukkandan](https://github.com/pukkandan), [Alienmaster](https://github.com/Alienmaster)
-* [extractor/aeon] Add extractor by [DoubleCouponDay](https://github.com/DoubleCouponDay)
-* [extractor/agora] Add extractors by [selfisekai](https://github.com/selfisekai)
-* [extractor/camsoda] Add extractor by [zulaport](https://github.com/zulaport)
-* [extractor/cinetecamilano] Add extractor by [timendum](https://github.com/timendum)
-* [extractor/deuxm] Add extractors by [CrankDatSouljaBoy](https://github.com/CrankDatSouljaBoy)
-* [extractor/genius] Add extractors by [bashonly](https://github.com/bashonly)
-* [extractor/japandiet] Add extractors by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/listennotes] Add extractor by [lksj](https://github.com/lksj), [pukkandan](https://github.com/pukkandan)
-* [extractor/nos.nl] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/oftv] Add extractors by [DoubleCouponDay](https://github.com/DoubleCouponDay)
-* [extractor/podbayfm] Add extractor by [schnusch](https://github.com/schnusch)
-* [extractor/qingting] Add extractor by [bashonly](https://github.com/bashonly), [changren-wcr](https://github.com/changren-wcr)
-* [extractor/screen9] Add extractor by [tpikonen](https://github.com/tpikonen)
-* [extractor/swearnet] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/YleAreena] Add extractor by [pukkandan](https://github.com/pukkandan), [vitkhab](https://github.com/vitkhab)
-* [extractor/zeenews] Add extractor by [m4tu4g](https://github.com/m4tu4g), [pukkandan](https://github.com/pukkandan)
-* [extractor/youtube:tab] **Update tab handling for redesign** by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-    * Channel URLs download all uploads of the channel as multiple playlists, separated by tab
-* [extractor/youtube] Differentiate between no comments and disabled comments by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube] Extract `concurrent_view_count` for livestreams by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube] Fix `duration` for premieres by [nosoop](https://github.com/nosoop)
-* [extractor/youtube] Fix `live_status` by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [extractor/youtube] Ignore incomplete data error for comment replies by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube] Improve chapter parsing from description
-* [extractor/youtube] Mark videos as fully watched by [bsun0000](https://github.com/bsun0000)
-* [extractor/youtube] Update piped instances by [Generator](https://github.com/Generator)
-* [extractor/youtube] Update playlist metadata extraction for new layout by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube:tab] Fix video metadata from tabs by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube:tab] Let `approximate_date` return timestamp
-* [extractor/americastestkitchen] Fix extractor by [bashonly](https://github.com/bashonly)
-* [extractor/bbc] Support onion domains by [DoubleCouponDay](https://github.com/DoubleCouponDay)
-* [extractor/bilibili] Add chapters and misc cleanup by [lockmatrix](https://github.com/lockmatrix), [pukkandan](https://github.com/pukkandan)
-* [extractor/bilibili] Fix BilibiliIE and Bangumi extractors by [lockmatrix](https://github.com/lockmatrix), [pukkandan](https://github.com/pukkandan)
-* [extractor/bitchute] Better error for geo-restricted videos by [flashdagger](https://github.com/flashdagger)
-* [extractor/bitchute] Improve `BitChuteChannelIE` by [flashdagger](https://github.com/flashdagger), [pukkandan](https://github.com/pukkandan)
-* [extractor/bitchute] Simplify extractor by [flashdagger](https://github.com/flashdagger), [pukkandan](https://github.com/pukkandan)
-* [extractor/cda] Support login through API by [selfisekai](https://github.com/selfisekai)
-* [extractor/crunchyroll] Beta is now the only layout by [tejing1](https://github.com/tejing1)
-* [extractor/detik] Avoid unnecessary extraction
-* [extractor/doodstream] Remove extractor
-* [extractor/dplay] Add MotorTrendOnDemand extractor by [bashonly](https://github.com/bashonly)
-* [extractor/epoch] Support videos without data-trailer by [gibson042](https://github.com/gibson042), [pukkandan](https://github.com/pukkandan)
-* [extractor/fox] Extract thumbnail by [vitkhab](https://github.com/vitkhab)
-* [extractor/foxnews] Add `FoxNewsVideo` extractor
-* [extractor/hotstar] Add season support by [m4tu4g](https://github.com/m4tu4g)
-* [extractor/hotstar] Refactor v1 API calls
-* [extractor/iprima] Make json+ld non-fatal by [bashonly](https://github.com/bashonly)
-* [extractor/iq] Increase phantomjs timeout
-* [extractor/kaltura] Support playlists by [jwoglom](https://github.com/jwoglom), [pukkandan](https://github.com/pukkandan)
-* [extractor/lbry] Authenticate with cookies by [flashdagger](https://github.com/flashdagger)
-* [extractor/livestreamfails] Support posts by [invertico](https://github.com/invertico)
-* [extractor/mlb] Add `MLBArticle` extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/mxplayer] Improve extractor by [m4tu4g](https://github.com/m4tu4g)
-* [extractor/niconico] Always use HTTPS for requests
-* [extractor/nzherald] Support new video embed by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/odnoklassniki] Support boosty.to embeds by [Lesmiscore](https://github.com/Lesmiscore), [megapro17](https://github.com/megapro17), [pukkandan](https://github.com/pukkandan)
-* [extractor/paramountplus] Update API token by [bashonly](https://github.com/bashonly)
-* [extractor/reddit] Add fallback format by [bashonly](https://github.com/bashonly)
-* [extractor/redgifs] Fix extractors by [bashonly](https://github.com/bashonly), [pukkandan](https://github.com/pukkandan)
-* [extractor/redgifs] Refresh auth token for 401 by [endotronic](https://github.com/endotronic), [pukkandan](https://github.com/pukkandan)
-* [extractor/rumble] Add HLS formats and extract more metadata by [flashdagger](https://github.com/flashdagger)
-* [extractor/sbs] Improve `_VALID_URL` by [bashonly](https://github.com/bashonly)
-* [extractor/skyit] Fix extractors by [nixxo](https://github.com/nixxo)
-* [extractor/stripchat] Fix hostname for HLS stream by [zulaport](https://github.com/zulaport)
-* [extractor/stripchat] Improve error message by [freezboltz](https://github.com/freezboltz)
-* [extractor/telegram] Add playlist support and more metadata by [bashonly](https://github.com/bashonly), [bsun0000](https://github.com/bsun0000)
-* [extractor/Tnaflix] Fix for HTTP 500 by [SG5](https://github.com/SG5), [pukkandan](https://github.com/pukkandan)
-* [extractor/tubitv] Better DRM detection by [bashonly](https://github.com/bashonly)
-* [extractor/tvp] Update extractors by [selfisekai](https://github.com/selfisekai)
-* [extractor/twitcasting] Fix `data-movie-playlist` extraction by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/twitter] Add onion site to `_VALID_URL` by [DoubleCouponDay](https://github.com/DoubleCouponDay)
-* [extractor/twitter] Add Spaces extractor and GraphQL API by [Grub4K](https://github.com/Grub4K), [bashonly](https://github.com/bashonly), [nixxo](https://github.com/nixxo), [pukkandan](https://github.com/pukkandan)
-* [extractor/twitter] Support multi-video posts by [Grub4K](https://github.com/Grub4K)
-* [extractor/uktvplay] Fix `_VALID_URL`
-* [extractor/viu] Support subtitles of on-screen text by [tkgmomosheep](https://github.com/tkgmomosheep)
-* [extractor/VK] Fix playlist URLs by [the-marenga](https://github.com/the-marenga)
-* [extractor/vlive] Extract `release_timestamp`
-* [extractor/voot] Improve `_VALID_URL` by [freezboltz](https://github.com/freezboltz)
-* [extractor/wordpress:mb.miniAudioPlayer] Add embed extractor by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/YoutubeWebArchive] Improve metadata extraction by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/zee5] Improve `_VALID_URL` by [m4tu4g](https://github.com/m4tu4g)
-* [extractor/zenyandex] Fix extractors by [lksj](https://github.com/lksj), [puc9](https://github.com/puc9), [pukkandan](https://github.com/pukkandan)
-
-
-### 2022.10.04
-
-* Allow a `set` to be passed as `download_archive` by [pukkandan](https://github.com/pukkandan), [bashonly](https://github.com/bashonly)
-* Allow open ranges for time ranges by [Lesmiscore](https://github.com/Lesmiscore)
-* Allow plugin extractors to replace the built-in ones
-* Don't download entire video when no matching `--download-sections`
-* Fix `--config-location -`
-* Improve [5736d79](https://github.com/yt-dlp/yt-dlp/pull/5044/commits/5736d79172c47ff84740d5720467370a560febad)
-* Fix for when playlists don't have `webpage_url`
-* Support environment variables in `--ffmpeg-location`
-* Workaround `libc_ver` not be available on Windows Store version of Python
-* [outtmpl] Curly braces to filter keys by [pukkandan](https://github.com/pukkandan)
-* [outtmpl] Make `%s` work in strfformat for all systems
-* [jsinterp] Workaround operator associativity issue
-* [cookies] Let `_get_mac_keyring_password` fail gracefully
-* [cookies] Parse cookies leniently by [Grub4K](https://github.com/Grub4K)
-* [phantomjs] Fix bug in [587021c](https://github.com/yt-dlp/yt-dlp/commit/587021cd9f717181b44e881941aca3f8d753758b) by [elyse0](https://github.com/elyse0)
-* [downloader/aria2c] Fix filename containing leading whitespace by [std-move](https://github.com/std-move)
-* [downloader/ism] Support ec-3 codec by [nixxo](https://github.com/nixxo)
-* [extractor] Fix `fatal=False` in `RetryManager`
-* [extractor] Improve json-ld extraction
-* [extractor] Make `_search_json` able to parse lists
-* [extractor] Escape `%` in `representation_id` of m3u8
-* [extractor/generic] Pass through referer from json-ld
-* [utils] `base_url`: URL paths can contain `&` by [elyse0](https://github.com/elyse0)
-* [utils] `js_to_json`: Improve
-* [utils] `Popen.run`: Fix default return in binary mode
-* [utils] `traverse_obj`: Rewrite, document and add tests by [Grub4K](https://github.com/Grub4K)
-* [devscripts] `make_lazy_extractors`: Fix for Docker by [josanabr](https://github.com/josanabr)
-* [docs] Misc Improvements
-* [cleanup] Misc fixes and cleanup by [pukkandan](https://github.com/pukkandan), [gamer191](https://github.com/gamer191)
-* [extractor/24tv.ua] Add extractors by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/BerufeTV] Add extractor by [Fabi019](https://github.com/Fabi019)
-* [extractor/booyah] Add extractor by [HobbyistDev](https://github.com/HobbyistDev), [elyse0](https://github.com/elyse0)
-* [extractor/bundesliga] Add extractor by [Fabi019](https://github.com/Fabi019)
-* [extractor/GoPlay] Add extractor by [CNugteren](https://github.com/CNugteren), [basrieter](https://github.com/basrieter), [jeroenj](https://github.com/jeroenj)
-* [extractor/iltalehti] Add extractor by [tpikonen](https://github.com/tpikonen)
-* [extractor/IsraelNationalNews] Add extractor by [Bobscorn](https://github.com/Bobscorn)
-* [extractor/mediaworksnzvod] Add extractor by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/MicrosoftEmbed] Add extractor by [DoubleCouponDay](https://github.com/DoubleCouponDay)
-* [extractor/nbc] Add NBCStations extractor by [bashonly](https://github.com/bashonly)
-* [extractor/onenewsnz] Add extractor by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/prankcast] Add extractor by [HobbyistDev](https://github.com/HobbyistDev), [columndeeply](https://github.com/columndeeply)
-* [extractor/Smotrim] Add extractor by [Lesmiscore](https://github.com/Lesmiscore), [nikita-moor](https://github.com/nikita-moor)
-* [extractor/tencent] Add Iflix extractor by [elyse0](https://github.com/elyse0)
-* [extractor/unscripted] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/adobepass] Add MSO AlticeOne (Optimum TV) by [CplPwnies](https://github.com/CplPwnies)
-* [extractor/youtube] **Download `post_live` videos from start** by [Lesmiscore](https://github.com/Lesmiscore), [pukkandan](https://github.com/pukkandan)
-* [extractor/youtube] Add support for Shorts audio pivot feed by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [extractor/youtube] Detect `lazy-load-for-videos` embeds
-* [extractor/youtube] Do not warn on duplicate chapters
-* [extractor/youtube] Fix video like count extraction by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube] Support changing extraction language by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube:tab] Improve continuation items extraction
-* [extractor/youtube:tab] Support `reporthistory` page
-* [extractor/amazonstore] Fix JSON extraction by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [extractor/amazonstore] Retry to avoid captcha page by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/animeondemand] Remove extractor by [TokyoBlackHole](https://github.com/TokyoBlackHole)
-* [extractor/anvato] Fix extractor and refactor by [bashonly](https://github.com/bashonly)
-* [extractor/artetv] Remove duplicate stream urls by [Grub4K](https://github.com/Grub4K)
-* [extractor/audioboom] Support direct URLs and refactor by [pukkandan](https://github.com/pukkandan), [tpikonen](https://github.com/tpikonen)
-* [extractor/bandcamp] Extract `uploader_url`
-* [extractor/bilibili] Add space.bilibili extractors by [lockmatrix](https://github.com/lockmatrix)
-* [extractor/BilibiliSpace] Fix extractor and better error message by [lockmatrix](https://github.com/lockmatrix)
-* [extractor/BiliIntl] Support uppercase lang in `_VALID_URL` by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/BiliIntlSeries] Fix `_VALID_URL`
-* [extractor/bongacams] Update `_VALID_URL` by [0xGodspeed](https://github.com/0xGodspeed)
-* [extractor/crunchyroll:beta] Improve handling of hardsubs by [Grub4K](https://github.com/Grub4K)
-* [extractor/detik] Generalize extractors by [HobbyistDev](https://github.com/HobbyistDev), [coletdjnz](https://github.com/coletdjnz)
-* [extractor/dplay:italy] Add default authentication by [Timendum](https://github.com/Timendum)
-* [extractor/heise] Fix extractor by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/holodex] Fix `_VALID_URL` by [LiviaMedeiros](https://github.com/LiviaMedeiros)
-* [extractor/hrfensehen] Fix extractor by [snapdgn](https://github.com/snapdgn)
-* [extractor/hungama] Add subtitle by [GautamMKGarg](https://github.com/GautamMKGarg), [pukkandan](https://github.com/pukkandan)
-* [extractor/instagram] Extract more metadata by [pritam20ps05](https://github.com/pritam20ps05)
-* [extractor/JWPlatform] Fix extractor by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/malltv] Fix video_id extraction by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/MLBTV] Detect live streams
-* [extractor/motorsport] Support native embeds
-* [extractor/Mxplayer] Fix extractor by [itachi-19](https://github.com/itachi-19)
-* [extractor/nebula] Add nebula.tv by [tannertechnology](https://github.com/tannertechnology)
-* [extractor/nfl] Fix extractor by [bashonly](https://github.com/bashonly)
-* [extractor/ondemandkorea] Update `jw_config` regex by [julien-hadleyjack](https://github.com/julien-hadleyjack)
-* [extractor/paramountplus] Better DRM detection by [bashonly](https://github.com/bashonly)
-* [extractor/patreon] Sort formats
-* [extractor/rcs] Fix embed extraction by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/redgifs] Fix extractor by [jhwgh1968](https://github.com/jhwgh1968)
-* [extractor/rutube] Fix `_EMBED_REGEX` by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/RUTV] Fix warnings for livestreams by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/soundcloud:search] More metadata in `--flat-playlist` by [SuperSonicHub1](https://github.com/SuperSonicHub1)
-* [extractor/telegraaf] Use mobile GraphQL API endpoint by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/tennistv] Fix timestamp by [zenerdi0de](https://github.com/zenerdi0de)
-* [extractor/tiktok] Fix TikTokIE by [bashonly](https://github.com/bashonly)
-* [extractor/triller] Fix auth token by [bashonly](https://github.com/bashonly)
-* [extractor/trovo] Fix extractors by [Mehavoid](https://github.com/Mehavoid)
-* [extractor/tv2] Support new url format by [tobi1805](https://github.com/tobi1805)
-* [extractor/web.archive:youtube] Fix `_YT_INITIAL_PLAYER_RESPONSE_RE`
-* [extractor/wistia] Add support for channels by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/wistia] Match IDs in embed URLs by [bashonly](https://github.com/bashonly)
-* [extractor/wordpress:playlist] Add generic embed extractor by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/yandexvideopreview] Update `_VALID_URL` by [Grub4K](https://github.com/Grub4K)
-* [extractor/zee5] Fix `_VALID_URL` by [m4tu4g](https://github.com/m4tu4g)
-* [extractor/zee5] Generate device ids by [freezboltz](https://github.com/freezboltz)
-
-
-### 2022.09.01
-
-* Add option `--use-extractors`
-* Merge youtube-dl: Upto [commit/ed5c44e](https://github.com/ytdl-org/youtube-dl/commit/ed5c44e7)
-* Add yt-dlp version to infojson
-* Fix `--break-per-url --max-downloads`
-* Fix bug in `--alias`
-* [cookies] Support firefox container in `--cookies-from-browser` by [bashonly](https://github.com/bashonly), [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
-* [downloader/external] Smarter detection of executable
-* [extractor/generic] Don't return JW player without formats
-* [FormatSort] Fix `aext` for `--prefer-free-formats`
-* [jsinterp] Various improvements by [pukkandan](https://github.com/pukkandan), [dirkf](https://github.com/dirkf), [elyse0](https://github.com/elyse0)
-* [cache] Mechanism to invalidate old cache
-* [utils] Add `deprecation_warning`
-* [utils] Add `orderedSet_from_options`
-* [utils] `Popen`: Restore `LD_LIBRARY_PATH` when using PyInstaller by [Lesmiscore](https://github.com/Lesmiscore)
-* [build] `make tar` should not follow `DESTDIR` by [satan1st](https://github.com/satan1st)
-* [build] Update pyinstaller by [shirt-dev](https://github.com/shirt-dev)
-* [test] Fix `test_youtube_signature`
-* [cleanup] Misc fixes and cleanup by [DavidH-2022](https://github.com/DavidH-2022), [MrRawes](https://github.com/MrRawes), [pukkandan](https://github.com/pukkandan)
-* [extractor/epoch] Add extractor by [tejasa97](https://github.com/tejasa97)
-* [extractor/eurosport] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
-* [extractor/IslamChannel] Add extractors by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/newspicks] Add extractor by [Lesmiscore](https://github.com/Lesmiscore)
-* [extractor/triller] Add extractor by [bashonly](https://github.com/bashonly)
-* [extractor/VQQ] Add extractors by [elyse0](https://github.com/elyse0)
-* [extractor/youtube] Improvements to nsig extraction
-* [extractor/youtube] Fix bug in format sorting
-* [extractor/youtube] Update iOS Innertube clients by [SamantazFox](https://github.com/SamantazFox)
-* [extractor/youtube] Use device-specific user agent by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/youtube] Add `--compat-option no-youtube-prefer-utc-upload-date` by [coletdjnz](https://github.com/coletdjnz)
-* [extractor/arte] Bug fix by [cgrigis](https://github.com/cgrigis)
-* [extractor/bilibili] Extract `flac` with premium account by [jackyyf](https://github.com/jackyyf)
-* [extractor/BiliBiliSearch] Don't sort by date
-* [extractor/BiliBiliSearch] Fix infinite loop
-* [extractor/bitchute] Mark errors as expected
-* [extractor/crunchyroll:beta] Use anonymous access by [tejing1](https://github.com/tejing1)
-* [extractor/huya] Fix stream extraction by [ohaiibuzzle](https://github.com/ohaiibuzzle)
-* [extractor/medaltv] Fix extraction by [xenova](https://github.com/xenova)
-* [extractor/mediaset] Fix embed extraction
-* [extractor/mixcloud] All formats are audio-only
-* [extractor/rtbf] Fix jwt extraction by [elyse0](https://github.com/elyse0)
-* [extractor/screencastomatic] Support `--video-password` by [shreyasminocha](https://github.com/shreyasminocha)
-* [extractor/stripchat] Don't modify input URL by [dfaker](https://github.com/dfaker)
-* [extractor/uktv] Improve `_VALID_URL` by [dirkf](https://github.com/dirkf)
-* [extractor/vimeo:user] Fix `_VALID_URL`
 
+* Revert "[ffmpeg] Set `ffmpeg_location` in a contextvar"
+* Revert "Remove Python 3.6 support"
+* Use `compat.re`
 
 ### 2022.08.19
 

Collaborators.md

@@ -8,7 +8,6 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 ## [pukkandan](https://github.com/pukkandan)
 
 [![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/pukkandan)
-[![gh-sponsor](https://img.shields.io/badge/_-Github-red.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/pukkandan)
 
 * Owner of the fork
 
@@ -26,9 +25,8 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 
 ## [coletdjnz](https://github.com/coletdjnz)
 
-[![gh-sponsor](https://img.shields.io/badge/_-Github-red.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
+[![gh-sponsor](https://img.shields.io/badge/_-Sponsor-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
 
-* Improved plugin architecture
 * YouTube improvements including: age-gate bypass, private playlists, multiple-clients (to avoid throttling) and a lot of under-the-hood improvements
 * Added support for new websites YoutubeWebArchive, MainStreaming, PRX, nzherald, Mediaklikk, StarTV etc
 * Improved/fixed support for Patreon, panopto, gfycat, itv, pbs, SouthParkDE etc
@@ -44,7 +42,7 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 * Improved/fixed support for HiDive, HotStar, Hungama, LBRY, LinkedInLearning, Mxplayer, SonyLiv, TV2, Vimeo, VLive etc
 
 
-## [Lesmiscore](https://github.com/Lesmiscore) <sub><sup>(nao20010128nao)</sup></sub>
+## [Lesmiscore](https://github.com/Lesmiscore) (nao20010128nao)
 
 **Bitcoin**: bc1qfd02r007cutfdjwjmyy9w23rjvtls6ncve7r3s  
 **Monacoin**: mona1q3tf7dzvshrhfe3md379xtvt2n22duhglv5dskr
@@ -52,18 +50,3 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 * Download live from start to end for YouTube
 * Added support for new websites AbemaTV, mildom, PixivSketch, skeb, radiko, voicy, mirrativ, openrec, whowatch, damtomo, 17.live, mixch etc
 * Improved/fixed support for fc2, YahooJapanNews, tver, iwara etc
-
-
-## [bashonly](https://github.com/bashonly)
-
-* `--cookies-from-browser` support for Firefox containers
-* Added support for new websites Genius, Kick, NBCStations, Triller, VideoKen etc
-* Improved/fixed support for Anvato, Brightcove, Instagram, ParamountPlus, Reddit, SlidesLive, TikTok, Twitter, Vimeo etc
-
-
-## [Grub4K](https://github.com/Grub4K)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/Grub4K) [![gh-sponsor](https://img.shields.io/badge/_-Github-red.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/Grub4K)
-
-* Rework internals like `traverse_obj`, various core refactors and bugs fixes
-* Helped fix crunchyroll, Twitter, wrestleuniverse, wistia, slideslive etc

Makefile

@@ -17,8 +17,8 @@ pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \
 clean-test:
 	rm -rf test/testdata/sigs/player-*.js tmp/ *.annotations.xml *.aria2 *.description *.dump *.frag \
 	*.frag.aria2 *.frag.urls *.info.json *.live_chat.json *.meta *.part* *.tmp *.temp *.unknown_video *.ytdl \
-	*.3gp *.ape *.ass *.avi *.desktop *.f4v *.flac *.flv *.gif *.jpeg *.jpg *.m4a *.m4v *.mhtml *.mkv *.mov *.mp3 \
+	*.3gp *.ape *.ass *.avi *.desktop *.f4v *.flac *.flv *.jpeg *.jpg *.m4a *.mpga *.m4v *.mhtml *.mkv *.mov \
-	*.mp4 *.mpga *.oga *.ogg *.opus *.png *.sbv *.srt *.swf *.swp *.tt *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp
+	*.mp3 *.mp4 *.ogg *.opus *.png *.sbv *.srt *.swf *.swp *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp
 clean-dist:
 	rm -rf yt-dlp.1.temp.md yt-dlp.1 README.txt MANIFEST build/ dist/ .coverage cover/ yt-dlp.tar.gz completions/ \
 	yt_dlp/extractor/lazy_extractors.py *.spec CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe yt_dlp.egg-info/ AUTHORS .mailmap
@@ -33,6 +33,7 @@ completion-zsh: completions/zsh/_yt-dlp
 lazy-extractors: yt_dlp/extractor/lazy_extractors.py
 
 PREFIX ?= /usr/local
+DESTDIR ?= .
 BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/man
 SHAREDIR ?= $(PREFIX)/share
@@ -74,16 +75,17 @@ offlinetest: codetest
 	$(PYTHON) -m pytest -k "not download"
 
 # XXX: This is hard to maintain
-CODE_FOLDERS = yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor yt_dlp/compat yt_dlp/dependencies
+CODE_FOLDERS = yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor yt_dlp/compat \
+               yt_dlp/extractor/anvato_token_generator
 yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
 	mkdir -p zip
 	for d in $(CODE_FOLDERS) ; do \
 	  mkdir -p zip/$$d ;\
 	  cp -pPR $$d/*.py zip/$$d/ ;\
 	done
-	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py
+	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py zip/yt_dlp/*/*/*.py
 	mv zip/yt_dlp/__main__.py zip/
-	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
+	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py yt_dlp/*/*/*.py __main__.py
 	rm -rf zip
 	echo '#!$(PYTHON)' > yt-dlp
 	cat yt-dlp.zip >> yt-dlp
@@ -132,7 +134,7 @@ yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscrip
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
 yt-dlp.tar.gz: all
-	@tar -czf yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
+	@tar -czf $(DESTDIR)/yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
 		--exclude '*.pyc' \

devscripts/lazy_load_template.py

@@ -10,18 +10,15 @@ from ..utils import (
 )
 
 # These bloat the lazy_extractors, so allow them to passthrough silently
-ALLOWED_CLASSMETHODS = {'extract_from_webpage', 'get_testcases', 'get_webpage_testcases'}
+ALLOWED_CLASSMETHODS = {'get_testcases', 'extract_from_webpage'}
-_WARNED = False
 
 
 class LazyLoadMetaClass(type):
     def __getattr__(cls, name):
-        global _WARNED
+        if '_real_class' not in cls.__dict__ and name not in ALLOWED_CLASSMETHODS:
-        if ('_real_class' not in cls.__dict__
+            write_string(
-                and name not in ALLOWED_CLASSMETHODS and not _WARNED):
+                'WARNING: Falling back to normal extractor since lazy extractor '
-            _WARNED = True
+                f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
-            write_string('WARNING: Falling back to normal extractor since lazy extractor '
-                         f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
         return getattr(cls.real_class, name)
 
 

devscripts/make_issue_template.py

@@ -58,7 +58,7 @@ NO_SKIP = '''
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\\* field
           required: true
 '''.strip()
 

devscripts/make_lazy_extractors.py

@@ -2,7 +2,6 @@
 
 # Allow direct execution
 import os
-import shutil
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ -13,18 +12,9 @@ from inspect import getsource
 from devscripts.utils import get_filename_args, read_file, write_file
 
 NO_ATTR = object()
-STATIC_CLASS_PROPERTIES = [
+STATIC_CLASS_PROPERTIES = ['IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_VALID_URL', '_WORKING', '_NETRC_MACHINE', 'age_limit']
-    'IE_NAME', '_ENABLED', '_VALID_URL',  # Used for URL matching
-    '_WORKING', 'IE_DESC', '_NETRC_MACHINE', 'SEARCH_KEY',  # Used for --extractor-descriptions
-    'age_limit',  # Used for --age-limit (evaluated)
-    '_RETURN_TYPE',  # Accessed in CLI only with instance (evaluated)
-]
 CLASS_METHODS = [
-    'ie_key', 'suitable', '_match_valid_url',  # Used for URL matching
+    'ie_key', 'working', 'description', 'suitable', '_match_valid_url', '_match_id', 'get_temp_id', 'is_suitable'
-    'working', 'get_temp_id', '_match_id',  # Accessed just before instance creation
-    'description',  # Used for --extractor-descriptions
-    'is_suitable',  # Used for --age-limit
-    'supports_login', 'is_single_video',  # Accessed in CLI only with instance
 ]
 IE_TEMPLATE = '''
 class {name}({bases}):
@@ -40,12 +30,8 @@ def main():
 
     _ALL_CLASSES = get_all_ies()  # Must be before import
 
-    import yt_dlp.plugins
     from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 
-    # Filter out plugins
-    _ALL_CLASSES = [cls for cls in _ALL_CLASSES if not cls.__module__.startswith(f'{yt_dlp.plugins.PACKAGE_NAME}.')]
-
     DummyInfoExtractor = type('InfoExtractor', (InfoExtractor,), {'IE_NAME': NO_ATTR})
     module_src = '\n'.join((
         MODULE_TEMPLATE,
@@ -62,13 +48,12 @@ def get_all_ies():
     PLUGINS_DIRNAME = 'ytdlp_plugins'
     BLOCKED_DIRNAME = f'{PLUGINS_DIRNAME}_blocked'
     if os.path.exists(PLUGINS_DIRNAME):
-        # os.rename cannot be used, e.g. in Docker. See https://github.com/yt-dlp/yt-dlp/pull/4958
+        os.rename(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
-        shutil.move(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
     try:
         from yt_dlp.extractor.extractors import _ALL_CLASSES
     finally:
         if os.path.exists(BLOCKED_DIRNAME):
-            shutil.move(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
+            os.rename(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
     return _ALL_CLASSES
 
 

devscripts/run_tests.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env sh
 
-if [ -z "$1" ]; then
+if [ -z $1 ]; then
     test_set='test'
-elif [ "$1" = 'core' ]; then
+elif [ $1 = 'core' ]; then
     test_set="-m not download"
-elif [ "$1" = 'download' ]; then
+elif [ $1 = 'download' ]; then
     test_set="-m download"
 else
-    echo 'Invalid test type "'"$1"'". Use "core" | "download"'
+    echo 'Invalid test type "'$1'". Use "core" | "download"'
     exit 1
 fi
 

devscripts/update-version.py

@@ -16,6 +16,7 @@ from devscripts.utils import read_version, write_file
 
 
 def get_new_version(revision):
+    return read_version()
     version = datetime.utcnow().strftime('%Y.%m.%d')
 
     if revision:
@@ -50,7 +51,5 @@ UPDATE_HINT = None
 '''
 
 write_file('yt_dlp/version.py', VERSION_FILE)
-github_output = os.getenv('GITHUB_OUTPUT')
+print(f'::set-output name=ytdlp_version::{VERSION}')
-if github_output:
-    write_file(github_output, f'ytdlp_version={VERSION}\n', 'a')
 print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')

devscripts/utils.py

@@ -7,8 +7,8 @@ def read_file(fname):
         return f.read()
 
 
-def write_file(fname, content, mode='w'):
+def write_file(fname, content):
-    with open(fname, mode, encoding='utf-8') as f:
+    with open(fname, 'w', encoding='utf-8') as f:
         return f.write(content)
 
 

pyinst.py

@@ -12,8 +12,9 @@ from PyInstaller.__main__ import run as run_pyinstaller
 
 from devscripts.utils import read_version
 
-OS_NAME, MACHINE, ARCH = sys.platform, platform.machine().lower(), platform.architecture()[0][:2]
+OS_NAME, MACHINE, ARCH = sys.platform, platform.machine(), platform.architecture()[0][:2]
-if MACHINE in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
+if MACHINE in ('x86_64', 'AMD64') or ('i' in MACHINE and '86' in MACHINE):
+    # NB: Windows x86 has MACHINE = AMD64 irrespective of bitness
     MACHINE = 'x86' if ARCH == '32' else ''
 
 
@@ -37,7 +38,7 @@ def main():
         '--icon=devscripts/logo.ico',
         '--upx-exclude=vcruntime140.dll',
         '--noconfirm',
-        '--additional-hooks-dir=yt_dlp/__pyinstaller',
+        *dependency_options(),
         *opts,
         'yt_dlp/__main__.py',
     ]
@@ -62,7 +63,7 @@ def exe(onedir):
     name = '_'.join(filter(None, (
         'yt-dlp',
         {'win32': '', 'darwin': 'macos'}.get(OS_NAME, OS_NAME),
-        MACHINE,
+        MACHINE
     )))
     return name, ''.join(filter(None, (
         'dist/',
@@ -77,6 +78,30 @@ def version_to_list(version):
     return list(map(int, version_list)) + [0] * (4 - len(version_list))
 
 
+def dependency_options():
+    # Due to the current implementation, these are auto-detected, but explicitly add them just in case
+    dependencies = [pycryptodome_module(), 'mutagen', 'brotli', 'certifi', 'websockets']
+    excluded_modules = ('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts')
+
+    yield from (f'--hidden-import={module}' for module in dependencies)
+    yield '--collect-submodules=websockets'
+    yield from (f'--exclude-module={module}' for module in excluded_modules)
+
+
+def pycryptodome_module():
+    try:
+        import Cryptodome  # noqa: F401
+    except ImportError:
+        try:
+            import Crypto  # noqa: F401
+            print('WARNING: Using Crypto since Cryptodome is not available. '
+                  'Install with: pip install pycryptodomex', file=sys.stderr)
+            return 'Crypto'
+        except ImportError:
+            pass
+    return 'Cryptodome'
+
+
 def set_version_info(exe, version):
     if OS_NAME == 'win32':
         windows_set_version(exe, version)
@@ -85,6 +110,7 @@ def set_version_info(exe, version):
 def windows_set_version(exe, version):
     from PyInstaller.utils.win32.versioninfo import (
         FixedFileInfo,
+        SetVersion,
         StringFileInfo,
         StringStruct,
         StringTable,
@@ -93,11 +119,6 @@ def windows_set_version(exe, version):
         VSVersionInfo,
     )
 
-    try:
-        from PyInstaller.utils.win32.versioninfo import SetVersion
-    except ImportError:  # Pyinstaller >= 5.8
-        from PyInstaller.utils.win32.versioninfo import write_version_info_to_executable as SetVersion
-
     version_list = version_to_list(version)
     suffix = MACHINE and f'_{MACHINE}'
     SetVersion(exe, VSVersionInfo(

pyproject.toml

@@ -1,5 +0,0 @@
-[build-system]
-build-backend = 'setuptools.build_meta'
-# https://github.com/yt-dlp/yt-dlp/issues/5941
-# https://github.com/pypa/distutils/issues/17
-requires = ['setuptools > 50']

setup.cfg

@@ -10,14 +10,6 @@ per_file_ignores =
     devscripts/lazy_load_template.py: F401
 
 
-[autoflake]
-ignore-init-module-imports = true
-ignore-pass-after-docstring = true
-remove-all-unused-imports = true
-remove-duplicate-keys = true
-remove-unused-variables = true
-
-
 [tool:pytest]
 addopts = -ra -v --strict-markers
 markers =
@@ -26,12 +18,12 @@ markers =
 
 [tox:tox]
 skipsdist = true
-envlist = py{36,37,38,39,310,311},pypy{36,37,38,39}
+envlist = py{36,37,38,39,310},pypy{36,37,38,39}
 skip_missing_interpreters = true
 
 [testenv]  # tox
 deps =
-    pytest
+   pytest
 commands = pytest {posargs:"-m not download"}
 passenv = HOME  # For test_compat_expanduser
 setenv =

setup.py

@@ -1,12 +1,8 @@
 #!/usr/bin/env python3
 
-# Allow execution from anywhere
+import os.path
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
 import subprocess
+import sys
 import warnings
 
 try:
@@ -36,38 +32,41 @@ def packages():
 
     return [
         'yt_dlp', 'yt_dlp.extractor', 'yt_dlp.downloader', 'yt_dlp.postprocessor', 'yt_dlp.compat',
+        'yt_dlp.extractor.anvato_token_generator',
     ]
 
 
 def py2exe_params():
+    import py2exe  # noqa: F401
+
     warnings.warn(
         'py2exe builds do not support pycryptodomex and needs VC++14 to run. '
-        'It is recommended to run "pyinst.py" to build using pyinstaller instead')
+        'The recommended way is to use "pyinst.py" to build using pyinstaller')
 
     return {
         'console': [{
             'script': './yt_dlp/__main__.py',
             'dest_base': 'yt-dlp',
-            'icon_resources': [(1, 'devscripts/logo.ico')],
-        }],
-        'version_info': {
             'version': VERSION,
             'description': DESCRIPTION,
             'comments': LONG_DESCRIPTION.split('\n')[0],
             'product_name': 'yt-dlp',
             'product_version': VERSION,
-        },
+            'icon_resources': [(1, 'devscripts/logo.ico')],
+        }],
         'options': {
-            'bundle_files': 0,
+            'py2exe': {
-            'compressed': 1,
+                'bundle_files': 0,
-            'optimize': 2,
+                'compressed': 1,
-            'dist_dir': './dist',
+                'optimize': 2,
-            'excludes': ['Crypto', 'Cryptodome'],  # py2exe cannot import Crypto
+                'dist_dir': './dist',
-            'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
+                'excludes': ['Crypto', 'Cryptodome'],  # py2exe cannot import Crypto
-            # Modules that are only imported dynamically must be added here
+                'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
-            'includes': ['yt_dlp.compat._legacy'],
+                # Modules that are only imported dynamically must be added here
+                'includes': ['yt_dlp.compat._legacy'],
+            }
         },
-        'zipfile': None,
+        'zipfile': None
     }
 
 
@@ -92,10 +91,7 @@ def build_params():
     params = {'data_files': data_files}
 
     if setuptools_available:
-        params['entry_points'] = {
+        params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
-            'console_scripts': ['yt-dlp = yt_dlp:main'],
-            'pyinstaller40': ['hook-dirs = yt_dlp.__pyinstaller:get_hook_dirs'],
-        }
     else:
         params['scripts'] = ['yt-dlp']
     return params
@@ -118,58 +114,42 @@ class build_lazy_extractors(Command):
         subprocess.run([sys.executable, 'devscripts/make_lazy_extractors.py'])
 
 
-def main():
+params = py2exe_params() if sys.argv[1:2] == ['py2exe'] else build_params()
-    if sys.argv[1:2] == ['py2exe']:
+setup(
-        params = py2exe_params()
+    name='yt-dlp',
-        try:
+    version=VERSION,
-            from py2exe import freeze
+    maintainer='pukkandan',
-        except ImportError:
+    maintainer_email='pukkandan.ytdlp@gmail.com',
-            import py2exe  # noqa: F401
+    description=DESCRIPTION,
-            warnings.warn('You are using an outdated version of py2exe. Support for this version will be removed in the future')
+    long_description=LONG_DESCRIPTION,
-            params['console'][0].update(params.pop('version_info'))
+    long_description_content_type='text/markdown',
-            params['options'] = {'py2exe': params.pop('options')}
+    url='https://github.com/yt-dlp/yt-dlp',
-        else:
+    packages=packages(),
-            return freeze(**params)
+    install_requires=REQUIREMENTS,
-    else:
+    python_requires='>=3.6',
-        params = build_params()
+    project_urls={
-
+        'Documentation': 'https://github.com/yt-dlp/yt-dlp#readme',
-    setup(
+        'Source': 'https://github.com/yt-dlp/yt-dlp',
-        name='yt-dlp',
+        'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues',
-        version=VERSION,
+        'Funding': 'https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators',
-        maintainer='pukkandan',
+    },
-        maintainer_email='pukkandan.ytdlp@gmail.com',
+    classifiers=[
-        description=DESCRIPTION,
+        'Topic :: Multimedia :: Video',
-        long_description=LONG_DESCRIPTION,
+        'Development Status :: 5 - Production/Stable',
-        long_description_content_type='text/markdown',
+        'Environment :: Console',
-        url='https://github.com/yt-dlp/yt-dlp',
+        'Programming Language :: Python',
-        packages=packages(),
+        'Programming Language :: Python :: 3.6',
-        install_requires=REQUIREMENTS,
+        'Programming Language :: Python :: 3.7',
-        python_requires='>=3.7',
+        'Programming Language :: Python :: 3.8',
-        project_urls={
+        'Programming Language :: Python :: 3.9',
-            'Documentation': 'https://github.com/yt-dlp/yt-dlp#readme',
+        'Programming Language :: Python :: 3.10',
-            'Source': 'https://github.com/yt-dlp/yt-dlp',
+        'Programming Language :: Python :: 3.11',
-            'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues',
+        'Programming Language :: Python :: Implementation',
-            'Funding': 'https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators',
+        'Programming Language :: Python :: Implementation :: CPython',
-        },
+        'Programming Language :: Python :: Implementation :: PyPy',
-        classifiers=[
+        'License :: Public Domain',
-            'Topic :: Multimedia :: Video',
+        'Operating System :: OS Independent',
-            'Development Status :: 5 - Production/Stable',
+    ],
-            'Environment :: Console',
+    cmdclass={'build_lazy_extractors': build_lazy_extractors},
-            'Programming Language :: Python',
+    **params
-            'Programming Language :: Python :: 3.7',
+)
-            'Programming Language :: Python :: 3.8',
-            'Programming Language :: Python :: 3.9',
-            'Programming Language :: Python :: 3.10',
-            'Programming Language :: Python :: 3.11',
-            'Programming Language :: Python :: Implementation',
-            'Programming Language :: Python :: Implementation :: CPython',
-            'Programming Language :: Python :: Implementation :: PyPy',
-            'License :: Public Domain',
-            'Operating System :: OS Independent',
-        ],
-        cmdclass={'build_lazy_extractors': build_lazy_extractors},
-        **params
-    )
-
-
-main()

supportedsites.md

@@ -3,12 +3,11 @@
  - **0000studio:clip**
  - **17live**
  - **17live:clip**
- - **1News**: 1news.co.nz article videos
  - **1tv**: Первый канал
+ - **20.detik.com**
  - **20min**
  - **23video**
  - **247sports**
- - **24tv.ua**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -23,7 +22,7 @@
  - **9now.com.au**
  - **abc.net.au**
  - **abc.net.au:iview**
- - **abc.net.au:​iview:showseries**
+ - **abc.net.au:iview:showseries**
  - **abcnews**
  - **abcnews:video**
  - **abcotvs**: ABC Owned Television Stations
@@ -35,7 +34,7 @@
  - **acast:channel**
  - **AcFunBangumi**
  - **AcFunVideo**
- - **ADN**: [<abbr title="netrc machine"><em>animationdigitalnetwork</em></abbr>] Animation Digital Network
+ - **ADN**: [<abbr title="netrc machine"><em>animedigitalnetwork</em></abbr>] Anime Digital Network
  - **AdobeConnect**
  - **adobetv**
  - **adobetv:channel**
@@ -46,13 +45,10 @@
  - **aenetworks**: A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault
  - **aenetworks:collection**
  - **aenetworks:show**
- - **AeonCo**
  - **afreecatv**: [<abbr title="netrc machine"><em>afreecatv</em></abbr>] afreecatv.com
  - **afreecatv:live**: [<abbr title="netrc machine"><em>afreecatv</em></abbr>] afreecatv.com
  - **afreecatv:user**
  - **AirMozilla**
- - **AirTV**
- - **AitubeKZVideo**
  - **AliExpressLive**
  - **AlJazeera**
  - **Allocine**
@@ -62,19 +58,15 @@
  - **Alura**: [<abbr title="netrc machine"><em>alura</em></abbr>]
  - **AluraCourse**: [<abbr title="netrc machine"><em>aluracourse</em></abbr>]
  - **Amara**
- - **AmazonMiniTV**
- - **amazonminitv:season**: Amazon MiniTV Season, "minitv:season:" prefix
- - **amazonminitv:series**: Amazon MiniTV Series, "minitv:series:" prefix
- - **AmazonReviews**
  - **AmazonStore**
  - **AMCNetworks**
  - **AmericasTestKitchen**
  - **AmericasTestKitchenSeason**
  - **AmHistoryChannel**
- - **AnchorFMEpisode**
  - **anderetijden**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **Angel**
  - **AnimalPlanet**
+ - **AnimeOnDemand**: [<abbr title="netrc machine"><em>animeondemand</em></abbr>]
  - **ant1newsgr:article**: ant1news.gr articles
  - **ant1newsgr:embed**: ant1news.gr embedded videos
  - **ant1newsgr:watch**: ant1news.gr videos
@@ -127,24 +119,22 @@
  - **Bandcamp:album**
  - **Bandcamp:user**
  - **Bandcamp:weekly**
+ - **bangumi.bilibili.com**: BiliBili番剧
  - **BannedVideo**
  - **bbc**: [<abbr title="netrc machine"><em>bbc</em></abbr>] BBC
  - **bbc.co.uk**: [<abbr title="netrc machine"><em>bbc</em></abbr>] BBC iPlayer
  - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:​iplayer:episodes**
+ - **bbc.co.uk:iplayer:episodes**
- - **bbc.co.uk:​iplayer:group**
+ - **bbc.co.uk:iplayer:group**
  - **bbc.co.uk:playlist**
  - **BBVTV**: [<abbr title="netrc machine"><em>bbvtv</em></abbr>]
  - **BBVTVLive**: [<abbr title="netrc machine"><em>bbvtv</em></abbr>]
  - **BBVTVRecordings**: [<abbr title="netrc machine"><em>bbvtv</em></abbr>]
- - **BeatBumpPlaylist**
- - **BeatBumpVideo**
  - **Beatport**
  - **Beeg**
  - **BehindKink**
  - **Bellator**
  - **BellMedia**
- - **BerufeTV**
  - **Bet**
  - **bfi:player**
  - **bfmtv**
@@ -158,15 +148,11 @@
  - **Bilibili category extractor**
  - **BilibiliAudio**
  - **BilibiliAudioAlbum**
- - **BiliBiliBangumi**
+ - **BilibiliChannel**
- - **BiliBiliBangumiMedia**
  - **BiliBiliPlayer**
  - **BiliBiliSearch**: Bilibili video search; "bilisearch:" prefix
- - **BilibiliSpaceAudio**
- - **BilibiliSpacePlaylist**
- - **BilibiliSpaceVideo**
  - **BiliIntl**: [<abbr title="netrc machine"><em>biliintl</em></abbr>]
- - **biliIntl:series**: [<abbr title="netrc machine"><em>biliintl</em></abbr>]
+ - **BiliIntlSeries**: [<abbr title="netrc machine"><em>biliintl</em></abbr>]
  - **BiliLive**
  - **BioBioChileTV**
  - **Biography**
@@ -178,15 +164,12 @@
  - **BlackboardCollaborate**
  - **BleacherReport**
  - **BleacherReportCMS**
- - **blerp**
  - **blogger.com**
  - **Bloomberg**
  - **BokeCC**
  - **BongaCams**
- - **BooyahClips**
  - **BostonGlobe**
  - **Box**
- - **BoxCastVideo**
  - **Bpb**: Bundeszentrale für politische Bildung
  - **BR**: Bayerischer Rundfunk
  - **BravoTV**
@@ -197,7 +180,6 @@
  - **BRMediathek**: Bayerischer Rundfunk Mediathek
  - **bt:article**: Bergens Tidende Articles
  - **bt:vestlendingen**: Bergens Tidende - Vestlendingen
- - **Bundesliga**
  - **BusinessInsider**
  - **BuzzFeed**
  - **BYUtv**
@@ -208,7 +190,6 @@
  - **Camdemy**
  - **CamdemyFolder**
  - **CamModels**
- - **Camsoda**
  - **CamtasiaEmbed**
  - **CamWithHer**
  - **CanalAlpha**
@@ -232,7 +213,7 @@
  - **cbssports:embed**
  - **CCMA**
  - **CCTV**: 央视网
- - **CDA**: [<abbr title="netrc machine"><em>cdapl</em></abbr>]
+ - **CDA**
  - **Cellebrite**
  - **CeskaTelevize**
  - **CGTN**
@@ -247,7 +228,6 @@
  - **cielotv.it**
  - **Cinchcast**
  - **Cinemax**
- - **CinetecaMilano**
  - **CiscoLiveSearch**
  - **CiscoLiveSession**
  - **ciscowebex**: Cisco Webex
@@ -268,7 +248,6 @@
  - **CNN**
  - **CNNArticle**
  - **CNNBlogs**
- - **CNNIndonesia**
  - **ComedyCentral**
  - **ComedyCentralTV**
  - **CondeNast**: Condé Nast media group: Allure, Architectural Digest, Ars Technica, Bon Appétit, Brides, Condé Nast, Condé Nast Traveler, Details, Epicurious, GQ, Glamour, Golf Digest, SELF, Teen Vogue, The New Yorker, Vanity Fair, Vogue, W Magazine, WIRED
@@ -287,7 +266,9 @@
  - **CrowdBunker**
  - **CrowdBunkerChannel**
  - **crunchyroll**: [<abbr title="netrc machine"><em>crunchyroll</em></abbr>]
+ - **crunchyroll:beta**: [<abbr title="netrc machine"><em>crunchyroll</em></abbr>]
  - **crunchyroll:playlist**: [<abbr title="netrc machine"><em>crunchyroll</em></abbr>]
+ - **crunchyroll:playlist:beta**: [<abbr title="netrc machine"><em>crunchyroll</em></abbr>]
  - **CSpan**: C-SPAN
  - **CSpanCongress**
  - **CtsNews**: 華視新聞
@@ -323,9 +304,6 @@
  - **defense.gouv.fr**
  - **democracynow**
  - **DestinationAmerica**
- - **DetikEmbed**
- - **DeuxM**
- - **DeuxMNews**
  - **DHM**: Filmarchiv - Deutsches Historisches Museum
  - **Digg**
  - **DigitalConcertHall**: [<abbr title="netrc machine"><em>digitalconcerthall</em></abbr>] DigitalConcertHall extractor
@@ -343,6 +321,7 @@
  - **DIYNetwork**
  - **dlive:stream**
  - **dlive:vod**
+ - **DoodStream**
  - **Dotsub**
  - **Douyin**
  - **DouyuShow**
@@ -356,8 +335,6 @@
  - **DrTuber**
  - **drtv**
  - **drtv:live**
- - **drtv:season**
- - **drtv:series**
  - **DTube**
  - **duboku**: www.duboku.io
  - **duboku:list**: www.duboku.io entire series
@@ -367,7 +344,6 @@
  - **dw:article**
  - **EaglePlatform**
  - **EbaumsWorld**
- - **Ebay**
  - **EchoMsk**
  - **egghead:course**: egghead.io course
  - **egghead:lesson**: egghead.io lesson
@@ -388,7 +364,6 @@
  - **Engadget**
  - **Epicon**
  - **EpiconSeries**
- - **Epoch**
  - **Eporner**
  - **EroProfile**: [<abbr title="netrc machine"><em>eroprofile</em></abbr>]
  - **EroProfile:album**
@@ -401,9 +376,7 @@
  - **ESPNCricInfo**
  - **EsriVideo**
  - **Europa**
- - **EuroParlWebstream**
  - **EuropeanTour**
- - **Eurosport**
  - **EUScreen**
  - **EWETV**: [<abbr title="netrc machine"><em>ewetv</em></abbr>]
  - **EWETVLive**: [<abbr title="netrc machine"><em>ewetv</em></abbr>]
@@ -440,7 +413,6 @@
  - **Foxgay**
  - **foxnews**: Fox News and Fox Business Video
  - **foxnews:article**
- - **FoxNewsVideo**
  - **FoxSports**
  - **fptplay**: fptplay.vn
  - **FranceCulture**
@@ -482,8 +454,6 @@
  - **gem.cbc.ca**: [<abbr title="netrc machine"><em>cbcgem</em></abbr>]
  - **gem.cbc.ca:live**
  - **gem.cbc.ca:playlist**
- - **Genius**
- - **GeniusLyrics**
  - **Gettr**
  - **GettrStreaming**
  - **Gfycat**
@@ -504,10 +474,9 @@
  - **Golem**
  - **goodgame:stream**
  - **google:podcasts**
- - **google:​podcasts:feed**
+ - **google:podcasts:feed**
  - **GoogleDrive**
  - **GoogleDrive:Folder**
- - **GoPlay**: [<abbr title="netrc machine"><em>goplay</em></abbr>]
  - **GoPro**
  - **Goshgay**
  - **GoToStage**
@@ -539,7 +508,6 @@
  - **HotNewHipHop**
  - **hotstar**
  - **hotstar:playlist**
- - **hotstar:season**
  - **hotstar:series**
  - **Howcast**
  - **HowStuffWorks**
@@ -558,14 +526,11 @@
  - **Hypem**
  - **Hytale**
  - **Icareus**
- - **iflix:episode**
- - **IflixSeries**
  - **ign.com**
  - **IGNArticle**
  - **IGNVideo**
  - **IHeartRadio**
  - **iheartradio:podcast**
- - **Iltalehti**
  - **imdb**: Internet Movie Database trailers
  - **imdb:list**: Internet Movie Database lists
  - **Imgur**
@@ -588,9 +553,6 @@
  - **iq.com**: International version of iQiyi
  - **iq.com:album**
  - **iqiyi**: [<abbr title="netrc machine"><em>iqiyi</em></abbr>] 爱奇艺
- - **IslamChannel**
- - **IslamChannelSeries**
- - **IsraelNationalNews**
  - **ITProTV**
  - **ITProTVCourse**
  - **ITTF**
@@ -599,7 +561,6 @@
  - **ivi**: ivi.ru
  - **ivi:compilation**: ivi.ru compilations
  - **ivideon**: Ivideon TV
- - **IVXPlayer**
  - **Iwara**
  - **iwara:playlist**
  - **iwara:user**
@@ -615,8 +576,6 @@
  - **JWPlatform**
  - **Kakao**
  - **Kaltura**
- - **Kanal2**
- - **KankaNews**
  - **Karaoketv**
  - **KarriereVideos**
  - **Katsomo**
@@ -625,13 +584,10 @@
  - **Ketnet**
  - **khanacademy**
  - **khanacademy:unit**
- - **Kick**
  - **Kicker**
  - **KickStarter**
- - **KickVOD**
  - **KinjaEmbed**
  - **KinoPoisk**
- - **Kommunetv**
  - **KompasVideo**
  - **KonserthusetPlay**
  - **Koo**
@@ -646,7 +602,7 @@
  - **kuwo:singer**: 酷我音乐 - 歌手
  - **kuwo:song**: 酷我音乐
  - **la7.it**
- - **la7.it:​pod:episode**
+ - **la7.it:pod:episode**
  - **la7.it:podcast**
  - **laola1tv**
  - **laola1tv:embed**
@@ -680,10 +636,9 @@
  - **LineLiveChannel**
  - **LinkedIn**: [<abbr title="netrc machine"><em>linkedin</em></abbr>]
  - **linkedin:learning**: [<abbr title="netrc machine"><em>linkedin</em></abbr>]
- - **linkedin:​learning:course**: [<abbr title="netrc machine"><em>linkedin</em></abbr>]
+ - **linkedin:learning:course**: [<abbr title="netrc machine"><em>linkedin</em></abbr>]
  - **LinuxAcademy**: [<abbr title="netrc machine"><em>linuxacademy</em></abbr>]
  - **Liputan6**
- - **ListenNotes**
  - **LiTV**
  - **LiveJournal**
  - **livestream**
@@ -702,7 +657,7 @@
  - **MagentaMusik360**
  - **mailru**: Видео@Mail.Ru
  - **mailru:music**: Музыка@Mail.Ru
- - **mailru:​music:search**: Музыка@Mail.Ru
+ - **mailru:music:search**: Музыка@Mail.Ru
  - **MainStreaming**: MainStreaming Player
  - **MallTV**
  - **mangomolo:live**
@@ -730,8 +685,6 @@
  - **Mediasite**
  - **MediasiteCatalog**
  - **MediasiteNamedCatalog**
- - **MediaStream**
- - **MediaWorksNZVOD**
  - **Medici**
  - **megaphone.fm**: megaphone.fm embedded players
  - **megatvcom**: megatv.com videos
@@ -744,11 +697,10 @@
  - **mewatch**
  - **Mgoon**
  - **MiaoPai**
- - **MicrosoftEmbed**
  - **microsoftstream**: Microsoft Stream
  - **mildom**: Record ongoing live by specific user in Mildom
  - **mildom:clip**: Clip in Mildom
- - **mildom:​user:vod**: Download all VODs from specific user in Mildom
+ - **mildom:user:vod**: Download all VODs from specific user in Mildom
  - **mildom:vod**: VOD in Mildom
  - **minds**
  - **minds:channel**
@@ -766,7 +718,6 @@
  - **mixcloud:playlist**
  - **mixcloud:user**
  - **MLB**
- - **MLBArticle**
  - **MLBTV**: [<abbr title="netrc machine"><em>mlb</em></abbr>]
  - **MLBVideo**
  - **MLSSoccer**
@@ -779,13 +730,11 @@
  - **Mofosex**
  - **MofosexEmbed**
  - **Mojvideo**
- - **MonsterSirenHypergryphMusic**
  - **Morningstar**: morningstar.com
  - **Motherless**
  - **MotherlessGroup**
  - **Motorsport**: motorsport.com
  - **MotorTrend**
- - **MotorTrendOnDemand**
  - **MovieClips**
  - **MovieFap**
  - **Moviepilot**
@@ -836,7 +785,7 @@
  - **navernow**
  - **NBA**
  - **nba:watch**
- - **nba:​watch:collection**
+ - **nba:watch:collection**
  - **NBAChannel**
  - **NBAEmbed**
  - **NBAWatchEmbed**
@@ -847,10 +796,9 @@
  - **NBCSports**
  - **NBCSportsStream**
  - **NBCSportsVPlayer**
- - **NBCStations**
  - **ndr**: NDR.de - Norddeutscher Rundfunk
  - **ndr:embed**
- - **ndr:​embed:base**
+ - **ndr:embed:base**
  - **NDTV**
  - **Nebula**: [<abbr title="netrc machine"><em>watchnebula</em></abbr>]
  - **nebula:channel**: [<abbr title="netrc machine"><em>watchnebula</em></abbr>]
@@ -868,12 +816,10 @@
  - **NetPlusTVRecordings**: [<abbr title="netrc machine"><em>netplus</em></abbr>]
  - **Netverse**
  - **NetversePlaylist**
- - **NetverseSearch**: "netsearch:" prefix
  - **Netzkino**
  - **Newgrounds**
  - **Newgrounds:playlist**
  - **Newgrounds:user**
- - **NewsPicks**
  - **Newstube**
  - **Newsy**
  - **NextMedia**: 蘋果日報
@@ -883,10 +829,8 @@
  - **NexxEmbed**
  - **NFB**
  - **NFHSNetwork**
- - **nfl.com**
+ - **nfl.com**: (**Currently broken**)
- - **nfl.com:article**
+ - **nfl.com:article**: (**Currently broken**)
- - **nfl.com:​plus:episode**
- - **nfl.com:​plus:replay**
  - **NhkForSchoolBangumi**
  - **NhkForSchoolProgramList**
  - **NhkForSchoolSubject**: Portal page for each school subjects, like Japanese (kokugo, 国語) or math (sansuu/suugaku or 算数・数学)
@@ -899,13 +843,13 @@
  - **nickelodeonru**
  - **nicknight**
  - **niconico**: [<abbr title="netrc machine"><em>niconico</em></abbr>] ニコニコ動画
- - **niconico:history**: NicoNico user history or likes. Requires cookies.
+ - **niconico:history**: NicoNico user history. Requires cookies.
  - **niconico:playlist**
  - **niconico:series**
  - **niconico:tag**: NicoNico video tag URLs
  - **NiconicoUser**
  - **nicovideo:search**: Nico video search; "nicosearch:" prefix
- - **nicovideo:​search:date**: Nico video search, newest first; "nicosearchdate:" prefix
+ - **nicovideo:search:date**: Nico video search, newest first; "nicosearchdate:" prefix
  - **nicovideo:search_url**: Nico video search URLs
  - **Nintendo**
  - **Nitter**
@@ -913,12 +857,10 @@
  - **njoy:embed**
  - **NJPWWorld**: [<abbr title="netrc machine"><em>njpwworld</em></abbr>] 新日本プロレスワールド
  - **NobelPrize**
- - **NoicePodcast**
  - **NonkTube**
  - **NoodleMagazine**
  - **Noovo**
  - **Normalboots**
- - **NOSNLArticle**
  - **NosVideo**
  - **Nova**: TN.cz, Prásk.tv, Nova.cz, Novaplus.cz, FANDA.tv, Krásná.cz and Doma.cz
  - **NovaEmbed**
@@ -930,7 +872,7 @@
  - **npo**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **npo.nl:live**
  - **npo.nl:radio**
- - **npo.nl:​radio:fragment**
+ - **npo.nl:radio:fragment**
  - **Npr**
  - **NRK**
  - **NRKPlaylist**
@@ -949,20 +891,15 @@
  - **NYTimesArticle**
  - **NYTimesCooking**
  - **nzherald**
- - **NZOnScreen**
  - **NZZ**
  - **ocw.mit.edu**
  - **OdaTV**
  - **Odnoklassniki**
- - **OfTV**
- - **OfTVPlaylist**
  - **OktoberfestTV**
  - **OlympicsReplay**
  - **on24**: ON24
- - **OnDemandChinaEpisode**
  - **OnDemandKorea**
  - **OneFootball**
- - **OnePlacePodcast**
  - **onet.pl**
  - **onet.tv**
  - **onet.tv:channel**
@@ -976,7 +913,7 @@
  - **openrec:capture**
  - **openrec:movie**
  - **OraTV**
- - **orf:​fm4:story**: fm4.orf.at stories
+ - **orf:fm4:story**: fm4.orf.at stories
  - **orf:iptv**: iptv.ORF.at
  - **orf:radio**
  - **orf:tvthek**: ORF TVthek
@@ -1024,7 +961,7 @@
  - **Pinterest**
  - **PinterestCollection**
  - **pixiv:sketch**
- - **pixiv:​sketch:user**
+ - **pixiv:sketch:user**
  - **Pladform**
  - **PlanetMarathi**
  - **Platzi**: [<abbr title="netrc machine"><em>platzi</em></abbr>]
@@ -1042,8 +979,6 @@
  - **pluralsight**: [<abbr title="netrc machine"><em>pluralsight</em></abbr>]
  - **pluralsight:course**
  - **PlutoTV**
- - **PodbayFM**
- - **PodbayFMChannel**
  - **Podchaser**
  - **podomatic**
  - **Pokemon**
@@ -1052,13 +987,11 @@
  - **PokerGoCollection**: [<abbr title="netrc machine"><em>pokergo</em></abbr>]
  - **PolsatGo**
  - **PolskieRadio**
- - **polskieradio:audition**
- - **polskieradio:category**
  - **polskieradio:kierowcow**
- - **polskieradio:legacy**
  - **polskieradio:player**
  - **polskieradio:podcast**
- - **polskieradio:​podcast:list**
+ - **polskieradio:podcast:list**
+ - **PolskieRadioCategory**
  - **Popcorntimes**
  - **PopcornTV**
  - **PornCom**
@@ -1074,11 +1007,7 @@
  - **Pornotube**
  - **PornoVoisines**
  - **PornoXO**
- - **PornTop**
  - **PornTube**
- - **Pr0gramm**
- - **Pr0grammStatic**
- - **PrankCast**
  - **PremiershipRugby**
  - **PressTV**
  - **ProjectVeritas**
@@ -1092,7 +1021,6 @@
  - **puhutv:serie**
  - **Puls4**
  - **Pyvideo**
- - **QingTing**
  - **qqmusic**: QQ音乐
  - **qqmusic:album**: QQ音乐 - 专辑
  - **qqmusic:playlist**: QQ音乐 - 歌单
@@ -1129,8 +1057,6 @@
  - **RaiSudtirol**
  - **RayWenderlich**
  - **RayWenderlichCourse**
- - **RbgTum**
- - **RbgTumCourse**
  - **RBMARadio**
  - **RCS**
  - **RCSEmbeds**
@@ -1165,7 +1091,6 @@
  - **RoosterTeethSeries**: [<abbr title="netrc machine"><em>roosterteeth</em></abbr>]
  - **RottenTomatoes**
  - **Rozhlas**
- - **RozhlasVltava**
  - **RTBF**: [<abbr title="netrc machine"><em>rtbf</em></abbr>]
  - **RTDocumentry**
  - **RTDocumentryPlaylist**
@@ -1176,7 +1101,7 @@
  - **rtl.nl**: rtl.nl and rtlxl.nl
  - **rtl2**
  - **rtl2:you**
- - **rtl2:​you:series**
+ - **rtl2:you:series**
  - **RTLLuLive**
  - **RTLLuRadio**
  - **RTNews**
@@ -1193,7 +1118,6 @@
  - **rtvslo.si**
  - **RUHD**
  - **Rule34Video**
- - **Rumble**
  - **RumbleChannel**
  - **RumbleEmbed**
  - **Ruptly**
@@ -1219,16 +1143,13 @@
  - **SaltTVLive**: [<abbr title="netrc machine"><em>salttv</em></abbr>]
  - **SaltTVRecordings**: [<abbr title="netrc machine"><em>salttv</em></abbr>]
  - **SampleFocus**
- - **Sangiin**: 参議院インターネット審議中継 (archive)
  - **Sapo**: SAPO Vídeos
  - **savefrom.net**
  - **SBS**: sbs.com.au
  - **schooltv**
  - **ScienceChannel**
  - **screen.yahoo:search**: Yahoo screen search; "yvsearch:" prefix
- - **Screen9**
  - **Screencast**
- - **Screencastify**
  - **ScreencastOMatic**
  - **ScrippsNetworks**
  - **scrippsnetworks:watch**
@@ -1249,10 +1170,6 @@
  - **ShareVideosEmbed**
  - **ShemarooMe**
  - **ShowRoomLive**
- - **ShugiinItvLive**: 衆議院インターネット審議中継
- - **ShugiinItvLiveRoom**: 衆議院インターネット審議中継 (中継)
- - **ShugiinItvVod**: 衆議院インターネット審議中継 (ビデオライブラリ)
- - **SibnetEmbed**
  - **simplecast**
  - **simplecast:episode**
  - **simplecast:podcast**
@@ -1260,9 +1177,10 @@
  - **Skeb**
  - **sky.it**
  - **sky:news**
- - **sky:​news:story**
+ - **sky:news:story**
  - **sky:sports**
- - **sky:​sports:news**
+ - **sky:sports:news**
+ - **skyacademy.it**
  - **SkylineWebcams**
  - **skynewsarabia:article**
  - **skynewsarabia:video**
@@ -1270,7 +1188,6 @@
  - **Slideshare**
  - **SlidesLive**
  - **Slutload**
- - **Smotrim**
  - **Snotr**
  - **Sohu**
  - **SonyLIV**: [<abbr title="netrc machine"><em>sonyliv</em></abbr>]
@@ -1282,7 +1199,6 @@
  - **soundcloud:set**: [<abbr title="netrc machine"><em>soundcloud</em></abbr>]
  - **soundcloud:trackstation**: [<abbr title="netrc machine"><em>soundcloud</em></abbr>]
  - **soundcloud:user**: [<abbr title="netrc machine"><em>soundcloud</em></abbr>]
- - **soundcloud:​user:permalink**: [<abbr title="netrc machine"><em>soundcloud</em></abbr>]
  - **SoundcloudEmbed**
  - **soundgasm**
  - **soundgasm:profile**
@@ -1301,8 +1217,8 @@
  - **Sport5**
  - **SportBox**
  - **SportDeutschland**
- - **spotify**: Spotify episodes (**Currently broken**)
+ - **spotify**: Spotify episodes
- - **spotify:show**: Spotify shows (**Currently broken**)
+ - **spotify:show**: Spotify shows
  - **Spreaker**
  - **SpreakerPage**
  - **SpreakerShow**
@@ -1339,7 +1255,6 @@
  - **SVTPage**
  - **SVTPlay**: SVT Play and Öppet arkiv
  - **SVTSeries**
- - **SwearnetEpisode**
  - **SWRMediathek**
  - **Syfy**
  - **SYVDK**
@@ -1352,7 +1267,7 @@
  - **Teachable**: [<abbr title="netrc machine"><em>teachable</em></abbr>]
  - **TeachableCourse**: [<abbr title="netrc machine"><em>teachable</em></abbr>]
  - **teachertube**: teachertube.com videos
- - **teachertube:​user:collection**: teachertube.com user and collection videos
+ - **teachertube:user:collection**: teachertube.com user and collection videos
  - **TeachingChannel**
  - **Teamcoco**
  - **TeamTreeHouse**: [<abbr title="netrc machine"><em>teamtreehouse</em></abbr>]
@@ -1394,17 +1309,13 @@
  - **ThisAmericanLife**
  - **ThisAV**
  - **ThisOldHouse**
- - **ThisVid**
- - **ThisVidMember**
- - **ThisVidPlaylist**
  - **ThreeSpeak**
  - **ThreeSpeakUser**
  - **TikTok**
- - **tiktok:effect**: (**Currently broken**)
+ - **tiktok:effect**
- - **tiktok:live**
+ - **tiktok:sound**
- - **tiktok:sound**: (**Currently broken**)
+ - **tiktok:tag**
- - **tiktok:tag**: (**Currently broken**)
+ - **tiktok:user**
- - **tiktok:user**: (**Currently broken**)
  - **tinypic**: tinypic.com videos
  - **TLC**
  - **TMZ**
@@ -1414,22 +1325,17 @@
  - **toggo**
  - **Tokentube**
  - **Tokentube:channel**
- - **tokfm:audition**
- - **tokfm:podcast**
  - **ToonGoggles**
  - **tou.tv**: [<abbr title="netrc machine"><em>toutv</em></abbr>]
  - **Toypics**: Toypics video
  - **ToypicsUser**: Toypics user profile
  - **TrailerAddict**: (**Currently broken**)
  - **TravelChannel**
- - **Triller**: [<abbr title="netrc machine"><em>triller</em></abbr>]
- - **TrillerUser**: [<abbr title="netrc machine"><em>triller</em></abbr>]
  - **Trilulilu**
  - **Trovo**
  - **TrovoChannelClip**: All Clips of a trovo.live channel; "trovoclip:" prefix
  - **TrovoChannelVod**: All VODs of a trovo.live channel; "trovovod:" prefix
  - **TrovoVod**
- - **TrtCocukVideo**
  - **TrueID**
  - **TruNews**
  - **Truth**
@@ -1480,9 +1386,8 @@
  - **tvopengr:watch**: tvopen.gr (and ethnos.gr) videos
  - **tvp**: Telewizja Polska
  - **tvp:embed**: Telewizja Polska
+ - **tvp:series**
  - **tvp:stream**
- - **tvp:vod**
- - **tvp:​vod:series**
  - **TVPlayer**
  - **TVPlayHome**
  - **Tweakers**
@@ -1501,8 +1406,6 @@
  - **twitter:broadcast**
  - **twitter:card**
  - **twitter:shortener**
- - **twitter:spaces**
- - **Txxx**
  - **udemy**: [<abbr title="netrc machine"><em>udemy</em></abbr>]
  - **udemy:course**: [<abbr title="netrc machine"><em>udemy</em></abbr>]
  - **UDNEmbed**: 聯合影音
@@ -1513,7 +1416,6 @@
  - **umg:de**: Universal Music Deutschland
  - **Unistra**
  - **Unity**
- - **UnscriptedNewsVideo**
  - **uol.com.br**
  - **uplynk**
  - **uplynk:preplay**
@@ -1531,7 +1433,6 @@
  - **VeeHD**
  - **Veo**
  - **Veoh**
- - **veoh:user**
  - **Vesti**: Вести.Ru
  - **Vevo**
  - **VevoPlaylist**
@@ -1551,11 +1452,6 @@
  - **video.sky.it:live**
  - **VideoDetective**
  - **videofy.me**
- - **VideoKen**
- - **VideoKenCategory**
- - **VideoKenPlayer**
- - **VideoKenPlaylist**
- - **VideoKenTopic**
  - **videomore**
  - **videomore:season**
  - **videomore:video**
@@ -1564,6 +1460,8 @@
  - **VidioLive**: [<abbr title="netrc machine"><em>vidio</em></abbr>]
  - **VidioPremier**: [<abbr title="netrc machine"><em>vidio</em></abbr>]
  - **VidLii**
+ - **vier**: [<abbr title="netrc machine"><em>vier</em></abbr>] vier.be and vijf.be
+ - **vier:videos**
  - **viewlift**
  - **viewlift:embed**
  - **Viidea**
@@ -1575,7 +1473,6 @@
  - **vimeo:group**: [<abbr title="netrc machine"><em>vimeo</em></abbr>]
  - **vimeo:likes**: [<abbr title="netrc machine"><em>vimeo</em></abbr>] Vimeo user likes
  - **vimeo:ondemand**: [<abbr title="netrc machine"><em>vimeo</em></abbr>]
- - **vimeo:pro**: [<abbr title="netrc machine"><em>vimeo</em></abbr>]
  - **vimeo:review**: [<abbr title="netrc machine"><em>vimeo</em></abbr>] Review pages on vimeo
  - **vimeo:user**: [<abbr title="netrc machine"><em>vimeo</em></abbr>]
  - **vimeo:watchlater**: [<abbr title="netrc machine"><em>vimeo</em></abbr>] Vimeo watch later list, ":vimeowatchlater" keyword (requires authentication)
@@ -1590,27 +1487,25 @@
  - **Viu**
  - **viu:ott**: [<abbr title="netrc machine"><em>viu</em></abbr>]
  - **viu:playlist**
- - **ViuOTTIndonesia**
  - **Vivo**: vivo.sx
  - **vk**: [<abbr title="netrc machine"><em>vk</em></abbr>] VK
  - **vk:uservideos**: [<abbr title="netrc machine"><em>vk</em></abbr>] VK - User's Videos
  - **vk:wallpost**: [<abbr title="netrc machine"><em>vk</em></abbr>]
+ - **vlive**: [<abbr title="netrc machine"><em>vlive</em></abbr>]
+ - **vlive:channel**: [<abbr title="netrc machine"><em>vlive</em></abbr>]
+ - **vlive:post**: [<abbr title="netrc machine"><em>vlive</em></abbr>]
  - **vm.tiktok**
- - **Vocaroo**
  - **Vodlocker**
  - **VODPl**
  - **VODPlatform**
  - **VoiceRepublic**
  - **voicy**
  - **voicy:channel**
- - **VolejTV**
  - **Voot**
  - **VootSeries**
  - **VoxMedia**
  - **VoxMediaVolume**
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
- - **vqq:series**
- - **vqq:video**
  - **Vrak**
  - **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
  - **VrtNU**: [<abbr title="netrc machine"><em>vrtnu</em></abbr>] VrtNU.be
@@ -1645,9 +1540,7 @@
  - **wdr:mobile**: (**Currently broken**)
  - **WDRElefant**
  - **WDRPage**
- - **web.archive:vlive**: web.archive.org saved vlive videos
  - **web.archive:youtube**: web.archive.org saved youtube videos, "ytarchive:" prefix
- - **Webcamerapl**
  - **Webcaster**
  - **WebcasterFeed**
  - **WebOfStories**
@@ -1661,30 +1554,25 @@
  - **wikimedia.org**
  - **Willow**
  - **WimTV**
- - **WinSportsVideo**
  - **Wistia**
- - **WistiaChannel**
  - **WistiaPlaylist**
  - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
- - **wordpress:mb.miniAudioPlayer**
- - **wordpress:playlist**
  - **WorldStarHipHop**
  - **wppilot**
  - **wppilot:channels**
- - **WrestleUniversePPV**
- - **WrestleUniverseVOD**
  - **WSJ**: Wall Street Journal
  - **WSJArticle**
  - **WWE**
- - **wyborcza:video**
- - **WyborczaPodcast**
- - **Xanimu**
  - **XBef**
  - **XboxClips**
  - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
  - **XHamster**
  - **XHamsterEmbed**
  - **XHamsterUser**
+ - **xiami:album**: 虾米音乐 - 专辑
+ - **xiami:artist**: 虾米音乐 - 歌手
+ - **xiami:collection**: 虾米音乐 - 精选集
+ - **xiami:song**: 虾米音乐
  - **ximalaya**: 喜马拉雅FM
  - **ximalaya:album**: 喜马拉雅FM 专辑
  - **xinpianchang**: xinpianchang.com
@@ -1698,21 +1586,19 @@
  - **XXXYMovies**
  - **Yahoo**: Yahoo screen and movies
  - **yahoo:gyao**
- - **yahoo:​gyao:player**
+ - **yahoo:gyao:player**
  - **yahoo:japannews**: Yahoo! Japan News
  - **YandexDisk**
  - **yandexmusic:album**: Яндекс.Музыка - Альбом
- - **yandexmusic:​artist:albums**: Яндекс.Музыка - Артист - Альбомы
+ - **yandexmusic:artist:albums**: Яндекс.Музыка - Артист - Альбомы
- - **yandexmusic:​artist:tracks**: Яндекс.Музыка - Артист - Треки
+ - **yandexmusic:artist:tracks**: Яндекс.Музыка - Артист - Треки
  - **yandexmusic:playlist**: Яндекс.Музыка - Плейлист
  - **yandexmusic:track**: Яндекс.Музыка - Трек
  - **YandexVideo**
  - **YandexVideoPreview**
  - **YapFiles**
- - **Yappy**
  - **YesJapan**
  - **yinyuetai:video**: 音悦Tai
- - **YleAreena**
  - **Ynet**
  - **YouJizz**
  - **youku**: 优酷
@@ -1727,14 +1613,13 @@
  - **youtube:clip**
  - **youtube:favorites**: YouTube liked videos; ":ytfav" keyword (requires cookies)
  - **youtube:history**: Youtube watch history; ":ythis" keyword (requires cookies)
- - **youtube:​music:search_url**: YouTube music search URLs with selectable sections, e.g. #songs
+ - **youtube:music:search_url**: YouTube music search URLs with selectable sections, e.g. #songs
  - **youtube:notif**: YouTube notifications; ":ytnotif" keyword (requires cookies)
  - **youtube:playlist**: YouTube playlists
  - **youtube:recommended**: YouTube recommended videos; ":ytrec" keyword
  - **youtube:search**: YouTube search; "ytsearch:" prefix
- - **youtube:​search:date**: YouTube search, newest videos first; "ytsearchdate:" prefix
+ - **youtube:search:date**: YouTube search, newest videos first; "ytsearchdate:" prefix
  - **youtube:search_url**: YouTube search URLs with sorting and filter support
- - **youtube:​shorts:pivot:audio**: YouTube Shorts audio pivot (Shorts using audio of a given video)
  - **youtube:stories**: YouTube channel stories; "ytstories:" prefix
  - **youtube:subscriptions**: YouTube subscriptions feed; ":ytsubs" keyword (requires cookies)
  - **youtube:tab**: YouTube Tabs
@@ -1751,7 +1636,6 @@
  - **ZDFChannel**
  - **Zee5**: [<abbr title="netrc machine"><em>zee5</em></abbr>]
  - **zee5:series**
- - **ZeeNews**
  - **ZenYandex**
  - **ZenYandexChannel**
  - **Zhihu**

test/helper.py

@@ -222,10 +222,6 @@ def sanitize_got_info_dict(got_dict):
     if test_info_dict.get('display_id') == test_info_dict.get('id'):
         test_info_dict.pop('display_id')
 
-    # Check url for flat entries
-    if got_dict.get('_type', 'video') != 'video' and got_dict.get('url'):
-        test_info_dict['url'] = got_dict['url']
-
     return test_info_dict
 
 
@@ -239,9 +235,8 @@ def expect_info_dict(self, got_dict, expected_dict):
         for key in mandatory_fields:
             self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
     # Check for mandatory fields that are automatically set by YoutubeDL
-    if got_dict.get('_type', 'video') == 'video':
+    for key in ['webpage_url', 'extractor', 'extractor_key']:
-        for key in ['webpage_url', 'extractor', 'extractor_key']:
+        self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
-            self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
 
     test_info_dict = sanitize_got_info_dict(got_dict)
 
@@ -254,16 +249,19 @@ def expect_info_dict(self, got_dict, expected_dict):
                 return v.__name__
             else:
                 return repr(v)
-        info_dict_str = ''.join(
+        info_dict_str = ''
-            f'    {_repr(k)}: {_repr(v)},\n'
+        if len(missing_keys) != len(expected_dict):
-            for k, v in test_info_dict.items() if k not in missing_keys)
+            info_dict_str += ''.join(
-        if info_dict_str:
+                f'    {_repr(k)}: {_repr(v)},\n'
-            info_dict_str += '\n'
+                for k, v in test_info_dict.items() if k not in missing_keys)
+
+            if info_dict_str:
+                info_dict_str += '\n'
         info_dict_str += ''.join(
             f'    {_repr(k)}: {_repr(test_info_dict[k])},\n'
             for k in missing_keys)
-        info_dict_str = '\n\'info_dict\': {\n' + info_dict_str + '},\n'
+        write_string(
-        write_string(info_dict_str.replace('\n', '\n        '), out=sys.stderr)
+            '\n\'info_dict\': {\n' + info_dict_str + '},\n', out=sys.stderr)
         self.assertFalse(
             missing_keys,
             'Missing keys in test definition: %s' % (

test/parameters.json

@@ -44,6 +44,5 @@
     "writesubtitles": false,
     "allsubtitles": false,
     "listsubtitles": false,
-    "fixup": "never",
+    "fixup": "never"
-    "allow_playlist_files": false
 }

test/test_InfoExtractor.py

@@ -41,9 +41,7 @@ class InfoExtractorTestRequestHandler(http.server.BaseHTTPRequestHandler):
 
 
 class DummyIE(InfoExtractor):
-    def _sort_formats(self, formats, field_preference=[]):
+    pass
-        self._downloader.sort_formats(
-            {'formats': formats, '_format_sort_fields': field_preference})
 
 
 class TestInfoExtractor(unittest.TestCase):
@@ -69,7 +67,6 @@ class TestInfoExtractor(unittest.TestCase):
             <meta name="og:test1" content='foo > < bar'/>
             <meta name="og:test2" content="foo >//< bar"/>
             <meta property=og-test3 content='Ill-formatted opengraph'/>
-            <meta property=og:test4 content=unquoted-value/>
             '''
         self.assertEqual(ie._og_search_title(html), 'Foo')
         self.assertEqual(ie._og_search_description(html), 'Some video\'s description ')
@@ -82,7 +79,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(ie._og_search_property(('test0', 'test1'), html), 'foo > < bar')
         self.assertRaises(RegexNotFoundError, ie._og_search_property, 'test0', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._og_search_property, ('test0', 'test00'), html, None, fatal=True)
-        self.assertEqual(ie._og_search_property('test4', html), 'unquoted-value')
 
     def test_html_search_meta(self):
         ie = self.ie
@@ -1571,292 +1567,6 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     ]
                 },
             ),
-            (
-                'ec-3_test',
-                'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                [{
-                    'format_id': 'audio_deu_1-224',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'isma',
-                    'tbr': 224,
-                    'asr': 48000,
-                    'vcodec': 'none',
-                    'acodec': 'EC-3',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'audio',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 0,
-                        'height': 0,
-                        'fourcc': 'EC-3',
-                        'language': 'deu',
-                        'codec_private_data': '00063F000000AF87FBA7022DFB42A4D405CD93843BDD0700200F00',
-                        'sampling_rate': 48000,
-                        'channels': 6,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'audio_ext': 'isma',
-                    'video_ext': 'none',
-                    'abr': 224,
-                }, {
-                    'format_id': 'audio_deu-127',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'isma',
-                    'tbr': 127,
-                    'asr': 48000,
-                    'vcodec': 'none',
-                    'acodec': 'AACL',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'audio',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 0,
-                        'height': 0,
-                        'fourcc': 'AACL',
-                        'language': 'deu',
-                        'codec_private_data': '1190',
-                        'sampling_rate': 48000,
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'audio_ext': 'isma',
-                    'video_ext': 'none',
-                    'abr': 127,
-                }, {
-                    'format_id': 'video_deu-23',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 384,
-                    'height': 216,
-                    'tbr': 23,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 384,
-                        'height': 216,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '000000016742C00CDB06077E5C05A808080A00000300020000030009C0C02EE0177CC6300F142AE00000000168CA8DC8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 23,
-                }, {
-                    'format_id': 'video_deu-403',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 400,
-                    'height': 224,
-                    'tbr': 403,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 400,
-                        'height': 224,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4014E98323B602D4040405000003000100000300320F1429380000000168EAECF2',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 403,
-                }, {
-                    'format_id': 'video_deu-680',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 640,
-                    'height': 360,
-                    'tbr': 680,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 640,
-                        'height': 360,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 680,
-                }, {
-                    'format_id': 'video_deu-1253',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 640,
-                    'height': 360,
-                    'tbr': 1253,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 640,
-                        'height': 360,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 1253,
-                }, {
-                    'format_id': 'video_deu-2121',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 768,
-                    'height': 432,
-                    'tbr': 2121,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 768,
-                        'height': 432,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D401EECA0601BD80B50101014000003000400000300C83C58B6580000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 2121,
-                }, {
-                    'format_id': 'video_deu-3275',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1280,
-                    'height': 720,
-                    'tbr': 3275,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 1280,
-                        'height': 720,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4020ECA02802DD80B501010140000003004000000C83C60C65800000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 3275,
-                }, {
-                    'format_id': 'video_deu-5300',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1920,
-                    'height': 1080,
-                    'tbr': 5300,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 1920,
-                        'height': 1080,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 5300,
-                }, {
-                    'format_id': 'video_deu-8079',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1920,
-                    'height': 1080,
-                    'tbr': 8079,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    '_download_params':
-                    {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 1920,
-                        'height': 1080,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                    'video_ext': 'ismv',
-                    'audio_ext': 'none',
-                    'vbr': 8079,
-                }],
-                {},
-            ),
         ]
 
         for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:

test/test_YoutubeDL.py

@@ -68,7 +68,8 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'mp4', 'height': 460, 'url': TEST_URL},
         ]
         info_dict = _make_result(formats)
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'webm')
@@ -81,7 +82,8 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'mp4', 'height': 1080, 'url': TEST_URL},
         ]
         info_dict['formats'] = formats
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'mp4')
@@ -95,7 +97,8 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'flv', 'height': 720, 'url': TEST_URL},
         ]
         info_dict['formats'] = formats
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'mp4')
@@ -107,14 +110,15 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'webm', 'height': 720, 'url': TEST_URL},
         ]
         info_dict['formats'] = formats
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'webm')
 
     def test_format_selection(self):
         formats = [
-            {'format_id': '35', 'ext': 'mp4', 'preference': 0, 'url': TEST_URL},
+            {'format_id': '35', 'ext': 'mp4', 'preference': 1, 'url': TEST_URL},
             {'format_id': 'example-with-dashes', 'ext': 'webm', 'preference': 1, 'url': TEST_URL},
             {'format_id': '45', 'ext': 'webm', 'preference': 2, 'url': TEST_URL},
             {'format_id': '47', 'ext': 'webm', 'preference': 3, 'url': TEST_URL},
@@ -182,19 +186,22 @@ class TestFormatSelection(unittest.TestCase):
 
         info_dict = _make_result(formats)
         ydl = YDL({'format': 'best'})
-        ydl.sort_formats(info_dict)
+        ie = YoutubeIE(ydl)
+        ie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'aac-64')
 
         ydl = YDL({'format': 'mp3'})
-        ydl.sort_formats(info_dict)
+        ie = YoutubeIE(ydl)
+        ie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'mp3-64')
 
         ydl = YDL({'prefer_free_formats': True})
-        ydl.sort_formats(info_dict)
+        ie = YoutubeIE(ydl)
+        ie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'ogg-64')
@@ -339,7 +346,8 @@ class TestFormatSelection(unittest.TestCase):
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': 'bestvideo+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], '248+172')
@@ -347,35 +355,40 @@ class TestFormatSelection(unittest.TestCase):
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': 'bestvideo[height>=999999]+bestaudio/best'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], '38')
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': 'bestvideo/best,bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['137', '141'])
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': '(bestvideo[ext=mp4],bestvideo[ext=webm])+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['137+141', '248+141'])
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': '(bestvideo[ext=mp4],bestvideo[ext=webm])[height<=720]+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['136+141', '247+141'])
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': '(bestvideo[ext=none]/bestvideo[ext=webm])+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['248+141'])
@@ -383,14 +396,16 @@ class TestFormatSelection(unittest.TestCase):
         for f1, f2 in zip(formats_order, formats_order[1:]):
             info_dict = _make_result([f1, f2], extractor='youtube')
             ydl = YDL({'format': 'best/bestvideo'})
-            ydl.sort_formats(info_dict)
+            yie = YoutubeIE(ydl)
+            yie._sort_formats(info_dict['formats'])
             ydl.process_ie_result(info_dict)
             downloaded = ydl.downloaded_info_dicts[0]
             self.assertEqual(downloaded['format_id'], f1['format_id'])
 
             info_dict = _make_result([f2, f1], extractor='youtube')
             ydl = YDL({'format': 'best/bestvideo'})
-            ydl.sort_formats(info_dict)
+            yie = YoutubeIE(ydl)
+            yie._sort_formats(info_dict['formats'])
             ydl.process_ie_result(info_dict)
             downloaded = ydl.downloaded_info_dicts[0]
             self.assertEqual(downloaded['format_id'], f1['format_id'])
@@ -465,7 +480,7 @@ class TestFormatSelection(unittest.TestCase):
         for f in formats:
             f['url'] = 'http://_/'
             f['ext'] = 'unknown'
-        info_dict = _make_result(formats, _format_sort_fields=('id', ))
+        info_dict = _make_result(formats)
 
         ydl = YDL({'format': 'best[filesize<3000]'})
         ydl.process_ie_result(info_dict)
@@ -647,17 +662,13 @@ class TestYoutubeDL(unittest.TestCase):
         'playlist_autonumber': 2,
         '__last_playlist_index': 100,
         'n_entries': 10,
-        'formats': [
+        'formats': [{'id': 'id 1'}, {'id': 'id 2'}, {'id': 'id 3'}]
-            {'id': 'id 1', 'height': 1080, 'width': 1920},
-            {'id': 'id 2', 'height': 720},
-            {'id': 'id 3'}
-        ]
     }
 
     def test_prepare_outtmpl_and_filename(self):
         def test(tmpl, expected, *, info=None, **params):
             params['outtmpl'] = tmpl
-            ydl = FakeYDL(params)
+            ydl = YoutubeDL(params)
             ydl._num_downloads = 1
             self.assertEqual(ydl.validate_outtmpl(tmpl), None)
 
@@ -718,7 +729,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertTrue(isinstance(YoutubeDL.validate_outtmpl('%(title)'), ValueError))
         test('%(invalid@tmpl|def)s', 'none', outtmpl_na_placeholder='none')
         test('%(..)s', 'NA')
-        test('%(formats.{id)s', 'NA')
 
         # Entire info_dict
         def expect_same_infodict(out):
@@ -803,12 +813,6 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(formats.:2:-1)r', repr(FORMATS[:2:-1]))
         test('%(formats.0.id.-1+id)f', '1235.000000')
         test('%(formats.0.id.-1+formats.1.id.-1)d', '3')
-        out = json.dumps([{'id': f['id'], 'height.:2': str(f['height'])[:2]}
-                          if 'height' in f else {'id': f['id']}
-                          for f in FORMATS])
-        test('%(formats.:.{id,height.:2})j', (out, sanitize(out)))
-        test('%(formats.:.{id,height}.id)l', ', '.join(f['id'] for f in FORMATS))
-        test('%(.{id,title})j', ('{"id": "1234"}', '{＂id＂： ＂1234＂}'))
 
         # Alternates
         test('%(title,id)s', '1234')

test/test_aes.py

@@ -11,6 +11,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import base64
 
 from yt_dlp.aes import (
+    BLOCK_SIZE_BYTES,
     aes_cbc_decrypt,
     aes_cbc_decrypt_bytes,
     aes_cbc_encrypt,
@@ -26,7 +27,7 @@ from yt_dlp.aes import (
     key_expansion,
     pad_block,
 )
-from yt_dlp.dependencies import Cryptodome
+from yt_dlp.dependencies import Cryptodome_AES
 from yt_dlp.utils import bytes_to_intlist, intlist_to_bytes
 
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'
@@ -48,7 +49,7 @@ class TestAES(unittest.TestCase):
         data = b'\x97\x92+\xe5\x0b\xc3\x18\x91ky9m&\xb3\xb5@\xe6\x27\xc2\x96.\xc8u\x88\xab9-[\x9e|\xf1\xcd'
         decrypted = intlist_to_bytes(aes_cbc_decrypt(bytes_to_intlist(data), self.key, self.iv))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
-        if Cryptodome:
+        if Cryptodome_AES:
             decrypted = aes_cbc_decrypt_bytes(data, intlist_to_bytes(self.key), intlist_to_bytes(self.iv))
             self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
@@ -78,7 +79,7 @@ class TestAES(unittest.TestCase):
         decrypted = intlist_to_bytes(aes_gcm_decrypt_and_verify(
             bytes_to_intlist(data), self.key, bytes_to_intlist(authentication_tag), self.iv[:12]))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
-        if Cryptodome:
+        if Cryptodome_AES:
             decrypted = aes_gcm_decrypt_and_verify_bytes(
                 data, intlist_to_bytes(self.key), authentication_tag, intlist_to_bytes(self.iv[:12]))
             self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
@@ -102,7 +103,8 @@ class TestAES(unittest.TestCase):
 
     def test_ecb_encrypt(self):
         data = bytes_to_intlist(self.secret_msg)
-        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, self.key))
+        data += [0x08] * (BLOCK_SIZE_BYTES - len(data) % BLOCK_SIZE_BYTES)
+        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, self.key, self.iv))
         self.assertEqual(
             encrypted,
             b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')

test/test_age_restriction.py

@@ -10,7 +10,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import is_download_test, try_rm
 from yt_dlp import YoutubeDL
-from yt_dlp.utils import DownloadError
 
 
 def _download_restricted(url, filename, age):
@@ -26,14 +25,10 @@ def _download_restricted(url, filename, age):
     ydl.add_default_info_extractors()
     json_filename = os.path.splitext(filename)[0] + '.info.json'
     try_rm(json_filename)
-    try:
+    ydl.download([url])
-        ydl.download([url])
+    res = os.path.exists(json_filename)
-    except DownloadError:
+    try_rm(json_filename)
-        pass
+    return res
-    else:
-        return os.path.exists(json_filename)
-    finally:
-        try_rm(json_filename)
 
 
 @is_download_test
@@ -43,12 +38,12 @@ class TestAgeRestriction(unittest.TestCase):
         self.assertFalse(_download_restricted(url, filename, age))
 
     def test_youtube(self):
-        self._assert_restricted('HtVdAasjOgU', 'HtVdAasjOgU.mp4', 10)
+        self._assert_restricted('07FYdnEawAQ', '07FYdnEawAQ.mp4', 10)
 
     def test_youporn(self):
         self._assert_restricted(
-            'https://www.youporn.com/watch/16715086/sex-ed-in-detention-18-asmr/',
+            'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
-            '16715086.mp4', 2, old_age=25)
+            '505835.mp4', 2, old_age=25)
 
 
 if __name__ == '__main__':

test/test_compat.py

@@ -28,11 +28,7 @@ class TestCompat(unittest.TestCase):
         with self.assertWarns(DeprecationWarning):
             compat.WINDOWS_VT_MODE
 
-        # TODO: Test submodule
+        compat.asyncio.events  # Must not raise error
-        # compat.asyncio.events  # Must not raise error
-
-        with self.assertWarns(DeprecationWarning):
-            compat.compat_pycrypto_AES  # Must not raise error
 
     def test_compat_expanduser(self):
         old_home = os.environ.get('HOME')

test/test_config.py

@@ -1,227 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-import unittest
-import unittest.mock
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import contextlib
-import itertools
-from pathlib import Path
-
-from yt_dlp.compat import compat_expanduser
-from yt_dlp.options import create_parser, parseOpts
-from yt_dlp.utils import Config, get_executable_path
-
-ENVIRON_DEFAULTS = {
-    'HOME': None,
-    'XDG_CONFIG_HOME': '/_xdg_config_home/',
-    'USERPROFILE': 'C:/Users/testing/',
-    'APPDATA': 'C:/Users/testing/AppData/Roaming/',
-    'HOMEDRIVE': 'C:/',
-    'HOMEPATH': 'Users/testing/',
-}
-
-
-@contextlib.contextmanager
-def set_environ(**kwargs):
-    saved_environ = os.environ.copy()
-
-    for name, value in {**ENVIRON_DEFAULTS, **kwargs}.items():
-        if value is None:
-            os.environ.pop(name, None)
-        else:
-            os.environ[name] = value
-
-    yield
-
-    os.environ.clear()
-    os.environ.update(saved_environ)
-
-
-def _generate_expected_groups():
-    xdg_config_home = os.getenv('XDG_CONFIG_HOME') or compat_expanduser('~/.config')
-    appdata_dir = os.getenv('appdata')
-    home_dir = compat_expanduser('~')
-    return {
-        'Portable': [
-            Path(get_executable_path(), 'yt-dlp.conf'),
-        ],
-        'Home': [
-            Path('yt-dlp.conf'),
-        ],
-        'User': [
-            Path(xdg_config_home, 'yt-dlp.conf'),
-            Path(xdg_config_home, 'yt-dlp', 'config'),
-            Path(xdg_config_home, 'yt-dlp', 'config.txt'),
-            *((
-                Path(appdata_dir, 'yt-dlp.conf'),
-                Path(appdata_dir, 'yt-dlp', 'config'),
-                Path(appdata_dir, 'yt-dlp', 'config.txt'),
-            ) if appdata_dir else ()),
-            Path(home_dir, 'yt-dlp.conf'),
-            Path(home_dir, 'yt-dlp.conf.txt'),
-            Path(home_dir, '.yt-dlp', 'config'),
-            Path(home_dir, '.yt-dlp', 'config.txt'),
-        ],
-        'System': [
-            Path('/etc/yt-dlp.conf'),
-            Path('/etc/yt-dlp/config'),
-            Path('/etc/yt-dlp/config.txt'),
-        ]
-    }
-
-
-class TestConfig(unittest.TestCase):
-    maxDiff = None
-
-    @set_environ()
-    def test_config__ENVIRON_DEFAULTS_sanity(self):
-        expected = make_expected()
-        self.assertCountEqual(
-            set(expected), expected,
-            'ENVIRON_DEFAULTS produces non unique names')
-
-    def test_config_all_environ_values(self):
-        for name, value in ENVIRON_DEFAULTS.items():
-            for new_value in (None, '', '.', value or '/some/dir'):
-                with set_environ(**{name: new_value}):
-                    self._simple_grouping_test()
-
-    def test_config_default_expected_locations(self):
-        files, _ = self._simple_config_test()
-        self.assertEqual(
-            files, make_expected(),
-            'Not all expected locations have been checked')
-
-    def test_config_default_grouping(self):
-        self._simple_grouping_test()
-
-    def _simple_grouping_test(self):
-        expected_groups = make_expected_groups()
-        for name, group in expected_groups.items():
-            for index, existing_path in enumerate(group):
-                result, opts = self._simple_config_test(existing_path)
-                expected = expected_from_expected_groups(expected_groups, existing_path)
-                self.assertEqual(
-                    result, expected,
-                    f'The checked locations do not match the expected ({name}, {index})')
-                self.assertEqual(
-                    opts.outtmpl['default'], '1',
-                    f'The used result value was incorrect ({name}, {index})')
-
-    def _simple_config_test(self, *stop_paths):
-        encountered = 0
-        paths = []
-
-        def read_file(filename, default=[]):
-            nonlocal encountered
-            path = Path(filename)
-            paths.append(path)
-            if path in stop_paths:
-                encountered += 1
-                return ['-o', f'{encountered}']
-
-        with ConfigMock(read_file):
-            _, opts, _ = parseOpts([], False)
-
-        return paths, opts
-
-    @set_environ()
-    def test_config_early_exit_commandline(self):
-        self._early_exit_test(0, '--ignore-config')
-
-    @set_environ()
-    def test_config_early_exit_files(self):
-        for index, _ in enumerate(make_expected(), 1):
-            self._early_exit_test(index)
-
-    def _early_exit_test(self, allowed_reads, *args):
-        reads = 0
-
-        def read_file(filename, default=[]):
-            nonlocal reads
-            reads += 1
-
-            if reads > allowed_reads:
-                self.fail('The remaining config was not ignored')
-            elif reads == allowed_reads:
-                return ['--ignore-config']
-
-        with ConfigMock(read_file):
-            parseOpts(args, False)
-
-    @set_environ()
-    def test_config_override_commandline(self):
-        self._override_test(0, '-o', 'pass')
-
-    @set_environ()
-    def test_config_override_files(self):
-        for index, _ in enumerate(make_expected(), 1):
-            self._override_test(index)
-
-    def _override_test(self, start_index, *args):
-        index = 0
-
-        def read_file(filename, default=[]):
-            nonlocal index
-            index += 1
-
-            if index > start_index:
-                return ['-o', 'fail']
-            elif index == start_index:
-                return ['-o', 'pass']
-
-        with ConfigMock(read_file):
-            _, opts, _ = parseOpts(args, False)
-
-        self.assertEqual(
-            opts.outtmpl['default'], 'pass',
-            'The earlier group did not override the later ones')
-
-
-@contextlib.contextmanager
-def ConfigMock(read_file=None):
-    with unittest.mock.patch('yt_dlp.options.Config') as mock:
-        mock.return_value = Config(create_parser())
-        if read_file is not None:
-            mock.read_file = read_file
-
-        yield mock
-
-
-def make_expected(*filepaths):
-    return expected_from_expected_groups(_generate_expected_groups(), *filepaths)
-
-
-def make_expected_groups(*filepaths):
-    return _filter_expected_groups(_generate_expected_groups(), filepaths)
-
-
-def expected_from_expected_groups(expected_groups, *filepaths):
-    return list(itertools.chain.from_iterable(
-        _filter_expected_groups(expected_groups, filepaths).values()))
-
-
-def _filter_expected_groups(expected, filepaths):
-    if not filepaths:
-        return expected
-
-    result = {}
-    for group, paths in expected.items():
-        new_paths = []
-        for path in paths:
-            new_paths.append(path)
-            if path in filepaths:
-                break
-
-        result[group] = new_paths
-
-    return result
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_cookies.py

@@ -3,7 +3,6 @@ from datetime import datetime, timezone
 
 from yt_dlp import cookies
 from yt_dlp.cookies import (
-    LenientSimpleCookie,
     LinuxChromeCookieDecryptor,
     MacChromeCookieDecryptor,
     WindowsChromeCookieDecryptor,
@@ -138,163 +137,3 @@ class TestCookies(unittest.TestCase):
     def test_pbkdf2_sha1(self):
         key = pbkdf2_sha1(b'peanuts', b' ' * 16, 1, 16)
         self.assertEqual(key, b'g\xe1\x8e\x0fQ\x1c\x9b\xf3\xc9`!\xaa\x90\xd9\xd34')
-
-
-class TestLenientSimpleCookie(unittest.TestCase):
-    def _run_tests(self, *cases):
-        for message, raw_cookie, expected in cases:
-            cookie = LenientSimpleCookie(raw_cookie)
-
-            with self.subTest(message, expected=expected):
-                self.assertEqual(cookie.keys(), expected.keys(), message)
-
-                for key, expected_value in expected.items():
-                    morsel = cookie[key]
-                    if isinstance(expected_value, tuple):
-                        expected_value, expected_attributes = expected_value
-                    else:
-                        expected_attributes = {}
-
-                    attributes = {
-                        key: value
-                        for key, value in dict(morsel).items()
-                        if value != ""
-                    }
-                    self.assertEqual(attributes, expected_attributes, message)
-
-                    self.assertEqual(morsel.value, expected_value, message)
-
-    def test_parsing(self):
-        self._run_tests(
-            # Copied from https://github.com/python/cpython/blob/v3.10.7/Lib/test/test_http_cookies.py
-            (
-                "Test basic cookie",
-                "chips=ahoy; vienna=finger",
-                {"chips": "ahoy", "vienna": "finger"},
-            ),
-            (
-                "Test quoted cookie",
-                'keebler="E=mc2; L=\\"Loves\\"; fudge=\\012;"',
-                {"keebler": 'E=mc2; L="Loves"; fudge=\012;'},
-            ),
-            (
-                "Allow '=' in an unquoted value",
-                "keebler=E=mc2",
-                {"keebler": "E=mc2"},
-            ),
-            (
-                "Allow cookies with ':' in their name",
-                "key:term=value:term",
-                {"key:term": "value:term"},
-            ),
-            (
-                "Allow '[' and ']' in cookie values",
-                "a=b; c=[; d=r; f=h",
-                {"a": "b", "c": "[", "d": "r", "f": "h"},
-            ),
-            (
-                "Test basic cookie attributes",
-                'Customer="WILE_E_COYOTE"; Version=1; Path=/acme',
-                {"Customer": ("WILE_E_COYOTE", {"version": "1", "path": "/acme"})},
-            ),
-            (
-                "Test flag only cookie attributes",
-                'Customer="WILE_E_COYOTE"; HttpOnly; Secure',
-                {"Customer": ("WILE_E_COYOTE", {"httponly": True, "secure": True})},
-            ),
-            (
-                "Test flag only attribute with values",
-                "eggs=scrambled; httponly=foo; secure=bar; Path=/bacon",
-                {"eggs": ("scrambled", {"httponly": "foo", "secure": "bar", "path": "/bacon"})},
-            ),
-            (
-                "Test special case for 'expires' attribute, 4 digit year",
-                'Customer="W"; expires=Wed, 01 Jan 2010 00:00:00 GMT',
-                {"Customer": ("W", {"expires": "Wed, 01 Jan 2010 00:00:00 GMT"})},
-            ),
-            (
-                "Test special case for 'expires' attribute, 2 digit year",
-                'Customer="W"; expires=Wed, 01 Jan 98 00:00:00 GMT',
-                {"Customer": ("W", {"expires": "Wed, 01 Jan 98 00:00:00 GMT"})},
-            ),
-            (
-                "Test extra spaces in keys and values",
-                "eggs  =  scrambled  ;  secure  ;  path  =  bar   ; foo=foo   ",
-                {"eggs": ("scrambled", {"secure": True, "path": "bar"}), "foo": "foo"},
-            ),
-            (
-                "Test quoted attributes",
-                'Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"',
-                {"Customer": ("WILE_E_COYOTE", {"version": "1", "path": "/acme"})}
-            ),
-            # Our own tests that CPython passes
-            (
-                "Allow ';' in quoted value",
-                'chips="a;hoy"; vienna=finger',
-                {"chips": "a;hoy", "vienna": "finger"},
-            ),
-            (
-                "Keep only the last set value",
-                "a=c; a=b",
-                {"a": "b"},
-            ),
-        )
-
-    def test_lenient_parsing(self):
-        self._run_tests(
-            (
-                "Ignore and try to skip invalid cookies",
-                'chips={"ahoy;": 1}; vienna="finger;"',
-                {"vienna": "finger;"},
-            ),
-            (
-                "Ignore cookies without a name",
-                "a=b; unnamed; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Ignore '\"' cookie without name",
-                'a=b; "; c=d',
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Skip all space separated values",
-                "x a=b c=d x; e=f",
-                {"a": "b", "c": "d", "e": "f"},
-            ),
-            (
-                "Skip all space separated values",
-                'x a=b; data={"complex": "json", "with": "key=value"}; x c=d x',
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Expect quote mending",
-                'a=b; invalid="; c=d',
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Reset morsel after invalid to not capture attributes",
-                "a=b; invalid; Version=1; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Reset morsel after invalid to not capture attributes",
-                "a=b; $invalid; $Version=1; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Continue after non-flag attribute without value",
-                "a=b; path; Version=1; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Allow cookie attributes with `$` prefix",
-                'Customer="WILE_E_COYOTE"; $Version=1; $Secure; $Path=/acme',
-                {"Customer": ("WILE_E_COYOTE", {"version": "1", "secure": True, "path": "/acme"})},
-            ),
-            (
-                "Invalid Morsel keys should not result in an error",
-                "Key=Value; [Invalid]=Value; Another=Value",
-                {"Key": "Value", "Another": "Value"},
-            ),
-        )

test/test_download.py

@@ -106,7 +106,7 @@ def generator(test_case, tname):
             params = tc.get('params', {})
             if not info_dict.get('id'):
                 raise Exception(f'Test {tname} definition incorrect - "id" key is not present')
-            elif not info_dict.get('ext') and info_dict.get('_type', 'video') == 'video':
+            elif not info_dict.get('ext'):
                 if params.get('skip_download') and params.get('ignore_no_formats_error'):
                     continue
                 raise Exception(f'Test {tname} definition incorrect - "ext" key must be present to define the output file')
@@ -122,8 +122,7 @@ def generator(test_case, tname):
         params['outtmpl'] = tname + '_' + params['outtmpl']
         if is_playlist and 'playlist' not in test_case:
             params.setdefault('extract_flat', 'in_playlist')
-            params.setdefault('playlistend', test_case.get(
+            params.setdefault('playlistend', test_case.get('playlist_mincount'))
-                'playlist_mincount', test_case.get('playlist_count', -2) + 1))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)
@@ -213,8 +212,6 @@ def generator(test_case, tname):
                 tc_res_dict = res_dict['entries'][tc_num]
                 # First, check test cases' data against extracted data alone
                 expect_info_dict(self, tc_res_dict, tc.get('info_dict', {}))
-                if tc_res_dict.get('_type', 'video') != 'video':
-                    continue
                 # Now, check downloaded file consistency
                 tc_filename = get_tc_filename(tc)
                 if not test_case.get('params', {}).get('skip_download', False):

test/test_execution.py

@@ -11,46 +11,41 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import contextlib
 import subprocess
 
-from yt_dlp.utils import Popen
+from yt_dlp.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-LAZY_EXTRACTORS = 'yt_dlp/extractor/lazy_extractors.py'
+
+
+try:
+    _DEV_NULL = subprocess.DEVNULL
+except AttributeError:
+    _DEV_NULL = open(os.devnull, 'wb')
 
 
 class TestExecution(unittest.TestCase):
-    def run_yt_dlp(self, exe=(sys.executable, 'yt_dlp/__main__.py'), opts=('--version', )):
-        stdout, stderr, returncode = Popen.run(
-            [*exe, '--ignore-config', *opts], cwd=rootDir, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        print(stderr, file=sys.stderr)
-        self.assertEqual(returncode, 0)
-        return stdout.strip(), stderr.strip()
-
-    def test_main_exec(self):
-        self.run_yt_dlp()
-
     def test_import(self):
-        self.run_yt_dlp(exe=(sys.executable, '-c', 'import yt_dlp'))
+        subprocess.check_call([sys.executable, '-c', 'import yt_dlp'], cwd=rootDir)
 
     def test_module_exec(self):
-        self.run_yt_dlp(exe=(sys.executable, '-m', 'yt_dlp'))
+        subprocess.check_call([sys.executable, '-m', 'yt_dlp', '--ignore-config', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+
+    def test_main_exec(self):
+        subprocess.check_call([sys.executable, 'yt_dlp/__main__.py', '--ignore-config', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
-        _, stderr = self.run_yt_dlp(opts=('ä', '--version'))
+        p = subprocess.Popen(
+            [sys.executable, 'yt_dlp/__main__.py', '--ignore-config', encodeArgument('ä'), '--version'],
+            cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
+        _, stderr = p.communicate()
         self.assertFalse(stderr)
 
     def test_lazy_extractors(self):
         try:
-            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', LAZY_EXTRACTORS],
+            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
-                                  cwd=rootDir, stdout=subprocess.DEVNULL)
+            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
-            self.assertTrue(os.path.exists(LAZY_EXTRACTORS))
-
-            _, stderr = self.run_yt_dlp(opts=('-s', 'test:'))
-            self.assertFalse(stderr)
-
-            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=subprocess.DEVNULL)
         finally:
             with contextlib.suppress(OSError):
-                os.remove(LAZY_EXTRACTORS)
+                os.remove('yt_dlp/extractor/lazy_extractors.py')
 
 
 if __name__ == '__main__':

test/test_jsinterp.py

@@ -8,8 +8,8 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import math
-import re
 
+from yt_dlp.compat import re
 from yt_dlp.jsinterp import JS_Undefined, JSInterpreter
 
 
@@ -71,9 +71,6 @@ class TestJSInterpreter(unittest.TestCase):
         jsi = JSInterpreter('function f(){return 0 ?? 42;}')
         self.assertEqual(jsi.call_function('f'), 0)
 
-        jsi = JSInterpreter('function f(){return "life, the universe and everything" < 42;}')
-        self.assertFalse(jsi.call_function('f'))
-
     def test_array_access(self):
         jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}')
         self.assertEqual(jsi.call_function('f'), [5, 2, 7])
@@ -132,11 +129,6 @@ class TestJSInterpreter(unittest.TestCase):
         self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
 
     def test_builtins(self):
-        jsi = JSInterpreter('''
-        function x() { return NaN }
-        ''')
-        self.assertTrue(math.isnan(jsi.call_function('x')))
-
         jsi = JSInterpreter('''
         function x() { return new Date('Wednesday 31 December 1969 18:01:26 MDT') - 0; }
         ''')
@@ -155,38 +147,6 @@ class TestJSInterpreter(unittest.TestCase):
         self.assertEqual(jsi.call_function('z'), 5)
         self.assertEqual(jsi.call_function('y'), 2)
 
-    def test_if(self):
-        jsi = JSInterpreter('''
-        function x() {
-            let a = 9;
-            if (0==0) {a++}
-            return a
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        jsi = JSInterpreter('''
-        function x() {
-            if (0==0) {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        jsi = JSInterpreter('''
-        function x() {
-            if (0!=0) {return 1}
-            else {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-
-        """  # Unsupported
-        jsi = JSInterpreter('''
-        function x() {
-            if (0!=0) {return 1}
-            else if (1==0) {return 2}
-            else {return 10}
-        }''')
-        self.assertEqual(jsi.call_function('x'), 10)
-        """
-
     def test_for_loop(self):
         jsi = JSInterpreter('''
         function x() { a=0; for (i=0; i-10; i++) {a++} return a }
@@ -228,30 +188,6 @@ class TestJSInterpreter(unittest.TestCase):
         ''')
         self.assertEqual(jsi.call_function('x'), 10)
 
-    def test_catch(self):
-        jsi = JSInterpreter('''
-        function x() { try{throw 10} catch(e){return 5} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 5)
-
-    def test_finally(self):
-        jsi = JSInterpreter('''
-        function x() { try{throw 10} finally {return 42} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 42)
-        jsi = JSInterpreter('''
-        function x() { try{throw 10} catch(e){return 5} finally {return 42} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 42)
-
-    def test_nested_try(self):
-        jsi = JSInterpreter('''
-        function x() {try {
-            try{throw 10} finally {throw 42}
-            } catch(e){return 5} }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 5)
-
     def test_for_loop_continue(self):
         jsi = JSInterpreter('''
         function x() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }
@@ -264,14 +200,6 @@ class TestJSInterpreter(unittest.TestCase):
         ''')
         self.assertEqual(jsi.call_function('x'), 0)
 
-    def test_for_loop_try(self):
-        jsi = JSInterpreter('''
-        function x() {
-            for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
-            return 42 }
-        ''')
-        self.assertEqual(jsi.call_function('x'), 42)
-
     def test_literal_list(self):
         jsi = JSInterpreter('''
         function x() { return [1, 2, "asdf", [5, 6, 7]][3] }
@@ -419,32 +347,6 @@ class TestJSInterpreter(unittest.TestCase):
         ''')
         self.assertEqual(jsi.call_function('x').flags & re.I, re.I)
 
-        jsi = JSInterpreter(R'''
-        function x() { let a=/,][}",],()}(\[)/; return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x').pattern, r',][}",],()}(\[)')
-
-        jsi = JSInterpreter(R'''
-        function x() { let a=[/[)\\]/]; return a[0]; }
-        ''')
-        self.assertEqual(jsi.call_function('x').pattern, r'[)\\]')
-
-    def test_char_code_at(self):
-        jsi = JSInterpreter('function x(i){return "test".charCodeAt(i)}')
-        self.assertEqual(jsi.call_function('x', 0), 116)
-        self.assertEqual(jsi.call_function('x', 1), 101)
-        self.assertEqual(jsi.call_function('x', 2), 115)
-        self.assertEqual(jsi.call_function('x', 3), 116)
-        self.assertEqual(jsi.call_function('x', 4), None)
-        self.assertEqual(jsi.call_function('x', 'not_a_number'), 116)
-
-    def test_bitwise_operators_overflow(self):
-        jsi = JSInterpreter('function x(){return -524999584 << 5}')
-        self.assertEqual(jsi.call_function('x'), 379882496)
-
-        jsi = JSInterpreter('function x(){return 1236566549 << 5}')
-        self.assertEqual(jsi.call_function('x'), 915423904)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_plugins.py

@@ -1,73 +0,0 @@
-import importlib
-import os
-import shutil
-import sys
-import unittest
-from pathlib import Path
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-TEST_DATA_DIR = Path(os.path.dirname(os.path.abspath(__file__)), 'testdata')
-sys.path.append(str(TEST_DATA_DIR))
-importlib.invalidate_caches()
-
-from yt_dlp.plugins import PACKAGE_NAME, directories, load_plugins
-
-
-class TestPlugins(unittest.TestCase):
-
-    TEST_PLUGIN_DIR = TEST_DATA_DIR / PACKAGE_NAME
-
-    def test_directories_containing_plugins(self):
-        self.assertIn(self.TEST_PLUGIN_DIR, map(Path, directories()))
-
-    def test_extractor_classes(self):
-        for module_name in tuple(sys.modules):
-            if module_name.startswith(f'{PACKAGE_NAME}.extractor'):
-                del sys.modules[module_name]
-        plugins_ie = load_plugins('extractor', 'IE')
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertIn('NormalPluginIE', plugins_ie.keys())
-
-        # don't load modules with underscore prefix
-        self.assertFalse(
-            f'{PACKAGE_NAME}.extractor._ignore' in sys.modules.keys(),
-            'loaded module beginning with underscore')
-        self.assertNotIn('IgnorePluginIE', plugins_ie.keys())
-
-        # Don't load extractors with underscore prefix
-        self.assertNotIn('_IgnoreUnderscorePluginIE', plugins_ie.keys())
-
-        # Don't load extractors not specified in __all__ (if supplied)
-        self.assertNotIn('IgnoreNotInAllPluginIE', plugins_ie.keys())
-        self.assertIn('InAllPluginIE', plugins_ie.keys())
-
-    def test_postprocessor_classes(self):
-        plugins_pp = load_plugins('postprocessor', 'PP')
-        self.assertIn('NormalPluginPP', plugins_pp.keys())
-
-    def test_importing_zipped_module(self):
-        zip_path = TEST_DATA_DIR / 'zipped_plugins.zip'
-        shutil.make_archive(str(zip_path)[:-4], 'zip', str(zip_path)[:-4])
-        sys.path.append(str(zip_path))  # add zip to search paths
-        importlib.invalidate_caches()  # reset the import caches
-
-        try:
-            for plugin_type in ('extractor', 'postprocessor'):
-                package = importlib.import_module(f'{PACKAGE_NAME}.{plugin_type}')
-                self.assertIn(zip_path / PACKAGE_NAME / plugin_type, map(Path, package.__path__))
-
-            plugins_ie = load_plugins('extractor', 'IE')
-            self.assertIn('ZippedPluginIE', plugins_ie.keys())
-
-            plugins_pp = load_plugins('postprocessor', 'PP')
-            self.assertIn('ZippedPluginPP', plugins_pp.keys())
-
-        finally:
-            sys.path.remove(str(zip_path))
-            os.remove(zip_path)
-            importlib.invalidate_caches()  # reset the import caches
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_postprocessors.py

@@ -16,7 +16,6 @@ from yt_dlp.postprocessor import (
     MetadataFromFieldPP,
     MetadataParserPP,
     ModifyChaptersPP,
-    SponsorBlockPP,
 )
 
 
@@ -77,15 +76,11 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._pp = ModifyChaptersPP(YoutubeDL())
 
     @staticmethod
-    def _sponsor_chapter(start, end, cat, remove=False, title=None):
+    def _sponsor_chapter(start, end, cat, remove=False):
-        if title is None:
+        c = {'start_time': start, 'end_time': end, '_categories': [(cat, start, end)]}
-            title = SponsorBlockPP.CATEGORIES[cat]
+        if remove:
-        return {
+            c['remove'] = True
-            'start_time': start,
+        return c
-            'end_time': end,
-            '_categories': [(cat, start, end, title)],
-            **({'remove': True} if remove else {}),
-        }
 
     @staticmethod
     def _chapter(start, end, title=None, remove=False):
@@ -135,19 +130,6 @@ class TestModifyChaptersPP(unittest.TestCase):
              'c', '[SponsorBlock]: Filler Tangent', 'c'])
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
 
-    def test_remove_marked_arrange_sponsors_SponsorBlockChapters(self):
-        chapters = self._chapters([70], ['c']) + [
-            self._sponsor_chapter(10, 20, 'chapter', title='sb c1'),
-            self._sponsor_chapter(15, 16, 'chapter', title='sb c2'),
-            self._sponsor_chapter(30, 40, 'preview'),
-            self._sponsor_chapter(50, 60, 'filler')]
-        expected = self._chapters(
-            [10, 15, 16, 20, 30, 40, 50, 60, 70],
-            ['c', '[SponsorBlock]: sb c1', '[SponsorBlock]: sb c1, sb c2', '[SponsorBlock]: sb c1',
-             'c', '[SponsorBlock]: Preview/Recap',
-             'c', '[SponsorBlock]: Filler Tangent', 'c'])
-        self._remove_marked_arrange_sponsors_test_impl(chapters, expected, [])
-
     def test_remove_marked_arrange_sponsors_UniqueNamesForOverlappingSponsors(self):
         chapters = self._chapters([120], ['c']) + [
             self._sponsor_chapter(10, 45, 'sponsor'), self._sponsor_chapter(20, 40, 'selfpromo'),
@@ -191,7 +173,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         self._remove_marked_arrange_sponsors_test_impl(chapters, expected, cuts)
 
     def test_remove_marked_arrange_sponsors_ChapterWithCutHidingSponsor(self):
-        cuts = [self._sponsor_chapter(20, 50, 'selfpromo', remove=True)]
+        cuts = [self._sponsor_chapter(20, 50, 'selpromo', remove=True)]
         chapters = self._chapters([60], ['c']) + [
             self._sponsor_chapter(10, 20, 'intro'),
             self._sponsor_chapter(30, 40, 'sponsor'),
@@ -217,7 +199,7 @@ class TestModifyChaptersPP(unittest.TestCase):
             self._sponsor_chapter(10, 20, 'sponsor'),
             self._sponsor_chapter(20, 30, 'interaction', remove=True),
             self._chapter(30, 40, remove=True),
-            self._sponsor_chapter(40, 50, 'selfpromo', remove=True),
+            self._sponsor_chapter(40, 50, 'selpromo', remove=True),
             self._sponsor_chapter(50, 60, 'interaction')]
         expected = self._chapters([10, 20, 30, 40],
                                   ['c', '[SponsorBlock]: Sponsor',
@@ -300,7 +282,7 @@ class TestModifyChaptersPP(unittest.TestCase):
         chapters = self._chapters([70], ['c']) + [
             self._sponsor_chapter(10, 30, 'sponsor'),
             self._sponsor_chapter(20, 50, 'interaction'),
-            self._sponsor_chapter(30, 50, 'selfpromo', remove=True),
+            self._sponsor_chapter(30, 50, 'selpromo', remove=True),
             self._sponsor_chapter(40, 60, 'sponsor'),
             self._sponsor_chapter(50, 60, 'interaction')]
         expected = self._chapters(

test/test_utils.py

@@ -2,7 +2,6 @@
 
 # Allow direct execution
 import os
-import re
 import sys
 import unittest
 
@@ -105,13 +104,11 @@ from yt_dlp.utils import (
     sanitized_Request,
     shell_quote,
     smuggle_url,
-    str_or_none,
     str_to_int,
     strip_jsonp,
     strip_or_none,
     subtitles_filename,
     timeconvert,
-    traverse_obj,
     unescapeHTML,
     unified_strdate,
     unified_timestamp,
@@ -569,7 +566,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(base_url('http://foo.de/bar/'), 'http://foo.de/bar/')
         self.assertEqual(base_url('http://foo.de/bar/baz'), 'http://foo.de/bar/')
         self.assertEqual(base_url('http://foo.de/bar/baz?x=z/x/c'), 'http://foo.de/bar/')
-        self.assertEqual(base_url('http://foo.de/bar/baz&x=z&w=y/x/c'), 'http://foo.de/bar/baz&x=z&w=y/x/')
 
     def test_urljoin(self):
         self.assertEqual(urljoin('http://foo.de/', '/a/b/c.txt'), 'http://foo.de/a/b/c.txt')
@@ -955,85 +951,6 @@ class TestUtil(unittest.TestCase):
         )
         self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
 
-    def test_js_to_json_vars_strings(self):
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'null': a,
-                    'nullStr': b,
-                    'true': c,
-                    'trueStr': d,
-                    'false': e,
-                    'falseStr': f,
-                    'unresolvedVar': g,
-                }''',
-                {
-                    'a': 'null',
-                    'b': '"null"',
-                    'c': 'true',
-                    'd': '"true"',
-                    'e': 'false',
-                    'f': '"false"',
-                    'g': 'var',
-                }
-            )),
-            {
-                'null': None,
-                'nullStr': 'null',
-                'true': True,
-                'trueStr': 'true',
-                'false': False,
-                'falseStr': 'false',
-                'unresolvedVar': 'var'
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'int': a,
-                    'intStr': b,
-                    'float': c,
-                    'floatStr': d,
-                }''',
-                {
-                    'a': '123',
-                    'b': '"123"',
-                    'c': '1.23',
-                    'd': '"1.23"',
-                }
-            )),
-            {
-                'int': 123,
-                'intStr': '123',
-                'float': 1.23,
-                'floatStr': '1.23',
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'object': a,
-                    'objectStr': b,
-                    'array': c,
-                    'arrayStr': d,
-                }''',
-                {
-                    'a': '{}',
-                    'b': '"{}"',
-                    'c': '[]',
-                    'd': '"[]"',
-                }
-            )),
-            {
-                'object': {},
-                'objectStr': '{}',
-                'array': [],
-                'arrayStr': '[]',
-            }
-        )
-
     def test_js_to_json_realworld(self):
         inp = '''{
             'clip':{'provider':'pseudo'}
@@ -1180,12 +1097,6 @@ class TestUtil(unittest.TestCase):
         on = js_to_json('[1,//{},\n2]')
         self.assertEqual(json.loads(on), [1, 2])
 
-        on = js_to_json(R'"\^\$\#"')
-        self.assertEqual(json.loads(on), R'^$#', msg='Unnecessary escapes should be stripped')
-
-        on = js_to_json('\'"\\""\'')
-        self.assertEqual(json.loads(on), '"""', msg='Unnecessary quote escape should be escaped')
-
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
@@ -1765,9 +1676,6 @@ Line 1
         self.assertEqual(list(get_elements_text_and_html_by_attribute('class', 'foo', html)), [])
         self.assertEqual(list(get_elements_text_and_html_by_attribute('class', 'no-such-foo', html)), [])
 
-        self.assertEqual(list(get_elements_text_and_html_by_attribute(
-            'class', 'foo', '<a class="foo">nice</a><span class="foo">nice</span>', tag='a')), [('nice', '<a class="foo">nice</a>')])
-
     GET_ELEMENT_BY_TAG_TEST_STRING = '''
     random text lorem ipsum</p>
     <div>
@@ -1954,8 +1862,6 @@ Line 1
             vcodecs=[None], acodecs=[None], vexts=['webm'], aexts=['m4a']), 'mkv')
         self.assertEqual(get_compatible_ext(
             vcodecs=[None], acodecs=[None], vexts=['webm'], aexts=['webm']), 'webm')
-        self.assertEqual(get_compatible_ext(
-            vcodecs=[None], acodecs=[None], vexts=['webm'], aexts=['weba']), 'webm')
 
         self.assertEqual(get_compatible_ext(
             vcodecs=['h264'], acodecs=['mp4a'], vexts=['mov'], aexts=['m4a']), 'mp4')
@@ -1967,301 +1873,6 @@ Line 1
         self.assertEqual(get_compatible_ext(
             vcodecs=['av1'], acodecs=['mp4a'], vexts=['webm'], aexts=['m4a'], preferences=('webm', 'mkv')), 'mkv')
 
-    def test_traverse_obj(self):
-        _TEST_DATA = {
-            100: 100,
-            1.2: 1.2,
-            'str': 'str',
-            'None': None,
-            '...': ...,
-            'urls': [
-                {'index': 0, 'url': 'https://www.example.com/0'},
-                {'index': 1, 'url': 'https://www.example.com/1'},
-            ],
-            'data': (
-                {'index': 2},
-                {'index': 3},
-            ),
-            'dict': {},
-        }
-
-        # Test base functionality
-        self.assertEqual(traverse_obj(_TEST_DATA, ('str',)), 'str',
-                         msg='allow tuple path')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['str']), 'str',
-                         msg='allow list path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (value for value in ("str",))), 'str',
-                         msg='allow iterable path')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str'), 'str',
-                         msg='single items should be treated as a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, None), _TEST_DATA)
-        self.assertEqual(traverse_obj(_TEST_DATA, 100), 100)
-        self.assertEqual(traverse_obj(_TEST_DATA, 1.2), 1.2)
-
-        # Test Ellipsis behavior
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ...),
-                              (item for item in _TEST_DATA.values() if item not in (None, {})),
-                              msg='`...` should give all non discarded values')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, ...)), _TEST_DATA['urls'][0].values(),
-                              msg='`...` selection for dicts should select all values')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., ..., 'url')),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='nested `...` queries should work')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, (..., ..., 'index')), range(4),
-                              msg='`...` query result should be flattened')
-
-        # Test function as key
-        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
-                         [_TEST_DATA['urls']],
-                         msg='function as query key should perform a filter based on (key, value)')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), {'str'},
-                              msg='exceptions in the query function should be catched')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a: ...)
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a, b, c: ...)
-
-        # Test set as key (transformation/type, like `expected_type`)
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str.upper}, )), ['STR'],
-                         msg='Function in set should be a transformation')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str})), ['str'],
-                         msg='Type in set should be a type filter')
-        self.assertEqual(traverse_obj(_TEST_DATA, {dict}), _TEST_DATA,
-                         msg='A single set should be wrapped into a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str.upper})), ['STR'],
-                         msg='Transformation function should not raise')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str_or_none})),
-                         [item for item in map(str_or_none, _TEST_DATA.values()) if item is not None],
-                         msg='Function in set should be a transformation')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set())
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, {str.upper, str})
-
-        # Test alternative paths
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
-                         msg='multiple `paths` should be treated as alternative paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str', 100), 'str',
-                         msg='alternatives should exit early')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'fail'), None,
-                         msg='alternatives should return `default` if exhausted')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., 'fail'), 100), 100,
-                         msg='alternatives should track their own branching return')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', ...), ('data', ...)), list(_TEST_DATA['data']),
-                         msg='alternatives on empty objects should search further')
-
-        # Test branch and path nesting
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')), ['https://www.example.com/0'],
-                         msg='tuple as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')), ['https://www.example.com/0'],
-                         msg='list as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))), ['https://www.example.com/0'],
-                         msg='double nesting in path should be treated as paths')
-        self.assertEqual(traverse_obj(['0', [1, 2]], [(0, 1), 0]), [1],
-                         msg='do not fail early on branching')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', ((1, ('fail', 'url')), (0, 'url')))),
-                              ['https://www.example.com/0', 'https://www.example.com/1'],
-                              msg='tripple nesting in path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ('fail', (..., 'url')))),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='ellipsis as branch path start gets flattened')
-
-        # Test dictionary as key
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}), {0: 100, 1: 1.2},
-                         msg='dict key should result in a dict with the same keys')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}),
-                         {0: 'https://www.example.com/0'},
-                         msg='dict key should allow paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}),
-                         {0: ['https://www.example.com/0']},
-                         msg='tuple in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}),
-                         {0: ['https://www.example.com/0']},
-                         msg='double nesting in dict path should be treated as paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}),
-                         {0: ['https://www.example.com/1', 'https://www.example.com/0']},
-                         msg='tripple nesting in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}), {},
-                         msg='remove `None` values when top level dict key fails')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}, default=...), {0: ...},
-                         msg='use `default` if key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}), {},
-                         msg='remove empty values when dict key')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}, default=...), {0: ...},
-                         msg='use `default` when dict key and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}), {},
-                         msg='remove empty values when nested dict key fails')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}), {},
-                         msg='default to dict if pruned')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}, default=...), {0: ...},
-                         msg='default to dict if pruned and default is given')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=...), {0: {0: ...}},
-                         msg='use nested `default` when nested dict key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('dict', ...)}), {},
-                         msg='remove key if branch in dict key not successful')
-
-        # Testing default parameter behavior
-        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail'), None,
-                         msg='default value should be `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=...), ...,
-                         msg='chained fails should result in default')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', 'int'), 0,
-                         msg='should not short cirquit on `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', default=1), 1,
-                         msg='invalid dict key should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', default=1), 1,
-                         msg='`None` is a deliberate sentinel and should become `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', 10)), None,
-                         msg='`IndexError` should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=1), 1,
-                         msg='if branched but not successful return `default` if defined, not `[]`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=None), None,
-                         msg='if branched but not successful return `default` even if `default` is `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail')), [],
-                         msg='if branched but not successful return `[]`, not `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', ...)), [],
-                         msg='if branched but object is empty return `[]`, not `default`')
-        self.assertEqual(traverse_obj(None, ...), [],
-                         msg='if branched but object is `None` return `[]`, not `default`')
-        self.assertEqual(traverse_obj({0: None}, (0, ...)), [],
-                         msg='if branched but state is `None` return `[]`, not `default`')
-
-        branching_paths = [
-            ('fail', ...),
-            (..., 'fail'),
-            100 * ('fail',) + (...,),
-            (...,) + 100 * ('fail',),
-        ]
-        for branching_path in branching_paths:
-            self.assertEqual(traverse_obj({}, branching_path), [],
-                             msg='if branched but state is `None`, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({}, 'fail', branching_path), [],
-                             msg='if branching in last alternative and previous did not match, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({0: 'x'}, 0, branching_path), 'x',
-                             msg='if branching in last alternative and previous did match, return single value')
-            self.assertEqual(traverse_obj({0: 'x'}, branching_path, 0), 'x',
-                             msg='if branching in first alternative and non-branching path does match, return single value')
-            self.assertEqual(traverse_obj({}, branching_path, 'fail'), None,
-                             msg='if branching in first alternative and non-branching path does not match, return `default`')
-
-        # Testing expected_type behavior
-        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str),
-                         'str', msg='accept matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int),
-                         None, msg='reject non matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)),
-                         '0', msg='transform type using type function')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0),
-                         None, msg='wrap expected_type fuction in try_call')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, ..., expected_type=str),
-                         ['str'], msg='eliminate items that expected_type fails on')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int),
-                         {0: 100}, msg='type as expected_type should filter dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none),
-                         {0: '100', 1: '1.2'}, msg='function as expected_type should transform dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, ({0: 1.2}, 0, {int_or_none}), expected_type=int),
-                         1, msg='expected_type should not filter non final dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int),
-                         {0: {0: 100}}, msg='expected_type should transform deep dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(...)),
-                         [{0: ...}, {0: ...}], msg='expected_type should transform branched dict values')
-        self.assertEqual(traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int),
-                         [4], msg='expected_type regression for type matching in tuple branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['data', ...], expected_type=int),
-                         [], msg='expected_type regression for type matching in dict result')
-
-        # Test get_all behavior
-        _GET_ALL_DATA = {'key': [0, 1, 2]}
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ('key', ...), get_all=False), 0,
-                         msg='if not `get_all`, return only first matching value')
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ..., get_all=False), [0, 1, 2],
-                         msg='do not overflatten if not `get_all`')
-
-        # Test casesense behavior
-        _CASESENSE_DATA = {
-            'KeY': 'value0',
-            0: {
-                'KeY': 'value1',
-                0: {'KeY': 'value2'},
-            },
-        }
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'key'), None,
-                         msg='dict keys should be case sensitive unless `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'keY',
-                                      casesense=False), 'value0',
-                         msg='allow non matching key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ('keY',)),
-                                      casesense=False), ['value1'],
-                         msg='allow non matching key case in branch if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ((0, 'keY'),)),
-                                      casesense=False), ['value2'],
-                         msg='allow non matching key case in branch path if `casesense`')
-
-        # Test traverse_string behavior
-        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)), None,
-                         msg='do not traverse into string if not `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0),
-                                      traverse_string=True), 's',
-                         msg='traverse into string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1),
-                                      traverse_string=True), '.',
-                         msg='traverse into converted data if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', ...),
-                                      traverse_string=True), 'str',
-                         msg='`...` should result in string (same value) if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)),
-                                      traverse_string=True), 'sr',
-                         msg='`slice` should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == "s"),
-                                      traverse_string=True), 'str',
-                         msg='function should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
-                                      traverse_string=True), ['s', 'r'],
-                         msg='branching should result in list if `traverse_string`')
-
-        # Test is_user_input behavior
-        _IS_USER_INPUT_DATA = {'range8': list(range(8))}
-        self.assertEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', '3'),
-                                      is_user_input=True), 3,
-                         msg='allow for string indexing if `is_user_input`')
-        self.assertCountEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', '3:'),
-                                           is_user_input=True), tuple(range(8))[3:],
-                              msg='allow for string slice if `is_user_input`')
-        self.assertCountEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', ':4:2'),
-                                           is_user_input=True), tuple(range(8))[:4:2],
-                              msg='allow step in string slice if `is_user_input`')
-        self.assertCountEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', ':'),
-                                           is_user_input=True), range(8),
-                              msg='`:` should be treated as `...` if `is_user_input`')
-        with self.assertRaises(TypeError, msg='too many params should result in error'):
-            traverse_obj(_IS_USER_INPUT_DATA, ('range8', ':::'), is_user_input=True)
-
-        # Test re.Match as input obj
-        mobj = re.fullmatch(r'0(12)(?P<group>3)(4)?', '0123')
-        self.assertEqual(traverse_obj(mobj, ...), [x for x in mobj.groups() if x is not None],
-                         msg='`...` on a `re.Match` should give its `groups()`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 2)), ['0123', '3'],
-                         msg='function on a `re.Match` should give groupno, value starting at 0')
-        self.assertEqual(traverse_obj(mobj, 'group'), '3',
-                         msg='str key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 2), '3',
-                         msg='int key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 'gRoUp', casesense=False), '3',
-                         msg='str key on a `re.Match` should respect casesense')
-        self.assertEqual(traverse_obj(mobj, 'fail'), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 'gRoUpS', casesense=False), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 8), None,
-                         msg='failing int key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 'group')), ['0123', '3'],
-                         msg='function on a `re.Match` should give group name as well')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_youtube_lists.py

@@ -10,7 +10,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL, is_download_test
 from yt_dlp.extractor import YoutubeIE, YoutubeTabIE
-from yt_dlp.utils import ExtractorError
 
 
 @is_download_test
@@ -54,18 +53,6 @@ class TestYoutubeLists(unittest.TestCase):
         self.assertEqual(video['duration'], 10)
         self.assertEqual(video['uploader'], 'Philipp Hagemeister')
 
-    def test_youtube_channel_no_uploads(self):
-        dl = FakeYDL()
-        dl.params['extract_flat'] = True
-        ie = YoutubeTabIE(dl)
-        # no uploads
-        with self.assertRaisesRegex(ExtractorError, r'no uploads'):
-            ie.extract('https://www.youtube.com/channel/UC2yXPzFejc422buOIzn_0CA')
-
-        # no uploads and no UCID given
-        with self.assertRaisesRegex(ExtractorError, r'no uploads'):
-            ie.extract('https://www.youtube.com/news')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_youtube_signature.py

@@ -110,34 +110,6 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/1f7d5369/player_ias.vflset/en_US/base.js',
         'batNX7sYqIJdkJ', 'IhOkL_zxbkOZBw',
     ),
-    (
-        'https://www.youtube.com/s/player/009f1d77/player_ias.vflset/en_US/base.js',
-        '5dwFHw8aFWQUQtffRq', 'audescmLUzI3jw',
-    ),
-    (
-        'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js',
-        'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg',
-    ),
-    (
-        'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
-        'M92UUMHa8PdvPd3wyM', '3hPqLJsiNZx7yA',
-    ),
-    (
-        'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
-        'B2j7f_UPT4rfje85Lu_e', 'm5DmNymaGQ5RdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/7a062b77/player_ias.vflset/en_US/base.js',
-        'NRcE3y3mVtm_cV-W', 'VbsCYUATvqlt5w',
-    ),
-    (
-        'https://www.youtube.com/s/player/dac945fd/player_ias.vflset/en_US/base.js',
-        'o8BkRxXhuYsBCWi6RplPdP', '3Lx32v_hmzTm6A',
-    ),
 ]
 
 

test/testdata/ism/ec-3_test.Manifest

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--Transformed by VSMT using XSL stylesheet for rule Identity--><!-- Created with Unified Streaming Platform (version=1.10.12-18737) --><SmoothStreamingMedia MajorVersion="2" MinorVersion="0" TimeScale="10000000" Duration="370000000"><StreamIndex Type="audio" QualityLevels="1" TimeScale="10000000" Language="deu" Name="audio_deu" Chunks="19" Url="QualityLevels({bitrate})/Fragments(audio_deu={start time})?noStreamProfile=1"><QualityLevel Index="0" Bitrate="127802" CodecPrivateData="1190" SamplingRate="48000" Channels="2" BitsPerSample="16" PacketSize="4" AudioTag="255" FourCC="AACL" /><c t="0" d="20053333" /><c d="20053334" /><c d="20053333" /><c d="19840000" /><c d="20053333" /><c d="20053334" /><c d="20053333" /><c d="19840000" /><c d="20053333" /><c d="20053334" /><c d="20053333" /><c d="19840000" /><c d="20053333" /><c d="20053334" /><c d="20053333" /><c d="19840000" /><c d="20053333" /><c d="20053334" /><c d="7253333" /></StreamIndex><StreamIndex Type="audio" QualityLevels="1" TimeScale="10000000" Language="deu" Name="audio_deu_1" Chunks="19" Url="QualityLevels({bitrate})/Fragments(audio_deu_1={start time})?noStreamProfile=1"><QualityLevel Index="0" Bitrate="224000" CodecPrivateData="00063F000000AF87FBA7022DFB42A4D405CD93843BDD0700200F00" FourCCData="0700200F00" SamplingRate="48000" Channels="6" BitsPerSample="16" PacketSize="896" AudioTag="65534" FourCC="EC-3" /><c t="0" d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="20160000" /><c d="19840000" /><c d="8320000" /></StreamIndex><StreamIndex Type="video" QualityLevels="8" TimeScale="10000000" Language="deu" Name="video_deu" Chunks="19" Url="QualityLevels({bitrate})/Fragments(video_deu={start time})?noStreamProfile=1" MaxWidth="1920" MaxHeight="1080" DisplayWidth="1920" DisplayHeight="1080"><QualityLevel Index="0" Bitrate="23909" CodecPrivateData="000000016742C00CDB06077E5C05A808080A00000300020000030009C0C02EE0177CC6300F142AE00000000168CA8DC8" MaxWidth="384" MaxHeight="216" FourCC="AVC1" /><QualityLevel Index="1" Bitrate="403188" CodecPrivateData="00000001674D4014E98323B602D4040405000003000100000300320F1429380000000168EAECF2" MaxWidth="400" MaxHeight="224" FourCC="AVC1" /><QualityLevel Index="2" Bitrate="680365" CodecPrivateData="00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2" MaxWidth="640" MaxHeight="360" FourCC="AVC1" /><QualityLevel Index="3" Bitrate="1253465" CodecPrivateData="00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2" MaxWidth="640" MaxHeight="360" FourCC="AVC1" /><QualityLevel Index="4" Bitrate="2121558" CodecPrivateData="00000001674D401EECA0601BD80B50101014000003000400000300C83C58B6580000000168E93B3C80" MaxWidth="768" MaxHeight="432" FourCC="AVC1" /><QualityLevel Index="5" Bitrate="3275545" CodecPrivateData="00000001674D4020ECA02802DD80B501010140000003004000000C83C60C65800000000168E93B3C80" MaxWidth="1280" MaxHeight="720" FourCC="AVC1" /><QualityLevel Index="6" Bitrate="5300196" CodecPrivateData="00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80" MaxWidth="1920" MaxHeight="1080" FourCC="AVC1" /><QualityLevel Index="7" Bitrate="8079312" CodecPrivateData="00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80" MaxWidth="1920" MaxHeight="1080" FourCC="AVC1" /><c t="0" d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="20000000" /><c d="10000000" /></StreamIndex></SmoothStreamingMedia>

test/testdata/yt_dlp_plugins/extractor/_ignore.py

@@ -1,5 +0,0 @@
-from yt_dlp.extractor.common import InfoExtractor
-
-
-class IgnorePluginIE(InfoExtractor):
-    pass

test/testdata/yt_dlp_plugins/extractor/ignore.py

@@ -1,12 +0,0 @@
-from yt_dlp.extractor.common import InfoExtractor
-
-
-class IgnoreNotInAllPluginIE(InfoExtractor):
-    pass
-
-
-class InAllPluginIE(InfoExtractor):
-    pass
-
-
-__all__ = ['InAllPluginIE']

test/testdata/yt_dlp_plugins/extractor/normal.py

@@ -1,9 +0,0 @@
-from yt_dlp.extractor.common import InfoExtractor
-
-
-class NormalPluginIE(InfoExtractor):
-    pass
-
-
-class _IgnoreUnderscorePluginIE(InfoExtractor):
-    pass

test/testdata/yt_dlp_plugins/postprocessor/normal.py

@@ -1,5 +0,0 @@
-from yt_dlp.postprocessor.common import PostProcessor
-
-
-class NormalPluginPP(PostProcessor):
-    pass

test/testdata/zipped_plugins/yt_dlp_plugins/extractor/zipped.py

@@ -1,5 +0,0 @@
-from yt_dlp.extractor.common import InfoExtractor
-
-
-class ZippedPluginIE(InfoExtractor):
-    pass

test/testdata/zipped_plugins/yt_dlp_plugins/postprocessor/zipped.py

@@ -1,5 +0,0 @@
-from yt_dlp.postprocessor.common import PostProcessor
-
-
-class ZippedPluginPP(PostProcessor):
-    pass

yt_dlp/__init__.py

@@ -1,8 +1,4 @@
-try:
+f'You are using an unsupported version of Python. Only Python versions 3.6 and above are supported by yt-dlp'  # noqa: F541
-    import contextvars  # noqa: F401
-except Exception:
-    raise Exception(
-        f'You are using an unsupported version of Python. Only Python versions 3.7 and above are supported by yt-dlp')  # noqa: F541
 
 __license__ = 'Public Domain'
 
@@ -16,14 +12,15 @@ import sys
 
 from .compat import compat_shlex_quote
 from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS
+from .downloader import FileDownloader
 from .downloader.external import get_external_downloader
 from .extractor import list_extractor_classes
 from .extractor.adobepass import MSO_INFO
+from .extractor.common import InfoExtractor
 from .options import parseOpts
 from .postprocessor import (
     FFmpegExtractAudioPP,
     FFmpegMergerPP,
-    FFmpegPostProcessor,
     FFmpegSubtitlesConvertorPP,
     FFmpegThumbnailsConvertorPP,
     FFmpegVideoConvertorPP,
@@ -38,7 +35,6 @@ from .utils import (
     DateRange,
     DownloadCancelled,
     DownloadError,
-    FormatSorter,
     GeoUtils,
     PlaylistEntries,
     SameFileError,
@@ -49,7 +45,6 @@ from .utils import (
     format_field,
     int_or_none,
     match_filter_func,
-    parse_bytes,
     parse_duration,
     preferredencoding,
     read_batch_urls,
@@ -63,8 +58,6 @@ from .utils import (
 )
 from .YoutubeDL import YoutubeDL
 
-_IN_CLI = False
-
 
 def _exit(status=0, *args):
     for msg in args:
@@ -91,11 +84,12 @@ def get_urls(urls, batchfile, verbose):
 
 
 def print_extractor_information(opts, urls):
+    # Importing GenericIE is currently slow since it imports other extractors
+    # TODO: Move this back to module level after generalization of embed detection
+    from .extractor.generic import GenericIE
+
     out = ''
     if opts.list_extractors:
-        # Importing GenericIE is currently slow since it imports YoutubeIE
-        from .extractor.generic import GenericIE
-
         urls = dict.fromkeys(urls, False)
         for ie in list_extractor_classes(opts.age_limit):
             out += ie.IE_NAME + (' (CURRENTLY BROKEN)' if not ie.working() else '') + '\n'
@@ -151,7 +145,7 @@ def set_compat_opts(opts):
         else:
             opts.embed_infojson = False
     if 'format-sort' in opts.compat_opts:
-        opts.format_sort.extend(FormatSorter.ytdl_default)
+        opts.format_sort.extend(InfoExtractor.FormatSort.ytdl_default)
     _video_multistreams_set = set_default_compat('multistreams', 'allow_multiple_video_streams', False, remove_compat=False)
     _audio_multistreams_set = set_default_compat('multistreams', 'allow_multiple_audio_streams', False, remove_compat=False)
     if _video_multistreams_set is False and _audio_multistreams_set is False:
@@ -226,7 +220,7 @@ def validate_options(opts):
 
     # Format sort
     for f in opts.format_sort:
-        validate_regex('format sorting', f, FormatSorter.regex)
+        validate_regex('format sorting', f, InfoExtractor.FormatSort.regex)
 
     # Postprocessor formats
     validate_regex('merge output format', opts.merge_output_format,
@@ -280,19 +274,19 @@ def validate_options(opts):
             raise ValueError(f'invalid {key} retry sleep expression {expr!r}')
 
     # Bytes
-    def validate_bytes(name, value):
+    def parse_bytes(name, value):
         if value is None:
             return None
-        numeric_limit = parse_bytes(value)
+        numeric_limit = FileDownloader.parse_bytes(value)
         validate(numeric_limit is not None, 'rate limit', value)
         return numeric_limit
 
-    opts.ratelimit = validate_bytes('rate limit', opts.ratelimit)
+    opts.ratelimit = parse_bytes('rate limit', opts.ratelimit)
-    opts.throttledratelimit = validate_bytes('throttled rate limit', opts.throttledratelimit)
+    opts.throttledratelimit = parse_bytes('throttled rate limit', opts.throttledratelimit)
-    opts.min_filesize = validate_bytes('min filesize', opts.min_filesize)
+    opts.min_filesize = parse_bytes('min filesize', opts.min_filesize)
-    opts.max_filesize = validate_bytes('max filesize', opts.max_filesize)
+    opts.max_filesize = parse_bytes('max filesize', opts.max_filesize)
-    opts.buffersize = validate_bytes('buffer size', opts.buffersize)
+    opts.buffersize = parse_bytes('buffer size', opts.buffersize)
-    opts.http_chunk_size = validate_bytes('http chunk size', opts.http_chunk_size)
+    opts.http_chunk_size = parse_bytes('http chunk size', opts.http_chunk_size)
 
     # Output templates
     def validate_outtmpl(tmpl, msg):
@@ -318,18 +312,21 @@ def validate_options(opts):
     if outtmpl_default == '':
         opts.skip_download = None
         del opts.outtmpl['default']
+    if outtmpl_default and not os.path.splitext(outtmpl_default)[1] and opts.extractaudio:
+        raise ValueError(
+            'Cannot download a video and extract audio into the same file! '
+            f'Use "{outtmpl_default}.%(ext)s" instead of "{outtmpl_default}" as the output template')
 
     def parse_chapters(name, value):
         chapters, ranges = [], []
-        parse_timestamp = lambda x: float('inf') if x in ('inf', 'infinite') else parse_duration(x)
         for regex in value or []:
             if regex.startswith('*'):
-                for range_ in map(str.strip, regex[1:].split(',')):
+                for range in regex[1:].split(','):
-                    mobj = range_ != '-' and re.fullmatch(r'([^-]+)?\s*-\s*([^-]+)?', range_)
+                    dur = tuple(map(parse_duration, range.strip().split('-')))
-                    dur = mobj and (parse_timestamp(mobj.group(1) or '0'), parse_timestamp(mobj.group(2) or 'inf'))
+                    if len(dur) == 2 and all(t is not None for t in dur):
-                    if None in (dur or [None]):
+                        ranges.append(dur)
-                        raise ValueError(f'invalid {name} time range "{regex}". Must be of the form "*start-end"')
+                    else:
-                    ranges.append(dur)
+                        raise ValueError(f'invalid {name} time range "{regex}". Must be of the form *start-end')
                 continue
             try:
                 chapters.append(re.compile(regex))
@@ -342,16 +339,10 @@ def validate_options(opts):
 
     # Cookies from browser
     if opts.cookiesfrombrowser:
-        container = None
+        mobj = re.match(r'(?P<name>[^+:]+)(\s*\+\s*(?P<keyring>[^:]+))?(\s*:(?P<profile>.+))?', opts.cookiesfrombrowser)
-        mobj = re.fullmatch(r'''(?x)
-            (?P<name>[^+:]+)
-            (?:\s*\+\s*(?P<keyring>[^:]+))?
-            (?:\s*:\s*(?!:)(?P<profile>.+?))?
-            (?:\s*::\s*(?P<container>.+))?
-        ''', opts.cookiesfrombrowser)
         if mobj is None:
             raise ValueError(f'invalid cookies from browser arguments: {opts.cookiesfrombrowser}')
-        browser_name, keyring, profile, container = mobj.group('name', 'keyring', 'profile', 'container')
+        browser_name, keyring, profile = mobj.group('name', 'keyring', 'profile')
         browser_name = browser_name.lower()
         if browser_name not in SUPPORTED_BROWSERS:
             raise ValueError(f'unsupported browser specified for cookies: "{browser_name}". '
@@ -361,7 +352,7 @@ def validate_options(opts):
             if keyring not in SUPPORTED_KEYRINGS:
                 raise ValueError(f'unsupported keyring specified for cookies: "{keyring}". '
                                  f'Supported keyrings are: {", ".join(sorted(SUPPORTED_KEYRINGS))}')
-        opts.cookiesfrombrowser = (browser_name, profile, keyring, container)
+        opts.cookiesfrombrowser = (browser_name, profile, keyring)
 
     # MetadataParser
     def metadataparser_actions(f):
@@ -382,12 +373,10 @@ def validate_options(opts):
                 raise ValueError(f'{cmd} is invalid; {err}')
             yield action
 
+    parse_metadata = opts.parse_metadata or []
     if opts.metafromtitle is not None:
-        opts.parse_metadata.setdefault('pre_process', []).append('title:%s' % opts.metafromtitle)
+        parse_metadata.append('title:%s' % opts.metafromtitle)
-    opts.parse_metadata = {
+    opts.parse_metadata = list(itertools.chain(*map(metadataparser_actions, parse_metadata)))
-        k: list(itertools.chain(*map(metadataparser_actions, v)))
-        for k, v in opts.parse_metadata.items()
-    }
 
     # Other options
     if opts.playlist_items is not None:
@@ -408,9 +397,6 @@ def validate_options(opts):
     if opts.download_archive is not None:
         opts.download_archive = expand_path(opts.download_archive)
 
-    if opts.ffmpeg_location is not None:
-        opts.ffmpeg_location = expand_path(opts.ffmpeg_location)
-
     if opts.user_agent is not None:
         opts.headers.setdefault('User-Agent', opts.user_agent)
     if opts.referer is not None:
@@ -486,7 +472,7 @@ def validate_options(opts):
                     val1=opts.sponskrub and opts.sponskrub_cut)
 
     # Conflicts with --allow-unplayable-formats
-    report_conflict('--embed-metadata', 'addmetadata')
+    report_conflict('--add-metadata', 'addmetadata')
     report_conflict('--embed-chapters', 'addchapters')
     report_conflict('--embed-info-json', 'embed_infojson')
     report_conflict('--embed-subs', 'embedsubtitles')
@@ -559,11 +545,11 @@ def validate_options(opts):
 def get_postprocessors(opts):
     yield from opts.add_postprocessors
 
-    for when, actions in opts.parse_metadata.items():
+    if opts.parse_metadata:
         yield {
             'key': 'MetadataParser',
-            'actions': actions,
+            'actions': opts.parse_metadata,
-            'when': when
+            'when': 'pre_process'
         }
     sponsorblock_query = opts.sponsorblock_mark | opts.sponsorblock_remove
     if sponsorblock_query:
@@ -699,12 +685,11 @@ def parse_options(argv=None):
 
     postprocessors = list(get_postprocessors(opts))
 
-    print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[3:])
+    print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[2:])
     any_getting = any(getattr(opts, k) for k in (
         'dumpjson', 'dump_single_json', 'getdescription', 'getduration', 'getfilename',
         'getformat', 'getid', 'getthumbnail', 'gettitle', 'geturl'
     ))
-    opts.quiet = opts.quiet or any_getting or opts.print_json or bool(opts.forceprint)
 
     playlist_pps = [pp for pp in postprocessors if pp.get('when') == 'playlist']
     write_playlist_infojson = (opts.writeinfojson and not opts.clean_infojson
@@ -740,7 +725,7 @@ def parse_options(argv=None):
         'client_certificate': opts.client_certificate,
         'client_certificate_key': opts.client_certificate_key,
         'client_certificate_password': opts.client_certificate_password,
-        'quiet': opts.quiet,
+        'quiet': opts.quiet or any_getting or opts.print_json or bool(opts.forceprint),
         'no_warnings': opts.no_warnings,
         'forceurl': opts.geturl,
         'forcetitle': opts.gettitle,
@@ -776,7 +761,6 @@ def parse_options(argv=None):
         'windowsfilenames': opts.windowsfilenames,
         'ignoreerrors': opts.ignoreerrors,
         'force_generic_extractor': opts.force_generic_extractor,
-        'allowed_extractors': opts.allowed_extractors or ['default'],
         'ratelimit': opts.ratelimit,
         'throttledratelimit': opts.throttledratelimit,
         'overwrites': opts.overwrites,
@@ -852,7 +836,6 @@ def parse_options(argv=None):
         'legacyserverconnect': opts.legacy_server_connect,
         'nocheckcertificate': opts.no_check_certificate,
         'prefer_insecure': opts.prefer_insecure,
-        'enable_file_urls': opts.enable_file_urls,
         'http_headers': opts.headers,
         'proxy': opts.proxy,
         'socket_timeout': opts.socket_timeout,
@@ -919,11 +902,6 @@ def _real_main(argv=None):
     if print_extractor_information(opts, all_urls):
         return
 
-    # We may need ffmpeg_location without having access to the YoutubeDL instance
-    # See https://github.com/yt-dlp/yt-dlp/issues/2191
-    if opts.ffmpeg_location:
-        FFmpegPostProcessor._ffmpeg_location.set(opts.ffmpeg_location)
-
     with YoutubeDL(ydl_opts) as ydl:
         pre_process = opts.update_self or opts.rm_cachedir
         actual_use = all_urls or opts.load_info_filename
@@ -961,8 +939,6 @@ def _real_main(argv=None):
 
 
 def main(argv=None):
-    global _IN_CLI
-    _IN_CLI = True
     try:
         _exit(*variadic(_real_main(argv)))
     except DownloadError:

yt_dlp/__main__.py

@@ -5,7 +5,7 @@
 
 import sys
 
-if __package__ is None and not getattr(sys, 'frozen', False):
+if __package__ is None and not hasattr(sys, 'frozen'):
     # direct call of __main__.py
     import os.path
     path = os.path.realpath(os.path.abspath(__file__))

yt_dlp/__pyinstaller/__init__.py

@@ -1,5 +0,0 @@
-import os
-
-
-def get_hook_dirs():
-    return [os.path.dirname(__file__)]

yt_dlp/__pyinstaller/hook-yt_dlp.py

@@ -1,57 +0,0 @@
-import ast
-import os
-import sys
-from pathlib import Path
-
-from PyInstaller.utils.hooks import collect_submodules
-
-
-def find_attribute_accesses(node, name, path=()):
-    if isinstance(node, ast.Attribute):
-        path = [*path, node.attr]
-        if isinstance(node.value, ast.Name) and node.value.id == name:
-            yield path[::-1]
-    for child in ast.iter_child_nodes(node):
-        yield from find_attribute_accesses(child, name, path)
-
-
-def collect_used_submodules(name, level):
-    for dirpath, _, filenames in os.walk(Path(__file__).parent.parent):
-        for filename in filenames:
-            if not filename.endswith('.py'):
-                continue
-            with open(Path(dirpath) / filename, encoding='utf8') as f:
-                for submodule in find_attribute_accesses(ast.parse(f.read()), name):
-                    yield '.'.join(submodule[:level])
-
-
-def pycryptodome_module():
-    try:
-        import Cryptodome  # noqa: F401
-    except ImportError:
-        try:
-            import Crypto  # noqa: F401
-            print('WARNING: Using Crypto since Cryptodome is not available. '
-                  'Install with: pip install pycryptodomex', file=sys.stderr)
-            return 'Crypto'
-        except ImportError:
-            pass
-    return 'Cryptodome'
-
-
-def get_hidden_imports():
-    yield 'yt_dlp.compat._legacy'
-    yield from collect_submodules('websockets')
-
-    crypto = pycryptodome_module()
-    for sm in set(collect_used_submodules('Cryptodome', 2)):
-        yield f'{crypto}.{sm}'
-
-    # These are auto-detected, but explicitly add them just in case
-    yield from ('mutagen', 'brotli', 'certifi')
-
-
-hiddenimports = list(get_hidden_imports())
-print(f'Adding imports: {hiddenimports}')
-
-excludedimports = ['youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts']

yt_dlp/aes.py

@@ -2,17 +2,17 @@ import base64
 from math import ceil
 
 from .compat import compat_ord
-from .dependencies import Cryptodome
+from .dependencies import Cryptodome_AES
 from .utils import bytes_to_intlist, intlist_to_bytes
 
-if Cryptodome:
+if Cryptodome_AES:
     def aes_cbc_decrypt_bytes(data, key, iv):
         """ Decrypt bytes with AES-CBC using pycryptodome """
-        return Cryptodome.Cipher.AES.new(key, Cryptodome.Cipher.AES.MODE_CBC, iv).decrypt(data)
+        return Cryptodome_AES.new(key, Cryptodome_AES.MODE_CBC, iv).decrypt(data)
 
     def aes_gcm_decrypt_and_verify_bytes(data, key, tag, nonce):
         """ Decrypt bytes with AES-GCM using pycryptodome """
-        return Cryptodome.Cipher.AES.new(key, Cryptodome.Cipher.AES.MODE_GCM, nonce).decrypt_and_verify(data, tag)
+        return Cryptodome_AES.new(key, Cryptodome_AES.MODE_GCM, nonce).decrypt_and_verify(data, tag)
 
 else:
     def aes_cbc_decrypt_bytes(data, key, iv):
@@ -28,23 +28,11 @@ def aes_cbc_encrypt_bytes(data, key, iv, **kwargs):
     return intlist_to_bytes(aes_cbc_encrypt(*map(bytes_to_intlist, (data, key, iv)), **kwargs))
 
 
-BLOCK_SIZE_BYTES = 16
-
-
 def unpad_pkcs7(data):
     return data[:-compat_ord(data[-1])]
 
 
-def pkcs7_padding(data):
+BLOCK_SIZE_BYTES = 16
-    """
-    PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @returns {int[]}           padding data
-    """
-
-    remaining_length = BLOCK_SIZE_BYTES - len(data) % BLOCK_SIZE_BYTES
-    return data + [remaining_length] * remaining_length
 
 
 def pad_block(block, padding_mode):
@@ -76,7 +64,7 @@ def pad_block(block, padding_mode):
 
 def aes_ecb_encrypt(data, key, iv=None):
     """
-    Encrypt with aes in ECB mode. Using PKCS#7 padding
+    Encrypt with aes in ECB mode
 
     @param {int[]} data        cleartext
     @param {int[]} key         16/24/32-Byte cipher key
@@ -89,7 +77,8 @@ def aes_ecb_encrypt(data, key, iv=None):
     encrypted_data = []
     for i in range(block_count):
         block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        encrypted_data += aes_encrypt(pkcs7_padding(block), expanded_key)
+        encrypted_data += aes_encrypt(block, expanded_key)
+    encrypted_data = encrypted_data[:len(data)]
 
     return encrypted_data
 
@@ -562,6 +551,5 @@ __all__ = [
 
     'key_expansion',
     'pad_block',
-    'pkcs7_padding',
     'unpad_pkcs7',
 ]

yt_dlp/cache.py

@@ -1,13 +1,12 @@
 import contextlib
+import errno
 import json
 import os
 import re
 import shutil
 import traceback
-import urllib.parse
 
-from .utils import expand_path, traverse_obj, version_tuple, write_json_file
+from .utils import expand_path, write_json_file
-from .version import __version__
 
 
 class Cache:
@@ -22,9 +21,11 @@ class Cache:
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
-        assert re.match(r'^[\w.-]+$', section), f'invalid section {section!r}'
+        assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \
-        key = urllib.parse.quote(key, safe='').replace('%', ',')  # encode non-ascii characters
+            'invalid section %r' % section
-        return os.path.join(self._get_root_dir(), section, f'{key}.{dtype}')
+        assert re.match(r'^[a-zA-Z0-9_.-]+$', key), 'invalid key %r' % key
+        return os.path.join(
+            self._get_root_dir(), section, f'{key}.{dtype}')
 
     @property
     def enabled(self):
@@ -38,22 +39,18 @@ class Cache:
 
         fn = self._get_cache_fn(section, key, dtype)
         try:
-            os.makedirs(os.path.dirname(fn), exist_ok=True)
+            try:
+                os.makedirs(os.path.dirname(fn))
+            except OSError as ose:
+                if ose.errno != errno.EEXIST:
+                    raise
             self._ydl.write_debug(f'Saving {section}.{key} to cache')
-            write_json_file({'yt-dlp_version': __version__, 'data': data}, fn)
+            write_json_file(data, fn)
         except Exception:
             tb = traceback.format_exc()
             self._ydl.report_warning(f'Writing cache to {fn!r} failed: {tb}')
 
-    def _validate(self, data, min_ver):
+    def load(self, section, key, dtype='json', default=None):
-        version = traverse_obj(data, 'yt-dlp_version')
-        if not version:  # Backward compatibility
-            data, version = {'data': data}, '2022.08.19'
-        if not min_ver or version_tuple(version) >= version_tuple(min_ver):
-            return data['data']
-        self._ydl.write_debug(f'Discarding old cache from version {version} (needs {min_ver})')
-
-    def load(self, section, key, dtype='json', default=None, *, min_ver=None):
         assert dtype in ('json',)
 
         if not self.enabled:
@@ -64,8 +61,8 @@ class Cache:
             try:
                 with open(cache_fn, encoding='utf-8') as cachef:
                     self._ydl.write_debug(f'Loading {section}.{key} from cache')
-                    return self._validate(json.load(cachef), min_ver)
+                    return json.load(cachef)
-            except (ValueError, KeyError):
+            except ValueError:
                 try:
                     file_size = os.path.getsize(cache_fn)
                 except OSError as oe:

yt_dlp/compat/__init__.py

@@ -3,18 +3,19 @@ import sys
 import warnings
 import xml.etree.ElementTree as etree
 
+from . import re
 from ._deprecated import *  # noqa: F401, F403
 from .compat_utils import passthrough_module
 
 # XXX: Implement this the same way as other DeprecationWarnings without circular import
 passthrough_module(__name__, '._legacy', callback=lambda attr: warnings.warn(
-    DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=5))
+    DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=3))
 
 
 # HTMLParseError has been deprecated in Python 3.3 and removed in
 # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
 # and uniform cross-version exception handling
-class compat_HTMLParseError(ValueError):
+class compat_HTMLParseError(Exception):
     pass
 
 
@@ -32,7 +33,6 @@ compat_os_name = os._name if os.name == 'java' else os.name
 
 if compat_os_name == 'nt':
     def compat_shlex_quote(s):
-        import re
         return s if re.match(r'^[-_\w./]+$', s) else '"%s"' % s.replace('"', '\\"')
 else:
     from shlex import quote as compat_shlex_quote  # noqa: F401
@@ -70,3 +70,9 @@ if compat_os_name in ('nt', 'ce'):
         return userhome + path[i:]
 else:
     compat_expanduser = os.path.expanduser
+
+
+# NB: Add modules that are imported dynamically here so that PyInstaller can find them
+# See https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/438
+if False:
+    from . import _legacy  # noqa: F401

yt_dlp/compat/_legacy.py

@@ -1,6 +1,5 @@
 """ Do not use! """
 
-import base64
 import collections
 import ctypes
 import getpass
@@ -23,15 +22,10 @@ import urllib.request
 import xml.etree.ElementTree as etree
 from subprocess import DEVNULL
 
-# isort: split
+from .compat_utils import passthrough_module  # isort: split
-import asyncio  # noqa: F401
+from .asyncio import run as compat_asyncio_run  # noqa: F401
-import re  # noqa: F401
+from .re import Pattern as compat_Pattern  # noqa: F401
-from asyncio import run as compat_asyncio_run  # noqa: F401
+from .re import match as compat_Match  # noqa: F401
-from re import Pattern as compat_Pattern  # noqa: F401
-from re import match as compat_Match  # noqa: F401
-
-from . import compat_expanduser, compat_HTMLParseError, compat_realpath
-from .compat_utils import passthrough_module
 from ..dependencies import Cryptodome_AES as compat_pycrypto_AES  # noqa: F401
 from ..dependencies import brotli as compat_brotli  # noqa: F401
 from ..dependencies import websockets as compat_websockets  # noqa: F401
@@ -49,25 +43,22 @@ def compat_setenv(key, value, env=os.environ):
     env[key] = value
 
 
-compat_base64_b64decode = base64.b64decode
 compat_basestring = str
-compat_casefold = str.casefold
 compat_chr = chr
 compat_collections_abc = collections.abc
-compat_cookiejar = compat_http_cookiejar = http.cookiejar
+compat_cookiejar = http.cookiejar
-compat_cookiejar_Cookie = compat_http_cookiejar_Cookie = http.cookiejar.Cookie
+compat_cookiejar_Cookie = http.cookiejar.Cookie
-compat_cookies = compat_http_cookies = http.cookies
+compat_cookies = http.cookies
-compat_cookies_SimpleCookie = compat_http_cookies_SimpleCookie = http.cookies.SimpleCookie
+compat_cookies_SimpleCookie = http.cookies.SimpleCookie
-compat_etree_Element = compat_xml_etree_ElementTree_Element = etree.Element
+compat_etree_Element = etree.Element
-compat_etree_register_namespace = compat_xml_etree_register_namespace = etree.register_namespace
+compat_etree_register_namespace = etree.register_namespace
 compat_filter = filter
 compat_get_terminal_size = shutil.get_terminal_size
 compat_getenv = os.getenv
-compat_getpass = compat_getpass_getpass = getpass.getpass
+compat_getpass = getpass.getpass
 compat_html_entities = html.entities
 compat_html_entities_html5 = html.entities.html5
-compat_html_parser_HTMLParseError = compat_HTMLParseError
+compat_HTMLParser = html.parser.HTMLParser
-compat_HTMLParser = compat_html_parser_HTMLParser = html.parser.HTMLParser
 compat_http_client = http.client
 compat_http_server = http.server
 compat_input = input
@@ -76,8 +67,6 @@ compat_itertools_count = itertools.count
 compat_kwargs = lambda kwargs: kwargs
 compat_map = map
 compat_numeric_types = (int, float, complex)
-compat_os_path_expanduser = compat_expanduser
-compat_os_path_realpath = compat_realpath
 compat_print = print
 compat_shlex_split = shlex.split
 compat_socket_create_connection = socket.create_connection
@@ -87,9 +76,7 @@ compat_struct_unpack = struct.unpack
 compat_subprocess_get_DEVNULL = lambda: DEVNULL
 compat_tokenize_tokenize = tokenize.tokenize
 compat_urllib_error = urllib.error
-compat_urllib_HTTPError = urllib.error.HTTPError
 compat_urllib_parse = urllib.parse
-compat_urllib_parse_parse_qs = urllib.parse.parse_qs
 compat_urllib_parse_quote = urllib.parse.quote
 compat_urllib_parse_quote_plus = urllib.parse.quote_plus
 compat_urllib_parse_unquote_plus = urllib.parse.unquote_plus
@@ -98,10 +85,8 @@ compat_urllib_parse_urlunparse = urllib.parse.urlunparse
 compat_urllib_request = urllib.request
 compat_urllib_request_DataHandler = urllib.request.DataHandler
 compat_urllib_response = urllib.response
-compat_urlretrieve = compat_urllib_request_urlretrieve = urllib.request.urlretrieve
+compat_urlretrieve = urllib.request.urlretrieve
-compat_xml_parse_error = compat_xml_etree_ElementTree_ParseError = etree.ParseError
+compat_xml_parse_error = etree.ParseError
 compat_xpath = lambda xpath: xpath
 compat_zip = zip
 workaround_optparse_bug9161 = lambda: None
-
-legacy = []

yt_dlp/compat/asyncio.py

@@ -0,0 +1,23 @@
+# flake8: noqa: F405
+from asyncio import *  # noqa: F403
+
+from .compat_utils import passthrough_module
+
+passthrough_module(__name__, 'asyncio')
+del passthrough_module
+
+try:
+    run  # >= 3.7
+except NameError:
+    def run(coro):
+        try:
+            loop = get_event_loop()
+        except RuntimeError:
+            loop = new_event_loop()
+            set_event_loop(loop)
+        loop.run_until_complete(coro)
+
+try:
+    all_tasks  # >= 3.7
+except NameError:
+    all_tasks = Task.all_tasks

yt_dlp/compat/compat_utils.py

@@ -1,6 +1,5 @@
 import collections
 import contextlib
-import functools
 import importlib
 import sys
 import types
@@ -11,73 +10,61 @@ _Package = collections.namedtuple('Package', ('name', 'version'))
 
 
 def get_package_info(module):
-    return _Package(
+    parent = module.__name__.split('.')[0]
-        name=getattr(module, '_yt_dlp__identifier', module.__name__),
+    parent_module = None
-        version=str(next(filter(None, (
+    with contextlib.suppress(ImportError):
-            getattr(module, attr, None)
+        parent_module = importlib.import_module(parent)
-            for attr in ('__version__', 'version_string', 'version')
+
-        )), None)))
+    for attr in ('__version__', 'version_string', 'version'):
+        version = getattr(parent_module, attr, None)
+        if version is not None:
+            break
+    return _Package(getattr(module, '_yt_dlp__identifier', parent), str(version))
 
 
 def _is_package(module):
-    return '__path__' in vars(module)
+    try:
+        module.__getattribute__('__path__')
+    except AttributeError:
+        return False
+    return True
 
 
-def _is_dunder(name):
+def passthrough_module(parent, child, allowed_attributes=None, *, callback=lambda _: None):
-    return name.startswith('__') and name.endswith('__')
+    parent_module = importlib.import_module(parent)
+    child_module = None  # Import child module only as needed
 
+    class PassthroughModule(types.ModuleType):
+        def __getattr__(self, attr):
+            if _is_package(parent_module):
+                with contextlib.suppress(ImportError):
+                    return importlib.import_module(f'.{attr}', parent)
 
-class EnhancedModule(types.ModuleType):
+            ret = self.__from_child(attr)
-    def __bool__(self):
+            if ret is _NO_ATTRIBUTE:
-        return vars(self).get('__bool__', lambda: True)()
+                raise AttributeError(f'module {parent} has no attribute {attr}')
+            callback(attr)
+            return ret
 
-    def __getattribute__(self, attr):
+        def __from_child(self, attr):
-        try:
+            if allowed_attributes is None:
-            ret = super().__getattribute__(attr)
+                if attr.startswith('__') and attr.endswith('__'):
-        except AttributeError:
+                    return _NO_ATTRIBUTE
-            if _is_dunder(attr):
+            elif attr not in allowed_attributes:
-                raise
-            getter = getattr(self, '__getattr__', None)
-            if not getter:
-                raise
-            ret = getter(attr)
-        return ret.fget() if isinstance(ret, property) else ret
-
-
-def passthrough_module(parent, child, allowed_attributes=(..., ), *, callback=lambda _: None):
-    """Passthrough parent module into a child module, creating the parent if necessary"""
-    def __getattr__(attr):
-        if _is_package(parent):
-            with contextlib.suppress(ImportError):
-                return importlib.import_module(f'.{attr}', parent.__name__)
-
-        ret = from_child(attr)
-        if ret is _NO_ATTRIBUTE:
-            raise AttributeError(f'module {parent.__name__} has no attribute {attr}')
-        callback(attr)
-        return ret
-
-    @functools.lru_cache(maxsize=None)
-    def from_child(attr):
-        nonlocal child
-        if attr not in allowed_attributes:
-            if ... not in allowed_attributes or _is_dunder(attr):
                 return _NO_ATTRIBUTE
 
-        if isinstance(child, str):
+            nonlocal child_module
-            child = importlib.import_module(child, parent.__name__)
+            child_module = child_module or importlib.import_module(child, parent)
 
-        if _is_package(child):
+            with contextlib.suppress(AttributeError):
-            with contextlib.suppress(ImportError):
+                return getattr(child_module, attr)
-                return passthrough_module(f'{parent.__name__}.{attr}',
-                                          importlib.import_module(f'.{attr}', child.__name__))
 
-        with contextlib.suppress(AttributeError):
+            if _is_package(child_module):
-            return getattr(child, attr)
+                with contextlib.suppress(ImportError):
+                    return importlib.import_module(f'.{attr}', child)
 
-        return _NO_ATTRIBUTE
+            return _NO_ATTRIBUTE
 
-    parent = sys.modules.get(parent, types.ModuleType(parent))
+    # Python 3.6 does not have module level __getattr__
-    parent.__class__ = EnhancedModule
+    # https://peps.python.org/pep-0562/
-    parent.__getattr__ = __getattr__
+    sys.modules[parent].__class__ = PassthroughModule
-    return parent

yt_dlp/compat/re.py

@@ -0,0 +1,18 @@
+# flake8: noqa: F405
+from re import *  # F403
+
+from .compat_utils import passthrough_module
+
+passthrough_module(__name__, 're')
+del passthrough_module
+
+try:
+    Pattern  # >= 3.7
+except NameError:
+    Pattern = type(compile(''))
+
+
+try:
+    Match  # >= 3.7
+except NameError:
+    Match = type(compile('').match(''))

yt_dlp/compat/shutil.py

@@ -1,30 +0,0 @@
-# flake8: noqa: F405
-from shutil import *  # noqa: F403
-
-from .compat_utils import passthrough_module
-
-passthrough_module(__name__, 'shutil')
-del passthrough_module
-
-
-import sys
-
-if sys.platform.startswith('freebsd'):
-    import errno
-    import os
-    import shutil
-
-    # Workaround for PermissionError when using restricted ACL mode on FreeBSD
-    def copy2(src, dst, *args, **kwargs):
-        if os.path.isdir(dst):
-            dst = os.path.join(dst, os.path.basename(src))
-        shutil.copyfile(src, dst, *args, **kwargs)
-        try:
-            shutil.copystat(src, dst, *args, **kwargs)
-        except PermissionError as e:
-            if e.errno != getattr(errno, 'EPERM', None):
-                raise
-        return dst
-
-    def move(*args, copy_function=copy2, **kwargs):
-        return shutil.move(*args, copy_function=copy_function, **kwargs)

yt_dlp/cookies.py

@@ -1,10 +1,8 @@
 import base64
 import contextlib
 import http.cookiejar
-import http.cookies
 import json
 import os
-import re
 import shutil
 import struct
 import subprocess
@@ -26,14 +24,7 @@ from .dependencies import (
     sqlite3,
 )
 from .minicurses import MultilinePrinter, QuietMultilinePrinter
-from .utils import (
+from .utils import Popen, YoutubeDLCookieJar, error_to_str, expand_path
-    Popen,
-    YoutubeDLCookieJar,
-    error_to_str,
-    expand_path,
-    is_path_like,
-    try_call,
-)
 
 CHROMIUM_BASED_BROWSERS = {'brave', 'chrome', 'chromium', 'edge', 'opera', 'vivaldi'}
 SUPPORTED_BROWSERS = CHROMIUM_BASED_BROWSERS | {'firefox', 'safari'}
@@ -94,12 +85,11 @@ def _create_progress_bar(logger):
 def load_cookies(cookie_file, browser_specification, ydl):
     cookie_jars = []
     if browser_specification is not None:
-        browser_name, profile, keyring, container = _parse_browser_specification(*browser_specification)
+        browser_name, profile, keyring = _parse_browser_specification(*browser_specification)
-        cookie_jars.append(
+        cookie_jars.append(extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring))
-            extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring, container=container))
 
     if cookie_file is not None:
-        is_filename = is_path_like(cookie_file)
+        is_filename = YoutubeDLCookieJar.is_path(cookie_file)
         if is_filename:
             cookie_file = expand_path(cookie_file)
 
@@ -111,9 +101,9 @@ def load_cookies(cookie_file, browser_specification, ydl):
     return _merge_cookie_jars(cookie_jars)
 
 
-def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(), *, keyring=None, container=None):
+def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(), *, keyring=None):
     if browser_name == 'firefox':
-        return _extract_firefox_cookies(profile, container, logger)
+        return _extract_firefox_cookies(profile, logger)
     elif browser_name == 'safari':
         return _extract_safari_cookies(profile, logger)
     elif browser_name in CHROMIUM_BASED_BROWSERS:
@@ -122,7 +112,7 @@ def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(),
         raise ValueError(f'unknown browser: {browser_name}')
 
 
-def _extract_firefox_cookies(profile, container, logger):
+def _extract_firefox_cookies(profile, logger):
     logger.info('Extracting cookies from firefox')
     if not sqlite3:
         logger.warning('Cannot extract cookies from firefox without sqlite3 support. '
@@ -141,36 +131,11 @@ def _extract_firefox_cookies(profile, container, logger):
         raise FileNotFoundError(f'could not find firefox cookies database in {search_root}')
     logger.debug(f'Extracting cookies from: "{cookie_database_path}"')
 
-    container_id = None
-    if container not in (None, 'none'):
-        containers_path = os.path.join(os.path.dirname(cookie_database_path), 'containers.json')
-        if not os.path.isfile(containers_path) or not os.access(containers_path, os.R_OK):
-            raise FileNotFoundError(f'could not read containers.json in {search_root}')
-        with open(containers_path) as containers:
-            identities = json.load(containers).get('identities', [])
-        container_id = next((context.get('userContextId') for context in identities if container in (
-            context.get('name'),
-            try_call(lambda: re.fullmatch(r'userContext([^\.]+)\.label', context['l10nID']).group())
-        )), None)
-        if not isinstance(container_id, int):
-            raise ValueError(f'could not find firefox container "{container}" in containers.json')
-
     with tempfile.TemporaryDirectory(prefix='yt_dlp') as tmpdir:
         cursor = None
         try:
             cursor = _open_database_copy(cookie_database_path, tmpdir)
-            if isinstance(container_id, int):
+            cursor.execute('SELECT host, name, value, path, expiry, isSecure FROM moz_cookies')
-                logger.debug(
-                    f'Only loading cookies from firefox container "{container}", ID {container_id}')
-                cursor.execute(
-                    'SELECT host, name, value, path, expiry, isSecure FROM moz_cookies WHERE originAttributes LIKE ? OR originAttributes LIKE ?',
-                    (f'%userContextId={container_id}', f'%userContextId={container_id}&%'))
-            elif container == 'none':
-                logger.debug('Only loading cookies not belonging to any container')
-                cursor.execute(
-                    'SELECT host, name, value, path, expiry, isSecure FROM moz_cookies WHERE NOT INSTR(originAttributes,"userContextId=")')
-            else:
-                cursor.execute('SELECT host, name, value, path, expiry, isSecure FROM moz_cookies')
             jar = YoutubeDLCookieJar()
             with _create_progress_bar(logger) as progress_bar:
                 table = cursor.fetchall()
@@ -845,15 +810,12 @@ def _get_linux_keyring_password(browser_keyring_name, keyring, logger):
 def _get_mac_keyring_password(browser_keyring_name, logger):
     logger.debug('using find-generic-password to obtain password from OSX keychain')
     try:
-        stdout, _, returncode = Popen.run(
+        stdout, _, _ = Popen.run(
             ['security', 'find-generic-password',
              '-w',  # write password to stdout
              '-a', browser_keyring_name,  # match 'account'
              '-s', f'{browser_keyring_name} Safe Storage'],  # match 'service'
             stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-        if returncode:
-            logger.warning('find-generic-password failed')
-            return None
         return stdout.rstrip(b'\n')
     except Exception as e:
         logger.warning(f'exception running find-generic-password: {error_to_str(e)}')
@@ -986,102 +948,11 @@ def _is_path(value):
     return os.path.sep in value
 
 
-def _parse_browser_specification(browser_name, profile=None, keyring=None, container=None):
+def _parse_browser_specification(browser_name, profile=None, keyring=None):
     if browser_name not in SUPPORTED_BROWSERS:
         raise ValueError(f'unsupported browser: "{browser_name}"')
     if keyring not in (None, *SUPPORTED_KEYRINGS):
         raise ValueError(f'unsupported keyring: "{keyring}"')
-    if profile is not None and _is_path(expand_path(profile)):
+    if profile is not None and _is_path(profile):
-        profile = expand_path(profile)
+        profile = os.path.expanduser(profile)
-    return browser_name, profile, keyring, container
+    return browser_name, profile, keyring
-
-
-class LenientSimpleCookie(http.cookies.SimpleCookie):
-    """More lenient version of http.cookies.SimpleCookie"""
-    # From https://github.com/python/cpython/blob/v3.10.7/Lib/http/cookies.py
-    # We use Morsel's legal key chars to avoid errors on setting values
-    _LEGAL_KEY_CHARS = r'\w\d' + re.escape('!#$%&\'*+-.:^_`|~')
-    _LEGAL_VALUE_CHARS = _LEGAL_KEY_CHARS + re.escape('(),/<=>?@[]{}')
-
-    _RESERVED = {
-        "expires",
-        "path",
-        "comment",
-        "domain",
-        "max-age",
-        "secure",
-        "httponly",
-        "version",
-        "samesite",
-    }
-
-    _FLAGS = {"secure", "httponly"}
-
-    # Added 'bad' group to catch the remaining value
-    _COOKIE_PATTERN = re.compile(r"""
-        \s*                            # Optional whitespace at start of cookie
-        (?P<key>                       # Start of group 'key'
-        [""" + _LEGAL_KEY_CHARS + r"""]+?# Any word of at least one letter
-        )                              # End of group 'key'
-        (                              # Optional group: there may not be a value.
-        \s*=\s*                          # Equal Sign
-        (                                # Start of potential value
-        (?P<val>                           # Start of group 'val'
-        "(?:[^\\"]|\\.)*"                    # Any doublequoted string
-        |                                    # or
-        \w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT # Special case for "expires" attr
-        |                                    # or
-        [""" + _LEGAL_VALUE_CHARS + r"""]*     # Any word or empty string
-        )                                  # End of group 'val'
-        |                                  # or
-        (?P<bad>(?:\\;|[^;])*?)            # 'bad' group fallback for invalid values
-        )                                # End of potential value
-        )?                             # End of optional value group
-        \s*                            # Any number of spaces.
-        (\s+|;|$)                      # Ending either at space, semicolon, or EOS.
-        """, re.ASCII | re.VERBOSE)
-
-    def load(self, data):
-        # Workaround for https://github.com/yt-dlp/yt-dlp/issues/4776
-        if not isinstance(data, str):
-            return super().load(data)
-
-        morsel = None
-        for match in self._COOKIE_PATTERN.finditer(data):
-            if match.group('bad'):
-                morsel = None
-                continue
-
-            key, value = match.group('key', 'val')
-
-            is_attribute = False
-            if key.startswith('$'):
-                key = key[1:]
-                is_attribute = True
-
-            lower_key = key.lower()
-            if lower_key in self._RESERVED:
-                if morsel is None:
-                    continue
-
-                if value is None:
-                    if lower_key not in self._FLAGS:
-                        morsel = None
-                        continue
-                    value = True
-                else:
-                    value, _ = self.value_decode(value)
-
-                morsel[key] = value
-
-            elif is_attribute:
-                morsel = None
-
-            elif value is not None:
-                morsel = self.get(key, http.cookies.Morsel())
-                real_value, coded_value = self.value_decode(value)
-                morsel.set(key, real_value, coded_value)
-                self[key] = morsel
-
-            else:
-                morsel = None

yt_dlp/dependencies.py

@@ -23,6 +23,24 @@ else:
         certifi = None
 
 
+try:
+    from Cryptodome.Cipher import AES as Cryptodome_AES
+except ImportError:
+    try:
+        from Crypto.Cipher import AES as Cryptodome_AES
+    except (ImportError, SyntaxError):  # Old Crypto gives SyntaxError in newer Python
+        Cryptodome_AES = None
+    else:
+        try:
+            # In pycrypto, mode defaults to ECB. See:
+            # https://www.pycryptodome.org/en/latest/src/vs_pycrypto.html#:~:text=not%20have%20ECB%20as%20default%20mode
+            Cryptodome_AES.new(b'abcdefghijklmnop')
+        except TypeError:
+            pass
+        else:
+            Cryptodome_AES._yt_dlp__identifier = 'pycrypto'
+
+
 try:
     import mutagen
 except ImportError:
@@ -66,16 +84,12 @@ else:
         xattr._yt_dlp__identifier = 'pyxattr'
 
 
-from . import Cryptodome
-
 all_dependencies = {k: v for k, v in globals().items() if not k.startswith('_')}
+
+
 available_dependencies = {k: v for k, v in all_dependencies.items() if v}
 
 
-# Deprecated
-Cryptodome_AES = Cryptodome.Cipher.AES if Cryptodome else None
-
-
 __all__ = [
     'all_dependencies',
     'available_dependencies',

yt_dlp/dependencies/Cryptodome.py

@@ -1,30 +0,0 @@
-import types
-
-from ..compat import functools
-from ..compat.compat_utils import passthrough_module
-
-try:
-    import Cryptodome as _parent
-except ImportError:
-    try:
-        import Crypto as _parent
-    except (ImportError, SyntaxError):  # Old Crypto gives SyntaxError in newer Python
-        _parent = types.ModuleType('no_Cryptodome')
-        __bool__ = lambda: False
-
-passthrough_module(__name__, _parent, (..., '__version__'))
-del passthrough_module
-
-
-@property
-@functools.cache
-def _yt_dlp__identifier():
-    if _parent.__name__ == 'Crypto':
-        from Crypto.Cipher import AES
-        try:
-            # In pycrypto, mode defaults to ECB. See:
-            # https://www.pycryptodome.org/en/latest/src/vs_pycrypto.html#:~:text=not%20have%20ECB%20as%20default%20mode
-            AES.new(b'abcdefghijklmnop')
-        except TypeError:
-            return 'pycrypto'
-    return _parent.__name__

yt_dlp/downloader/common.py

@@ -15,17 +15,15 @@ from ..minicurses import (
 from ..utils import (
     IDENTITY,
     NO_DEFAULT,
+    NUMBER_RE,
     LockingUnsupportedError,
     Namespace,
     RetryManager,
     classproperty,
     decodeArgument,
-    deprecation_warning,
     encodeFilename,
     format_bytes,
     join_nonempty,
-    parse_bytes,
-    remove_start,
     sanitize_open,
     shell_quote,
     timeconvert,
@@ -94,7 +92,6 @@ class FileDownloader:
 
         for func in (
             'deprecation_warning',
-            'deprecated_feature',
             'report_error',
             'report_file_already_downloaded',
             'report_warning',
@@ -122,11 +119,11 @@ class FileDownloader:
         time = timetuple_from_msec(seconds * 1000)
         if time.hours > 99:
             return '--:--:--'
+        if not time.hours:
+            return '%02d:%02d' % time[1:-1]
         return '%02d:%02d:%02d' % time[:-1]
 
-    @classmethod
+    format_eta = format_seconds
-    def format_eta(cls, seconds):
-        return f'{remove_start(cls.format_seconds(seconds), "00:"):>8s}'
 
     @staticmethod
     def calc_percent(byte_counter, data_len):
@@ -181,9 +178,12 @@ class FileDownloader:
     @staticmethod
     def parse_bytes(bytestr):
         """Parse a string indicating a byte quantity into an integer."""
-        deprecation_warning('yt_dlp.FileDownloader.parse_bytes is deprecated and '
+        matchobj = re.match(rf'(?i)^({NUMBER_RE})([kMGTPEZY]?)$', bytestr)
-                            'may be removed in the future. Use yt_dlp.utils.parse_bytes instead')
+        if matchobj is None:
-        return parse_bytes(bytestr)
+            return None
+        number = float(matchobj.group(1))
+        multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
+        return int(round(number * multiplier))
 
     def slow_down(self, start_time, now, byte_counter):
         """Sleep if the download speed is over the rate limit."""
@@ -331,8 +331,6 @@ class FileDownloader:
                     return tmpl
             return default
 
-        _format_bytes = lambda k: f'{format_bytes(s.get(k)):>10s}'
-
         if s['status'] == 'finished':
             if self.params.get('noprogress'):
                 self.to_screen('[download] Download completed')
@@ -340,7 +338,7 @@ class FileDownloader:
             s.update({
                 'speed': speed,
                 '_speed_str': self.format_speed(speed).strip(),
-                '_total_bytes_str': _format_bytes('total_bytes'),
+                '_total_bytes_str': format_bytes(s.get('total_bytes')),
                 '_elapsed_str': self.format_seconds(s.get('elapsed')),
                 '_percent_str': self.format_percent(100),
             })
@@ -355,15 +353,15 @@ class FileDownloader:
             return
 
         s.update({
-            '_eta_str': self.format_eta(s.get('eta')).strip(),
+            '_eta_str': self.format_eta(s.get('eta')),
             '_speed_str': self.format_speed(s.get('speed')),
             '_percent_str': self.format_percent(try_call(
                 lambda: 100 * s['downloaded_bytes'] / s['total_bytes'],
                 lambda: 100 * s['downloaded_bytes'] / s['total_bytes_estimate'],
                 lambda: s['downloaded_bytes'] == 0 and 0)),
-            '_total_bytes_str': _format_bytes('total_bytes'),
+            '_total_bytes_str': format_bytes(s.get('total_bytes')),
-            '_total_bytes_estimate_str': _format_bytes('total_bytes_estimate'),
+            '_total_bytes_estimate_str': format_bytes(s.get('total_bytes_estimate')),
-            '_downloaded_bytes_str': _format_bytes('downloaded_bytes'),
+            '_downloaded_bytes_str': format_bytes(s.get('downloaded_bytes')),
             '_elapsed_str': self.format_seconds(s.get('elapsed')),
         })
 

yt_dlp/downloader/dash.py

@@ -1,9 +1,8 @@
 import time
-import urllib.parse
 
 from . import get_suitable_downloader
 from .fragment import FragmentFD
-from ..utils import update_url_query, urljoin
+from ..utils import urljoin
 
 
 class DashSegmentsFD(FragmentFD):
@@ -41,12 +40,7 @@ class DashSegmentsFD(FragmentFD):
                 self._prepare_and_start_frag_download(ctx, fmt)
             ctx['start'] = real_start
 
-            extra_query = None
+            fragments_to_download = self._get_fragments(fmt, ctx)
-            extra_param_to_segment_url = info_dict.get('extra_param_to_segment_url')
-            if extra_param_to_segment_url:
-                extra_query = urllib.parse.parse_qs(extra_param_to_segment_url)
-
-            fragments_to_download = self._get_fragments(fmt, ctx, extra_query)
 
             if real_downloader:
                 self.to_screen(
@@ -57,13 +51,13 @@ class DashSegmentsFD(FragmentFD):
 
             args.append([ctx, fragments_to_download, fmt])
 
-        return self.download_and_append_fragments_multiple(*args, is_fatal=lambda idx: idx == 0)
+        return self.download_and_append_fragments_multiple(*args)
 
     def _resolve_fragments(self, fragments, ctx):
         fragments = fragments(ctx) if callable(fragments) else fragments
         return [next(iter(fragments))] if self.params.get('test') else fragments
 
-    def _get_fragments(self, fmt, ctx, extra_query):
+    def _get_fragments(self, fmt, ctx):
         fragment_base_url = fmt.get('fragment_base_url')
         fragments = self._resolve_fragments(fmt['fragments'], ctx)
 
@@ -76,8 +70,6 @@ class DashSegmentsFD(FragmentFD):
             if not fragment_url:
                 assert fragment_base_url
                 fragment_url = urljoin(fragment_base_url, fragment['path'])
-            if extra_query:
-                fragment_url = update_url_query(fragment_url, extra_query)
 
             yield {
                 'frag_index': frag_index,

yt_dlp/downloader/external.py

@@ -1,11 +1,9 @@
 import enum
-import json
 import os.path
 import re
 import subprocess
 import sys
 import time
-import uuid
 
 from .fragment import FragmentFD
 from ..compat import functools
@@ -22,10 +20,8 @@ from ..utils import (
     determine_ext,
     encodeArgument,
     encodeFilename,
-    find_available_port,
     handle_youtubedl_headers,
     remove_end,
-    sanitized_Request,
     traverse_obj,
 )
 
@@ -64,6 +60,7 @@ class ExternalFD(FragmentFD):
             }
             if filename != '-':
                 fsize = os.path.getsize(encodeFilename(tmpfilename))
+                self.to_screen(f'\r[{self.get_basename()}] Downloaded {fsize} bytes')
                 self.try_rename(tmpfilename, filename)
                 status.update({
                     'downloaded_bytes': fsize,
@@ -104,7 +101,6 @@ class ExternalFD(FragmentFD):
         return all((
             not info_dict.get('to_stdout') or Features.TO_STDOUT in cls.SUPPORTED_FEATURES,
             '+' not in info_dict['protocol'] or Features.MULTIPLE_FORMATS in cls.SUPPORTED_FEATURES,
-            not traverse_obj(info_dict, ('hls_aes', ...), 'extra_param_to_segment_url'),
             all(proto in cls.SUPPORTED_PROTOCOLS for proto in info_dict['protocol'].split('+')),
         ))
 
@@ -133,7 +129,8 @@ class ExternalFD(FragmentFD):
         self._debug_cmd(cmd)
 
         if 'fragments' not in info_dict:
-            _, stderr, returncode = self._call_process(cmd, info_dict)
+            _, stderr, returncode = Popen.run(
+                cmd, text=True, stderr=subprocess.PIPE if self._CAPTURE_STDERR else None)
             if returncode and stderr:
                 self.to_stderr(stderr)
             return returncode
@@ -143,7 +140,7 @@ class ExternalFD(FragmentFD):
         retry_manager = RetryManager(self.params.get('fragment_retries'), self.report_retry,
                                      frag_index=None, fatal=not skip_unavailable_fragments)
         for retry in retry_manager:
-            _, stderr, returncode = self._call_process(cmd, info_dict)
+            _, stderr, returncode = Popen.run(cmd, text=True, stderr=subprocess.PIPE)
             if not returncode:
                 break
             # TODO: Decide whether to retry based on error code
@@ -175,9 +172,6 @@ class ExternalFD(FragmentFD):
         self.try_remove(encodeFilename('%s.frag.urls' % tmpfilename))
         return 0
 
-    def _call_process(self, cmd, info_dict):
-        return Popen.run(cmd, text=True, stderr=subprocess.PIPE)
-
 
 class CurlFD(ExternalFD):
     AVAILABLE_OPT = '-V'
@@ -258,19 +252,6 @@ class Aria2cFD(ExternalFD):
         check_results = (not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES)
         return all(check_results)
 
-    @staticmethod
-    def _aria2c_filename(fn):
-        return fn if os.path.isabs(fn) else f'.{os.path.sep}{fn}'
-
-    def _call_downloader(self, tmpfilename, info_dict):
-        # FIXME: Disabled due to https://github.com/yt-dlp/yt-dlp/issues/5931
-        if False and 'no-external-downloader-progress' not in self.params.get('compat_opts', []):
-            info_dict['__rpc'] = {
-                'port': find_available_port() or 19190,
-                'secret': str(uuid.uuid4()),
-            }
-        return super()._call_downloader(tmpfilename, info_dict)
-
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = [self.exe, '-c',
                '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
@@ -291,12 +272,6 @@ class Aria2cFD(ExternalFD):
         cmd += self._bool_option('--show-console-readout', 'noprogress', 'false', 'true', '=')
         cmd += self._configuration_args()
 
-        if '__rpc' in info_dict:
-            cmd += [
-                '--enable-rpc',
-                f'--rpc-listen-port={info_dict["__rpc"]["port"]}',
-                f'--rpc-secret={info_dict["__rpc"]["secret"]}']
-
         # aria2c strips out spaces from the beginning/end of filenames and paths.
         # We work around this issue by adding a "./" to the beginning of the
         # filename and relative path, and adding a "/" at the end of the path.
@@ -305,9 +280,11 @@ class Aria2cFD(ExternalFD):
         # https://github.com/aria2/aria2/issues/1373
         dn = os.path.dirname(tmpfilename)
         if dn:
-            cmd += ['--dir', self._aria2c_filename(dn) + os.path.sep]
+            if not os.path.isabs(dn):
+                dn = f'.{os.path.sep}{dn}'
+            cmd += ['--dir', dn + os.path.sep]
         if 'fragments' not in info_dict:
-            cmd += ['--out', self._aria2c_filename(os.path.basename(tmpfilename))]
+            cmd += ['--out', f'.{os.path.sep}{os.path.basename(tmpfilename)}']
         cmd += ['--auto-file-renaming=false']
 
         if 'fragments' in info_dict:
@@ -316,97 +293,15 @@ class Aria2cFD(ExternalFD):
             url_list = []
             for frag_index, fragment in enumerate(info_dict['fragments']):
                 fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], self._aria2c_filename(fragment_filename)))
+                url_list.append('%s\n\tout=%s' % (fragment['url'], fragment_filename))
             stream, _ = self.sanitize_open(url_list_file, 'wb')
             stream.write('\n'.join(url_list).encode())
             stream.close()
-            cmd += ['-i', self._aria2c_filename(url_list_file)]
+            cmd += ['-i', url_list_file]
         else:
             cmd += ['--', info_dict['url']]
         return cmd
 
-    def aria2c_rpc(self, rpc_port, rpc_secret, method, params=()):
-        # Does not actually need to be UUID, just unique
-        sanitycheck = str(uuid.uuid4())
-        d = json.dumps({
-            'jsonrpc': '2.0',
-            'id': sanitycheck,
-            'method': method,
-            'params': [f'token:{rpc_secret}', *params],
-        }).encode('utf-8')
-        request = sanitized_Request(
-            f'http://localhost:{rpc_port}/jsonrpc',
-            data=d, headers={
-                'Content-Type': 'application/json',
-                'Content-Length': f'{len(d)}',
-                'Ytdl-request-proxy': '__noproxy__',
-            })
-        with self.ydl.urlopen(request) as r:
-            resp = json.load(r)
-        assert resp.get('id') == sanitycheck, 'Something went wrong with RPC server'
-        return resp['result']
-
-    def _call_process(self, cmd, info_dict):
-        if '__rpc' not in info_dict:
-            return super()._call_process(cmd, info_dict)
-
-        send_rpc = functools.partial(self.aria2c_rpc, info_dict['__rpc']['port'], info_dict['__rpc']['secret'])
-        started = time.time()
-
-        fragmented = 'fragments' in info_dict
-        frag_count = len(info_dict['fragments']) if fragmented else 1
-        status = {
-            'filename': info_dict.get('_filename'),
-            'status': 'downloading',
-            'elapsed': 0,
-            'downloaded_bytes': 0,
-            'fragment_count': frag_count if fragmented else None,
-            'fragment_index': 0 if fragmented else None,
-        }
-        self._hook_progress(status, info_dict)
-
-        def get_stat(key, *obj, average=False):
-            val = tuple(filter(None, map(float, traverse_obj(obj, (..., ..., key))))) or [0]
-            return sum(val) / (len(val) if average else 1)
-
-        with Popen(cmd, text=True, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE) as p:
-            # Add a small sleep so that RPC client can receive response,
-            # or the connection stalls infinitely
-            time.sleep(0.2)
-            retval = p.poll()
-            while retval is None:
-                # We don't use tellStatus as we won't know the GID without reading stdout
-                # Ref: https://aria2.github.io/manual/en/html/aria2c.html#aria2.tellActive
-                active = send_rpc('aria2.tellActive')
-                completed = send_rpc('aria2.tellStopped', [0, frag_count])
-
-                downloaded = get_stat('totalLength', completed) + get_stat('completedLength', active)
-                speed = get_stat('downloadSpeed', active)
-                total = frag_count * get_stat('totalLength', active, completed, average=True)
-                if total < downloaded:
-                    total = None
-
-                status.update({
-                    'downloaded_bytes': int(downloaded),
-                    'speed': speed,
-                    'total_bytes': None if fragmented else total,
-                    'total_bytes_estimate': total,
-                    'eta': (total - downloaded) / (speed or 1),
-                    'fragment_index': min(frag_count, len(completed) + 1) if fragmented else None,
-                    'elapsed': time.time() - started
-                })
-                self._hook_progress(status, info_dict)
-
-                if not active and len(completed) >= frag_count:
-                    send_rpc('aria2.shutdown')
-                    retval = p.wait()
-                    break
-
-                time.sleep(0.1)
-                retval = p.poll()
-
-            return '', p.stderr.read(), retval
-
 
 class HttpieFD(ExternalFD):
     AVAILABLE_OPT = '--version'
@@ -445,6 +340,7 @@ class FFmpegFD(ExternalFD):
             and cls.can_download(info_dict))
 
     def _call_downloader(self, tmpfilename, info_dict):
+        urls = [f['url'] for f in info_dict.get('requested_formats', [])] or [info_dict['url']]
         ffpp = FFmpegPostProcessor(downloader=self)
         if not ffpp.available:
             self.report_error('m3u8 download detected but ffmpeg could not be found. Please install')
@@ -474,6 +370,16 @@ class FFmpegFD(ExternalFD):
             # http://trac.ffmpeg.org/ticket/6125#comment:10
             args += ['-seekable', '1' if seekable else '0']
 
+        http_headers = None
+        if info_dict.get('http_headers'):
+            youtubedl_headers = handle_youtubedl_headers(info_dict['http_headers'])
+            http_headers = [
+                # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
+                # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
+                '-headers',
+                ''.join(f'{key}: {val}\r\n' for key, val in youtubedl_headers.items())
+            ]
+
         env = None
         proxy = self.params.get('proxy')
         if proxy:
@@ -526,26 +432,21 @@ class FFmpegFD(ExternalFD):
 
         start_time, end_time = info_dict.get('section_start') or 0, info_dict.get('section_end')
 
-        selected_formats = info_dict.get('requested_formats') or [info_dict]
+        for i, url in enumerate(urls):
-        for i, fmt in enumerate(selected_formats):
+            if http_headers is not None and re.match(r'^https?://', url):
-            if fmt.get('http_headers') and re.match(r'^https?://', fmt['url']):
+                args += http_headers
-                headers_dict = handle_youtubedl_headers(fmt['http_headers'])
-                # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
-                # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
-                args.extend(['-headers', ''.join(f'{key}: {val}\r\n' for key, val in headers_dict.items())])
-
             if start_time:
                 args += ['-ss', str(start_time)]
             if end_time:
                 args += ['-t', str(end_time - start_time)]
 
-            args += self._configuration_args((f'_i{i + 1}', '_i')) + ['-i', fmt['url']]
+            args += self._configuration_args((f'_i{i + 1}', '_i')) + ['-i', url]
 
         if not (start_time or end_time) or not self.params.get('force_keyframes_at_cuts'):
             args += ['-c', 'copy']
 
         if info_dict.get('requested_formats') or protocol == 'http_dash_segments':
-            for i, fmt in enumerate(selected_formats):
+            for (i, fmt) in enumerate(info_dict.get('requested_formats') or [info_dict]):
                 stream_number = fmt.get('manifest_stream_number', 0)
                 args.extend(['-map', f'{i}:{stream_number}'])
 
@@ -585,9 +486,8 @@ class FFmpegFD(ExternalFD):
         args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
         self._debug_cmd(args)
 
-        piped = any(fmt['url'] in ('-', 'pipe:') for fmt in selected_formats)
         with Popen(args, stdin=subprocess.PIPE, env=env) as proc:
-            if piped:
+            if url in ('-', 'pipe:'):
                 self.on_process_started(proc, proc.stdin)
             try:
                 retval = proc.wait()
@@ -597,7 +497,7 @@ class FFmpegFD(ExternalFD):
                 # produces a file that is playable (this is mostly useful for live
                 # streams). Note that Windows is not affected and produces playable
                 # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
-                if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32' and not piped:
+                if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32' and url not in ('-', 'pipe:'):
                     proc.communicate_or_kill(b'q')
                 else:
                     proc.kill(timeout=None)
@@ -615,14 +515,16 @@ _BY_NAME = {
     if name.endswith('FD') and name not in ('ExternalFD', 'FragmentFD')
 }
 
+_BY_EXE = {klass.EXE_NAME: klass for klass in _BY_NAME.values()}
+
 
 def list_external_downloaders():
     return sorted(_BY_NAME.keys())
 
 
 def get_external_downloader(external_downloader):
-    """ Given the name of the executable, see whether we support the given downloader """
+    """ Given the name of the executable, see whether we support the given
+        downloader . """
+    # Drop .exe extension on Windows
     bn = os.path.splitext(os.path.basename(external_downloader))[0]
-    return _BY_NAME.get(bn) or next((
+    return _BY_NAME.get(bn, _BY_EXE.get(bn))
-        klass for klass in _BY_NAME.values() if klass.EXE_NAME in bn
-    ), None)

yt_dlp/downloader/f4m.py

@@ -424,4 +424,6 @@ class F4mFD(FragmentFD):
                     msg = 'Missed %d fragments' % (fragments_list[0][1] - (frag_i + 1))
                     self.report_warning(msg)
 
-        return self._finish_frag_download(ctx, info_dict)
+        self._finish_frag_download(ctx, info_dict)
+
+        return True

yt_dlp/downloader/fragment.py

@@ -65,8 +65,8 @@ class FragmentFD(FileDownloader):
     """
 
     def report_retry_fragment(self, err, frag_index, count, retries):
-        self.deprecation_warning('yt_dlp.downloader.FragmentFD.report_retry_fragment is deprecated. '
+        self.deprecation_warning(
-                                 'Use yt_dlp.downloader.FileDownloader.report_retry instead')
+            'yt_dlp.downloader.FragmentFD.report_retry_fragment is deprecated. Use yt_dlp.downloader.FileDownloader.report_retry instead')
         return self.report_retry(err, count, retries, frag_index)
 
     def report_skip_fragment(self, frag_index, err=None):
@@ -295,23 +295,16 @@ class FragmentFD(FileDownloader):
                 self.try_remove(ytdl_filename)
         elapsed = time.time() - ctx['started']
 
-        to_file = ctx['tmpfilename'] != '-'
+        if ctx['tmpfilename'] == '-':
-        if to_file:
-            downloaded_bytes = os.path.getsize(encodeFilename(ctx['tmpfilename']))
-        else:
             downloaded_bytes = ctx['complete_frags_downloaded_bytes']
-
+        else:
-        if not downloaded_bytes:
-            if to_file:
-                self.try_remove(ctx['tmpfilename'])
-            self.report_error('The downloaded file is empty')
-            return False
-        elif to_file:
             self.try_rename(ctx['tmpfilename'], ctx['filename'])
-            filetime = ctx.get('fragment_filetime')
+            if self.params.get('updatetime', True):
-            if self.params.get('updatetime', True) and filetime:
+                filetime = ctx.get('fragment_filetime')
-                with contextlib.suppress(Exception):
+                if filetime:
-                    os.utime(ctx['filename'], (time.time(), filetime))
+                    with contextlib.suppress(Exception):
+                        os.utime(ctx['filename'], (time.time(), filetime))
+            downloaded_bytes = os.path.getsize(encodeFilename(ctx['filename']))
 
         self._hook_progress({
             'downloaded_bytes': downloaded_bytes,
@@ -323,7 +316,6 @@ class FragmentFD(FileDownloader):
             'max_progress': ctx.get('max_progress'),
             'progress_idx': ctx.get('progress_idx'),
         }, info_dict)
-        return True
 
     def _prepare_external_frag_download(self, ctx):
         if 'live' not in ctx:
@@ -360,8 +352,7 @@ class FragmentFD(FileDownloader):
             if not decrypt_info or decrypt_info['METHOD'] != 'AES-128':
                 return frag_content
             iv = decrypt_info.get('IV') or struct.pack('>8xq', fragment['media_sequence'])
-            decrypt_info['KEY'] = (decrypt_info.get('KEY')
+            decrypt_info['KEY'] = decrypt_info.get('KEY') or _get_key(info_dict.get('_decryption_key_url') or decrypt_info['URI'])
-                                   or _get_key(traverse_obj(info_dict, ('hls_aes', 'uri')) or decrypt_info['URI']))
             # Don't decrypt the content in tests since the data is explicitly truncated and it's not to a valid block
             # size (see https://github.com/ytdl-org/youtube-dl/pull/27660). Tests only care that the correct data downloaded,
             # not what it decrypts to.
@@ -371,7 +362,7 @@ class FragmentFD(FileDownloader):
 
         return decrypt_fragment
 
-    def download_and_append_fragments_multiple(self, *args, **kwargs):
+    def download_and_append_fragments_multiple(self, *args, pack_func=None, finish_func=None):
         '''
         @params (ctx1, fragments1, info_dict1), (ctx2, fragments2, info_dict2), ...
                 all args must be either tuple or list
@@ -379,17 +370,18 @@ class FragmentFD(FileDownloader):
         interrupt_trigger = [True]
         max_progress = len(args)
         if max_progress == 1:
-            return self.download_and_append_fragments(*args[0], **kwargs)
+            return self.download_and_append_fragments(*args[0], pack_func=pack_func, finish_func=finish_func)
         max_workers = self.params.get('concurrent_fragment_downloads', 1)
         if max_progress > 1:
             self._prepare_multiline_status(max_progress)
-        is_live = any(traverse_obj(args, (..., 2, 'is_live')))
+        is_live = any(traverse_obj(args, (..., 2, 'is_live'), default=[]))
 
         def thread_func(idx, ctx, fragments, info_dict, tpe):
             ctx['max_progress'] = max_progress
             ctx['progress_idx'] = idx
             return self.download_and_append_fragments(
-                ctx, fragments, info_dict, **kwargs, tpe=tpe, interrupt_trigger=interrupt_trigger)
+                ctx, fragments, info_dict, pack_func=pack_func, finish_func=finish_func,
+                tpe=tpe, interrupt_trigger=interrupt_trigger)
 
         class FTPE(concurrent.futures.ThreadPoolExecutor):
             # has to stop this or it's going to wait on the worker thread itself
@@ -436,12 +428,17 @@ class FragmentFD(FileDownloader):
         return result
 
     def download_and_append_fragments(
-            self, ctx, fragments, info_dict, *, is_fatal=(lambda idx: False),
+            self, ctx, fragments, info_dict, *, pack_func=None, finish_func=None,
-            pack_func=(lambda content, idx: content), finish_func=None,
+            tpe=None, interrupt_trigger=None):
-            tpe=None, interrupt_trigger=(True, )):
+        if not interrupt_trigger:
+            interrupt_trigger = (True, )
 
-        if not self.params.get('skip_unavailable_fragments', True):
+        is_fatal = (
-            is_fatal = lambda _: True
+            ((lambda _: False) if info_dict.get('is_live') else (lambda idx: idx == 0))
+            if self.params.get('skip_unavailable_fragments', True) else (lambda _: True))
+
+        if not pack_func:
+            pack_func = lambda frag_content, _: frag_content
 
         def download_fragment(fragment, ctx):
             if not interrupt_trigger[0]:
@@ -530,4 +527,5 @@ class FragmentFD(FileDownloader):
         if finish_func is not None:
             ctx['dest_stream'].write(finish_func())
             ctx['dest_stream'].flush()
-        return self._finish_frag_download(ctx, info_dict)
+        self._finish_frag_download(ctx, info_dict)
+        return True

yt_dlp/downloader/hls.py

@@ -7,15 +7,8 @@ from . import get_suitable_downloader
 from .external import FFmpegFD
 from .fragment import FragmentFD
 from .. import webvtt
-from ..dependencies import Cryptodome
+from ..dependencies import Cryptodome_AES
-from ..utils import (
+from ..utils import bug_reports_message, parse_m3u8_attributes, update_url_query
-    bug_reports_message,
-    parse_m3u8_attributes,
-    remove_start,
-    traverse_obj,
-    update_url_query,
-    urljoin,
-)
 
 
 class HlsFD(FragmentFD):
@@ -70,7 +63,7 @@ class HlsFD(FragmentFD):
         can_download, message = self.can_download(s, info_dict, self.params.get('allow_unplayable_formats')), None
         if can_download:
             has_ffmpeg = FFmpegFD.available()
-            no_crypto = not Cryptodome and '#EXT-X-KEY:METHOD=AES-128' in s
+            no_crypto = not Cryptodome_AES and '#EXT-X-KEY:METHOD=AES-128' in s
             if no_crypto and has_ffmpeg:
                 can_download, message = False, 'The stream has AES-128 encryption and pycryptodomex is not available'
             elif no_crypto:
@@ -157,13 +150,6 @@ class HlsFD(FragmentFD):
         i = 0
         media_sequence = 0
         decrypt_info = {'METHOD': 'NONE'}
-        external_aes_key = traverse_obj(info_dict, ('hls_aes', 'key'))
-        if external_aes_key:
-            external_aes_key = binascii.unhexlify(remove_start(external_aes_key, '0x'))
-            assert len(external_aes_key) in (16, 24, 32), 'Invalid length for HLS AES-128 key'
-        external_aes_iv = traverse_obj(info_dict, ('hls_aes', 'iv'))
-        if external_aes_iv:
-            external_aes_iv = binascii.unhexlify(remove_start(external_aes_iv, '0x').zfill(32))
         byte_range = {}
         discontinuity_count = 0
         frag_index = 0
@@ -179,7 +165,10 @@ class HlsFD(FragmentFD):
                     frag_index += 1
                     if frag_index <= ctx['fragment_index']:
                         continue
-                    frag_url = urljoin(man_url, line)
+                    frag_url = (
+                        line
+                        if re.match(r'^https?://', line)
+                        else urllib.parse.urljoin(man_url, line))
                     if extra_query:
                         frag_url = update_url_query(frag_url, extra_query)
 
@@ -201,7 +190,10 @@ class HlsFD(FragmentFD):
                         return False
                     frag_index += 1
                     map_info = parse_m3u8_attributes(line[11:])
-                    frag_url = urljoin(man_url, map_info.get('URI'))
+                    frag_url = (
+                        map_info.get('URI')
+                        if re.match(r'^https?://', map_info.get('URI'))
+                        else urllib.parse.urljoin(man_url, map_info.get('URI')))
                     if extra_query:
                         frag_url = update_url_query(frag_url, extra_query)
 
@@ -226,18 +218,15 @@ class HlsFD(FragmentFD):
                     decrypt_url = decrypt_info.get('URI')
                     decrypt_info = parse_m3u8_attributes(line[11:])
                     if decrypt_info['METHOD'] == 'AES-128':
-                        if external_aes_iv:
+                        if 'IV' in decrypt_info:
-                            decrypt_info['IV'] = external_aes_iv
-                        elif 'IV' in decrypt_info:
                             decrypt_info['IV'] = binascii.unhexlify(decrypt_info['IV'][2:].zfill(32))
-                        if external_aes_key:
+                        if not re.match(r'^https?://', decrypt_info['URI']):
-                            decrypt_info['KEY'] = external_aes_key
+                            decrypt_info['URI'] = urllib.parse.urljoin(
-                        else:
+                                man_url, decrypt_info['URI'])
-                            decrypt_info['URI'] = urljoin(man_url, decrypt_info['URI'])
+                        if extra_query:
-                            if extra_query:
+                            decrypt_info['URI'] = update_url_query(decrypt_info['URI'], extra_query)
-                                decrypt_info['URI'] = update_url_query(decrypt_info['URI'], extra_query)
+                        if decrypt_url != decrypt_info['URI']:
-                            if decrypt_url != decrypt_info['URI']:
+                            decrypt_info['KEY'] = None
-                                decrypt_info['KEY'] = None
 
                 elif line.startswith('#EXT-X-MEDIA-SEQUENCE'):
                     media_sequence = int(line[22:])

yt_dlp/downloader/http.py

@@ -211,12 +211,7 @@ class HttpFD(FileDownloader):
                 ctx.stream = None
 
         def download():
-            data_len = ctx.data.info().get('Content-length')
+            data_len = ctx.data.info().get('Content-length', None)
-
-            if ctx.data.info().get('Content-encoding'):
-                # Content-encoding is present, Content-length is not reliable anymore as we are
-                # doing auto decompression. (See: https://github.com/yt-dlp/yt-dlp/pull/6176)
-                data_len = None
 
             # Range HTTP header may be ignored/unsupported by a webserver
             # (e.g. extractor/scivee.py, extractor/bambuser.py).

yt_dlp/downloader/ism.py

@@ -138,8 +138,6 @@ def write_piff_header(stream, params):
 
         if fourcc == 'AACL':
             sample_entry_box = box(b'mp4a', sample_entry_payload)
-        if fourcc == 'EC-3':
-            sample_entry_box = box(b'ec-3', sample_entry_payload)
     elif stream_type == 'video':
         sample_entry_payload += u16.pack(0)  # pre defined
         sample_entry_payload += u16.pack(0)  # reserved
@@ -280,4 +278,5 @@ class IsmFD(FragmentFD):
                     return False
                 self.report_skip_fragment(frag_index)
 
-        return self._finish_frag_download(ctx, info_dict)
+        self._finish_frag_download(ctx, info_dict)
+        return True

yt_dlp/downloader/mhtml.py

@@ -186,4 +186,5 @@ body > figure > img {
 
         ctx['dest_stream'].write(
             b'--%b--\r\n\r\n' % frag_boundary.encode('us-ascii'))
-        return self._finish_frag_download(ctx, info_dict)
+        self._finish_frag_download(ctx, info_dict)
+        return True

yt_dlp/downloader/websocket.py

@@ -1,4 +1,3 @@
-import asyncio
 import contextlib
 import os
 import signal
@@ -6,6 +5,7 @@ import threading
 
 from .common import FileDownloader
 from .external import FFmpegFD
+from ..compat import asyncio
 from ..dependencies import websockets
 
 

yt_dlp/downloader/youtube_live_chat.py

@@ -191,7 +191,8 @@ class YoutubeLiveChatFD(FragmentFD):
             if test:
                 break
 
-        return self._finish_frag_download(ctx, info_dict)
+        self._finish_frag_download(ctx, info_dict)
+        return True
 
     @staticmethod
     def parse_live_timestamp(action):

yt_dlp/extractor/_extractors.py

@@ -1,30 +1,5 @@
 # flake8: noqa: F401
 
-from .youtube import (  # Youtube is moved to the top to improve performance
-    YoutubeIE,
-    YoutubeClipIE,
-    YoutubeFavouritesIE,
-    YoutubeNotificationsIE,
-    YoutubeHistoryIE,
-    YoutubeTabIE,
-    YoutubeLivestreamEmbedIE,
-    YoutubePlaylistIE,
-    YoutubeRecommendedIE,
-    YoutubeSearchDateIE,
-    YoutubeSearchIE,
-    YoutubeSearchURLIE,
-    YoutubeMusicSearchURLIE,
-    YoutubeSubscriptionsIE,
-    YoutubeStoriesIE,
-    YoutubeTruncatedIDIE,
-    YoutubeTruncatedURLIE,
-    YoutubeYtBeIE,
-    YoutubeYtUserIE,
-    YoutubeWatchLaterIE,
-    YoutubeShortsAudioPivotIE,
-    YoutubeConsentRedirectIE,
-)
-
 from .abc import (
     ABCIE,
     ABCIViewIE,
@@ -66,21 +41,12 @@ from .aenetworks import (
     HistoryPlayerIE,
     BiographyIE,
 )
-from .aeonco import AeonCoIE
 from .afreecatv import (
     AfreecaTVIE,
     AfreecaTVLiveIE,
     AfreecaTVUserIE,
 )
-from .agora import (
-    TokFMAuditionIE,
-    TokFMPodcastIE,
-    WyborczaPodcastIE,
-    WyborczaVideoIE,
-)
 from .airmozilla import AirMozillaIE
-from .airtv import AirTVIE
-from .aitube import AitubeKZVideoIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .amara import AmaraIE
@@ -89,21 +55,13 @@ from .alura import (
     AluraCourseIE
 )
 from .amcnetworks import AMCNetworksIE
-from .amazon import (
+from .amazon import AmazonStoreIE
-    AmazonStoreIE,
-    AmazonReviewsIE,
-)
-from .amazonminitv import (
-    AmazonMiniTVIE,
-    AmazonMiniTVSeasonIE,
-    AmazonMiniTVSeriesIE,
-)
 from .americastestkitchen import (
     AmericasTestKitchenIE,
     AmericasTestKitchenSeasonIE,
 )
-from .anchorfm import AnchorFMEpisodeIE
 from .angel import AngelIE
+from .animeondemand import AnimeOnDemandIE
 from .anvato import AnvatoIE
 from .aol import AolIE
 from .allocine import AllocineIE
@@ -123,7 +81,6 @@ from .applepodcasts import ApplePodcastsIE
 from .archiveorg import (
     ArchiveOrgIE,
     YoutubeWebArchiveIE,
-    VLiveWebArchiveIE,
 )
 from .arcpublishing import ArcPublishingIE
 from .arkena import ArkenaIE
@@ -191,12 +148,7 @@ from .bbc import (
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
-from .beatbump import (
-    BeatBumpVideoIE,
-    BeatBumpPlaylistIE,
-)
 from .beatport import BeatportIE
-from .berufetv import BerufeTVIE
 from .bet import BetIE
 from .bfi import BFIPlayerIE
 from .bfmtv import (
@@ -210,16 +162,13 @@ from .bigo import BigoIE
 from .bild import BildIE
 from .bilibili import (
     BiliBiliIE,
-    BiliBiliBangumiIE,
-    BiliBiliBangumiMediaIE,
     BiliBiliSearchIE,
     BilibiliCategoryIE,
+    BiliBiliBangumiIE,
     BilibiliAudioIE,
     BilibiliAudioAlbumIE,
     BiliBiliPlayerIE,
-    BilibiliSpaceVideoIE,
+    BilibiliChannelIE,
-    BilibiliSpaceAudioIE,
-    BilibiliSpacePlaylistIE,
     BiliIntlIE,
     BiliIntlSeriesIE,
     BiliLiveIE,
@@ -239,15 +188,12 @@ from .bleacherreport import (
     BleacherReportIE,
     BleacherReportCMSIE,
 )
-from .blerp import BlerpIE
 from .blogger import BloggerIE
 from .bloomberg import BloombergIE
 from .bokecc import BokeCCIE
 from .bongacams import BongaCamsIE
 from .bostonglobe import BostonGlobeIE
 from .box import BoxIE
-from .boxcast import BoxCastVideoIE
-from .booyah import BooyahClipsIE
 from .bpb import BpbIE
 from .br import (
     BRIE,
@@ -261,7 +207,6 @@ from .brightcove import (
     BrightcoveNewIE,
 )
 from .businessinsider import BusinessInsiderIE
-from .bundesliga import BundesligaIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
@@ -274,7 +219,6 @@ from .camdemy import (
     CamdemyFolderIE
 )
 from .cammodels import CamModelsIE
-from .camsoda import CamsodaIE
 from .camtasia import CamtasiaEmbedIE
 from .camwithher import CamWithHerIE
 from .canalalpha import CanalAlphaIE
@@ -338,7 +282,6 @@ from .chirbit import (
 )
 from .cinchcast import CinchcastIE
 from .cinemax import CinemaxIE
-from .cinetecamilano import CinetecaMilanoIE
 from .ciscolive import (
     CiscoLiveSessionIE,
     CiscoLiveSearchIE,
@@ -363,7 +306,6 @@ from .cnn import (
     CNNIE,
     CNNBlogsIE,
     CNNArticleIE,
-    CNNIndonesiaIE,
 )
 from .coub import CoubIE
 from .comedycentral import (
@@ -393,6 +335,8 @@ from .crowdbunker import (
     CrowdBunkerChannelIE,
 )
 from .crunchyroll import (
+    CrunchyrollIE,
+    CrunchyrollShowPlaylistIE,
     CrunchyrollBetaIE,
     CrunchyrollBetaShowIE,
 )
@@ -440,7 +384,7 @@ from .deezer import (
     DeezerAlbumIE,
 )
 from .democracynow import DemocracynowIE
-from .detik import DetikEmbedIE
+from .detik import Detik20IE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .digg import DiggIE
@@ -467,7 +411,6 @@ from .dplay import (
     AnimalPlanetIE,
     TLCIE,
     MotorTrendIE,
-    MotorTrendOnDemandIE,
     DiscoveryPlusIndiaIE,
     DiscoveryNetworksDeIE,
     DiscoveryPlusItalyIE,
@@ -480,8 +423,6 @@ from .drtuber import DrTuberIE
 from .drtv import (
     DRTVIE,
     DRTVLiveIE,
-    DRTVSeasonIE,
-    DRTVSeriesIE,
 )
 from .dtube import DTubeIE
 from .dvtv import DVTVIE
@@ -491,14 +432,11 @@ from .duboku import (
 )
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
-from .deuxm import (
-    DeuxMIE,
-    DeuxMNewsIE
-)
 from .digitalconcerthall import DigitalConcertHallIE
 from .discovery import DiscoveryIE
 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
+from .doodstream import DoodStreamIE
 from .dropbox import DropboxIE
 from .dropout import (
     DropoutSeasonIE,
@@ -510,7 +448,6 @@ from .dw import (
 )
 from .eagleplatform import EaglePlatformIE, ClipYouEmbedIE
 from .ebaumsworld import EbaumsWorldIE
-from .ebay import EbayIE
 from .echomsk import EchoMskIE
 from .egghead import (
     EggheadCourseIE,
@@ -533,7 +470,6 @@ from .epicon import (
     EpiconIE,
     EpiconSeriesIE,
 )
-from .epoch import EpochIE
 from .eporner import EpornerIE
 from .eroprofile import (
     EroProfileIE,
@@ -553,9 +489,8 @@ from .espn import (
     ESPNCricInfoIE,
 )
 from .esri import EsriVideoIE
-from .europa import EuropaIE, EuroParlWebstreamIE
+from .europa import EuropaIE
 from .europeantour import EuropeanTourIE
-from .eurosport import EurosportIE
 from .euscreen import EUScreenIE
 from .expotv import ExpoTVIE
 from .expressen import ExpressenIE
@@ -611,7 +546,6 @@ from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,
-    FoxNewsVideoIE,
 )
 from .foxsports import FoxSportsIE
 from .fptplay import FptplayIE
@@ -662,10 +596,6 @@ from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
 from .gedidigital import GediDigitalIE
 from .generic import GenericIE
-from .genius import (
-    GeniusIE,
-    GeniusLyricsIE,
-)
 from .gettr import (
     GettrIE,
     GettrStreamingIE,
@@ -693,7 +623,6 @@ from .googlepodcasts import (
 )
 from .googlesearch import GoogleSearchIE
 from .gopro import GoProIE
-from .goplay import GoPlayIE
 from .goshgay import GoshgayIE
 from .gotostage import GoToStageIE
 from .gputechconf import GPUTechConfIE
@@ -722,7 +651,6 @@ from .hotstar import (
     HotStarIE,
     HotStarPrefixIE,
     HotStarPlaylistIE,
-    HotStarSeasonIE,
     HotStarSeriesIE,
 )
 from .howcast import HowcastIE
@@ -736,10 +664,7 @@ from .hse import (
     HSEShowIE,
     HSEProductIE,
 )
-from .genericembeds import (
+from .genericembeds import HTML5MediaEmbedIE
-    HTML5MediaEmbedIE,
-    QuotedHTMLIE,
-)
 from .huajiao import HuajiaoIE
 from .huya import HuyaLiveIE
 from .huffpost import HuffPostIE
@@ -749,7 +674,6 @@ from .hungama import (
     HungamaAlbumPlaylistIE,
 )
 from .hypem import HypemIE
-from .hypergryph import MonsterSirenHypergryphMusicIE
 from .hytale import HytaleIE
 from .icareus import IcareusIE
 from .ichinanalive import (
@@ -765,7 +689,6 @@ from .iheart import (
     IHeartRadioIE,
     IHeartRadioPodcastIE,
 )
-from .iltalehti import IltalehtiIE
 from .imdb import (
     ImdbIE,
     ImdbListIE
@@ -797,11 +720,6 @@ from .iqiyi import (
     IqIE,
     IqAlbumIE
 )
-from .islamchannel import (
-    IslamChannelIE,
-    IslamChannelSeriesIE,
-)
-from .israelnationalnews import IsraelNationalNewsIE
 from .itprotv import (
     ITProTVIE,
     ITProTVCourseIE
@@ -830,21 +748,12 @@ from .jamendo import (
     JamendoIE,
     JamendoAlbumIE,
 )
-from .japandiet import (
-    ShugiinItvLiveIE,
-    ShugiinItvLiveRoomIE,
-    ShugiinItvVodIE,
-    SangiinInstructionIE,
-    SangiinIE,
-)
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .joj import JojIE
 from .jwplatform import JWPlatformIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE
-from .kanal2 import Kanal2IE
-from .kankanews import KankaNewsIE
 from .karaoketv import KaraoketvIE
 from .karrierevideos import KarriereVideosIE
 from .keezmovies import KeezMoviesIE
@@ -854,15 +763,10 @@ from .khanacademy import (
     KhanAcademyIE,
     KhanAcademyUnitIE,
 )
-from .kick import (
-    KickIE,
-    KickVODIE,
-)
 from .kicker import KickerIE
 from .kickstarter import KickStarterIE
 from .kinja import KinjaEmbedIE
 from .kinopoisk import KinoPoiskIE
-from .kommunetv import KommunetvIE
 from .kompas import KompasVideoIE
 from .konserthusetplay import KonserthusetPlayIE
 from .koo import KooIE
@@ -943,7 +847,6 @@ from .linkedin import (
 )
 from .linuxacademy import LinuxAcademyIE
 from .liputan6 import Liputan6IE
-from .listennotes import ListenNotesIE
 from .litv import LiTVIE
 from .livejournal import LiveJournalIE
 from .livestream import (
@@ -1006,11 +909,6 @@ from .mediasite import (
     MediasiteCatalogIE,
     MediasiteNamedCatalogIE,
 )
-from .mediastream import (
-    MediaStreamIE,
-    WinSportsVideoIE,
-)
-from .mediaworksnz import MediaWorksNZVODIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE
@@ -1026,7 +924,6 @@ from .microsoftvirtualacademy import (
     MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,
 )
-from .microsoftembed import MicrosoftEmbedIE
 from .mildom import (
     MildomIE,
     MildomVodIE,
@@ -1061,7 +958,6 @@ from .mlb import (
     MLBIE,
     MLBVideoIE,
     MLBTVIE,
-    MLBArticleIE,
 )
 from .mlssoccer import MLSSoccerIE
 from .mnet import MnetIE
@@ -1149,7 +1045,6 @@ from .nbc import (
     NBCSportsIE,
     NBCSportsStreamIE,
     NBCSportsVPlayerIE,
-    NBCStationsIE,
 )
 from .ndr import (
     NDRIE,
@@ -1178,14 +1073,12 @@ from .neteasemusic import (
 from .netverse import (
     NetverseIE,
     NetversePlaylistIE,
-    NetverseSearchIE,
 )
 from .newgrounds import (
     NewgroundsIE,
     NewgroundsPlaylistIE,
     NewgroundsUserIE,
 )
-from .newspicks import NewsPicksIE
 from .newstube import NewstubeIE
 from .newsy import NewsyIE
 from .nextmedia import (
@@ -1203,8 +1096,6 @@ from .nfhsnetwork import NFHSNetworkIE
 from .nfl import (
     NFLIE,
     NFLArticleIE,
-    NFLPlusEpisodeIE,
-    NFLPlusReplayIE,
 )
 from .nhk import (
     NhkVodIE,
@@ -1242,13 +1133,11 @@ from .nintendo import NintendoIE
 from .nitter import NitterIE
 from .njpwworld import NJPWWorldIE
 from .nobelprize import NobelPrizeIE
-from .noice import NoicePodcastIE
 from .nonktube import NonkTubeIE
 from .noodlemagazine import NoodleMagazineIE
 from .noovo import NoovoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
-from .nosnl import NOSNLArticleIE
 from .nova import (
     NovaEmbedIE,
     NovaIE,
@@ -1295,22 +1184,14 @@ from .nytimes import (
 )
 from .nuvid import NuvidIE
 from .nzherald import NZHeraldIE
-from .nzonscreen import NZOnScreenIE
 from .nzz import NZZIE
 from .odatv import OdaTVIE
-from .odkmedia import OnDemandChinaEpisodeIE
 from .odnoklassniki import OdnoklassnikiIE
-from .oftv import (
-    OfTVIE,
-    OfTVPlaylistIE
-)
 from .oktoberfesttv import OktoberfestTVIE
 from .olympics import OlympicsReplayIE
 from .on24 import On24IE
 from .ondemandkorea import OnDemandKoreaIE
 from .onefootball import OneFootballIE
-from .onenewsnz import OneNewsNZIE
-from .oneplace import OnePlacePodcastIE
 from .onet import (
     OnetIE,
     OnetChannelIE,
@@ -1419,7 +1300,6 @@ from .pluralsight import (
     PluralsightIE,
     PluralsightCourseIE,
 )
-from .podbayfm import PodbayFMIE, PodbayFMChannelIE
 from .podchaser import PodchaserIE
 from .podomatic import PodomaticIE
 from .pokemon import (
@@ -1433,8 +1313,6 @@ from .pokergo import (
 from .polsatgo import PolsatGoIE
 from .polskieradio import (
     PolskieRadioIE,
-    PolskieRadioLegacyIE,
-    PolskieRadioAuditionIE,
     PolskieRadioCategoryIE,
     PolskieRadioPlayerIE,
     PolskieRadioPodcastIE,
@@ -1462,8 +1340,6 @@ from .puhutv import (
     PuhuTVIE,
     PuhuTVSerieIE,
 )
-from .pr0gramm import Pr0grammStaticIE, Pr0grammIE
-from .prankcast import PrankCastIE
 from .premiershiprugby import PremiershipRugbyIE
 from .presstv import PressTVIE
 from .projectveritas import ProjectVeritasIE
@@ -1477,7 +1353,6 @@ from .prx import (
 )
 from .puls4 import Puls4IE
 from .pyvideo import PyvideoIE
-from .qingting import QingTingIE
 from .qqmusic import (
     QQMusicIE,
     QQMusicSingerIE,
@@ -1524,10 +1399,6 @@ from .raywenderlich import (
     RayWenderlichCourseIE,
 )
 from .rbmaradio import RBMARadioIE
-from .rbgtum import (
-    RbgTumIE,
-    RbgTumCourseIE,
-)
 from .rcs import (
     RCSIE,
     RCSEmbedsIE,
@@ -1572,10 +1443,7 @@ from .rokfin import (
 )
 from .roosterteeth import RoosterTeethIE, RoosterTeethSeriesIE
 from .rottentomatoes import RottenTomatoesIE
-from .rozhlas import (
+from .rozhlas import RozhlasIE
-    RozhlasIE,
-    RozhlasVltavaIE,
-)
 from .rte import RteIE, RteRadioIE
 from .rtlnl import (
     RtlNlIE,
@@ -1612,7 +1480,6 @@ from .ruhd import RUHDIE
 from .rule34video import Rule34VideoIE
 from .rumble import (
     RumbleEmbedIE,
-    RumbleIE,
     RumbleChannelIE,
 )
 from .rutube import (
@@ -1653,9 +1520,7 @@ from .samplefocus import SampleFocusIE
 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE
-from .screen9 import Screen9IE
 from .screencast import ScreencastIE
-from .screencastify import ScreencastifyIE
 from .screencastomatic import ScreencastOMaticIE
 from .scrippsnetworks import (
     ScrippsNetworksWatchIE,
@@ -1685,7 +1550,6 @@ from .shared import (
     VivoIE,
 )
 from .sharevideos import ShareVideosEmbedIE
-from .sibnet import SibnetEmbedIE
 from .shemaroome import ShemarooMeIE
 from .showroomlive import ShowRoomLiveIE
 from .simplecast import (
@@ -1701,6 +1565,7 @@ from .skyit import (
     SkyItVideoIE,
     SkyItVideoLiveIE,
     SkyItIE,
+    SkyItAcademyIE,
     SkyItArteIE,
     CieloTVItIE,
     TV8ItIE,
@@ -1720,7 +1585,6 @@ from .sky import (
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
-from .smotrim import SmotrimIE
 from .snotr import SnotrIE
 from .sohu import SohuIE
 from .sonyliv import (
@@ -1733,7 +1597,6 @@ from .soundcloud import (
     SoundcloudSetIE,
     SoundcloudRelatedIE,
     SoundcloudUserIE,
-    SoundcloudUserPermalinkIE,
     SoundcloudTrackStationIE,
     SoundcloudPlaylistIE,
     SoundcloudSearchIE,
@@ -1821,7 +1684,6 @@ from .svt import (
     SVTPlayIE,
     SVTSeriesIE,
 )
-from .swearnet import SwearnetEpisodeIE
 from .swrmediathek import SWRMediathekIE
 from .syvdk import SYVDKIE
 from .syfy import SyfyIE
@@ -1865,15 +1727,7 @@ from .telequebec import (
 )
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
-from .tempo import TempoIE, IVXPlayerIE
+from .tempo import TempoIE
-from .tencent import (
-    IflixEpisodeIE,
-    IflixSeriesIE,
-    VQQSeriesIE,
-    VQQVideoIE,
-    WeTvEpisodeIE,
-    WeTvSeriesIE,
-)
 from .tennistv import TennisTVIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
@@ -1895,11 +1749,6 @@ from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
-from .thisvid import (
-    ThisVidIE,
-    ThisVidMemberIE,
-    ThisVidPlaylistIE,
-)
 from .threespeak import (
     ThreeSpeakIE,
     ThreeSpeakUserIE,
@@ -1912,7 +1761,6 @@ from .tiktok import (
     TikTokEffectIE,
     TikTokTagIE,
     TikTokVMIE,
-    TikTokLiveIE,
     DouyinIE,
 )
 from .tinypic import TinyPicIE
@@ -1939,10 +1787,6 @@ from .toongoggles import ToonGogglesIE
 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
-from .triller import (
-    TrillerIE,
-    TrillerUserIE,
-)
 from .trilulilu import TriluliluIE
 from .trovo import (
     TrovoIE,
@@ -1950,7 +1794,6 @@ from .trovo import (
     TrovoChannelVodIE,
     TrovoChannelClipIE,
 )
-from .trtcocuk import TrtCocukVideoIE
 from .trueid import TrueIDIE
 from .trunews import TruNewsIE
 from .truth import TruthIE
@@ -1977,9 +1820,6 @@ from .tv2 import (
     KatsomoIE,
     MTVUutisetArticleIE,
 )
-from .tv24ua import (
-    TV24UAVideoIE,
-)
 from .tv2dk import (
     TV2DKIE,
     TV2DKBornholmPlayIE,
@@ -2029,8 +1869,7 @@ from .tvp import (
     TVPEmbedIE,
     TVPIE,
     TVPStreamIE,
-    TVPVODSeriesIE,
+    TVPWebsiteIE,
-    TVPVODVideoIE,
 )
 from .tvplay import (
     TVPlayIE,
@@ -2061,13 +1900,8 @@ from .twitter import (
     TwitterIE,
     TwitterAmplifyIE,
     TwitterBroadcastIE,
-    TwitterSpacesIE,
     TwitterShortenerIE,
 )
-from .txxx import (
-    TxxxIE,
-    PornTopIE,
-)
 from .udemy import (
     UdemyIE,
     UdemyCourseIE
@@ -2088,8 +1922,6 @@ from .drooble import DroobleIE
 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE
-from .unscripted import UnscriptedNewsVideoIE
-from .unsupported import KnownDRMIE, KnownPiracyIE
 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,
@@ -2109,10 +1941,7 @@ from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veo import VeoIE
-from .veoh import (
+from .veoh import VeohIE
-    VeohIE,
-    VeohUserIE
-)
 from .vesti import VestiIE
 from .vevo import (
     VevoIE,
@@ -2138,13 +1967,6 @@ from .videocampus_sachsen import (
 )
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
-from .videoken import (
-    VideoKenIE,
-    VideoKenPlayerIE,
-    VideoKenPlaylistIE,
-    VideoKenCategoryIE,
-    VideoKenTopicIE,
-)
 from .videomore import (
     VideomoreIE,
     VideomoreVideoIE,
@@ -2157,6 +1979,7 @@ from .vidio import (
     VidioLiveIE
 )
 from .vidlii import VidLiiIE
+from .vier import VierIE, VierVideosIE
 from .viewlift import (
     ViewLiftIE,
     ViewLiftEmbedIE,
@@ -2169,7 +1992,6 @@ from .vimeo import (
     VimeoGroupsIE,
     VimeoLikesIE,
     VimeoOndemandIE,
-    VimeoProIE,
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,
@@ -2193,14 +2015,17 @@ from .viu import (
     ViuIE,
     ViuPlaylistIE,
     ViuOTTIE,
-    ViuOTTIndonesiaIE,
 )
 from .vk import (
     VKIE,
     VKUserVideosIE,
     VKWallPostIE,
 )
-from .vocaroo import VocarooIE
+from .vlive import (
+    VLiveIE,
+    VLivePostIE,
+    VLiveChannelIE,
+)
 from .vodlocker import VodlockerIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
@@ -2209,7 +2034,6 @@ from .voicy import (
     VoicyIE,
     VoicyChannelIE,
 )
-from .volejtv import VolejTVIE
 from .voot import (
     VootIE,
     VootSeriesIE,
@@ -2255,7 +2079,6 @@ from .wdr import (
     WDRElefantIE,
     WDRMobileIE,
 )
-from .webcamerapl import WebcameraplIE
 from .webcaster import (
     WebcasterIE,
     WebcasterFeedIE,
@@ -2269,6 +2092,7 @@ from .weibo import (
     WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
+from .wetv import WeTvEpisodeIE, WeTvSeriesIE
 from .wikimedia import WikimediaIE
 from .willow import WillowIE
 from .wimtv import WimTVIE
@@ -2276,27 +2100,17 @@ from .whowatch import WhoWatchIE
 from .wistia import (
     WistiaIE,
     WistiaPlaylistIE,
-    WistiaChannelIE,
-)
-from .wordpress import (
-    WordpressPlaylistEmbedIE,
-    WordpressMiniAudioPlayerEmbedIE,
 )
 from .worldstarhiphop import WorldStarHipHopIE
 from .wppilot import (
     WPPilotIE,
     WPPilotChannelsIE,
 )
-from .wrestleuniverse import (
-    WrestleUniverseVODIE,
-    WrestleUniversePPVIE,
-)
 from .wsj import (
     WSJIE,
     WSJArticleIE,
 )
 from .wwe import WWEIE
-from .xanimu import XanimuIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE
@@ -2305,6 +2119,12 @@ from .xhamster import (
     XHamsterEmbedIE,
     XHamsterUserIE,
 )
+from .xiami import (
+    XiamiSongIE,
+    XiamiAlbumIE,
+    XiamiArtistIE,
+    XiamiCollectionIE
+)
 from .ximalaya import (
     XimalayaIE,
     XimalayaAlbumIE
@@ -2339,10 +2159,8 @@ from .yandexvideo import (
     ZenYandexChannelIE,
 )
 from .yapfiles import YapFilesIE
-from .yappy import YappyIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
-from .yle_areena import YleAreenaIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import (
@@ -2357,6 +2175,28 @@ from .younow import (
 from .youporn import YouPornIE
 from .yourporn import YourPornIE
 from .yourupload import YourUploadIE
+from .youtube import (
+    YoutubeIE,
+    YoutubeClipIE,
+    YoutubeFavouritesIE,
+    YoutubeNotificationsIE,
+    YoutubeHistoryIE,
+    YoutubeTabIE,
+    YoutubeLivestreamEmbedIE,
+    YoutubePlaylistIE,
+    YoutubeRecommendedIE,
+    YoutubeSearchDateIE,
+    YoutubeSearchIE,
+    YoutubeSearchURLIE,
+    YoutubeMusicSearchURLIE,
+    YoutubeSubscriptionsIE,
+    YoutubeStoriesIE,
+    YoutubeTruncatedIDIE,
+    YoutubeTruncatedURLIE,
+    YoutubeYtBeIE,
+    YoutubeYtUserIE,
+    YoutubeWatchLaterIE,
+)
 from .zapiks import ZapiksIE
 from .zattoo import (
     BBVTVIE,
@@ -2405,7 +2245,6 @@ from .zee5 import (
     Zee5IE,
     Zee5SeriesIE,
 )
-from .zeenews import ZeeNewsIE
 from .zhihu import ZhihuIE
 from .zingmp3 import (
     ZingMp3IE,

yt_dlp/extractor/abc.py

@@ -155,6 +155,8 @@ class ABCIE(InfoExtractor):
                 'format_id': format_id
             })
 
+        self._sort_formats(formats)
+
         return {
             'id': video_id,
             'title': self._og_search_title(webpage),
@@ -219,6 +221,7 @@ class ABCIViewIE(InfoExtractor):
                 entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
             if formats:
                 break
+        self._sort_formats(formats)
 
         subtitles = {}
         src_vtt = stream.get('captions', {}).get('src-vtt')

yt_dlp/extractor/abcotvs.py

@@ -78,6 +78,7 @@ class ABCOTVSIE(InfoExtractor):
                 'url': mp4_url,
                 'width': 640,
             })
+        self._sort_formats(formats)
 
         image = video.get('image') or {}
 
@@ -118,6 +119,7 @@ class ABCOTVSClipsIE(InfoExtractor):
         title = video_data['title']
         formats = self._extract_m3u8_formats(
             video_data['videoURL'].split('?')[0], video_id, 'mp4')
+        self._sort_formats(formats)
 
         return {
             'id': video_id,

yt_dlp/extractor/abematv.py

@@ -156,7 +156,7 @@ class AbemaTVBaseIE(InfoExtractor):
     def _generate_aks(cls, deviceid):
         deviceid = deviceid.encode('utf-8')
         # add 1 hour and then drop minute and secs
-        ts_1hour = int((time_seconds() // 3600 + 1) * 3600)
+        ts_1hour = int((time_seconds(hours=9) // 3600 + 1) * 3600)
         time_struct = time.gmtime(ts_1hour)
         ts_1hour_str = str(ts_1hour).encode('utf-8')
 
@@ -190,16 +190,6 @@ class AbemaTVBaseIE(InfoExtractor):
         if self._USERTOKEN:
             return self._USERTOKEN
 
-        username, _ = self._get_login_info()
-        AbemaTVBaseIE._USERTOKEN = username and self.cache.load(self._NETRC_MACHINE, username)
-        if AbemaTVBaseIE._USERTOKEN:
-            # try authentication with locally stored token
-            try:
-                self._get_media_token(True)
-                return
-            except ExtractorError as e:
-                self.report_warning(f'Failed to login with cached user token; obtaining a fresh one ({e})')
-
         AbemaTVBaseIE._DEVICE_ID = str(uuid.uuid4())
         aks = self._generate_aks(self._DEVICE_ID)
         user_data = self._download_json(
@@ -310,11 +300,6 @@ class AbemaTVIE(AbemaTVBaseIE):
     _TIMETABLE = None
 
     def _perform_login(self, username, password):
-        self._get_device_token()
-        if self.cache.load(self._NETRC_MACHINE, username) and self._get_media_token():
-            self.write_debug('Skipping logging in')
-            return
-
         if '@' in username:  # don't strictly check if it's email address or not
             ep, method = 'user/email', 'email'
         else:
@@ -334,7 +319,6 @@ class AbemaTVIE(AbemaTVBaseIE):
 
         AbemaTVBaseIE._USERTOKEN = login_response['token']
         self._get_media_token(True)
-        self.cache.store(self._NETRC_MACHINE, username, AbemaTVBaseIE._USERTOKEN)
 
     def _real_extract(self, url):
         # starting download using infojson from this extractor is undefined behavior,
@@ -432,7 +416,7 @@ class AbemaTVIE(AbemaTVBaseIE):
                 f'https://api.abema.io/v1/video/programs/{video_id}', video_id,
                 note='Checking playability',
                 headers=headers)
-            ondemand_types = traverse_obj(api_response, ('terms', ..., 'onDemandType'))
+            ondemand_types = traverse_obj(api_response, ('terms', ..., 'onDemandType'), default=[])
             if 3 not in ondemand_types:
                 # cannot acquire decryption key for these streams
                 self.report_warning('This is a premium-only stream')
@@ -505,7 +489,7 @@ class AbemaTVTitleIE(AbemaTVBaseIE):
             })
         yield from (
             self.url_result(f'https://abema.tv/video/episode/{x}')
-            for x in traverse_obj(programs, ('programs', ..., 'id')))
+            for x in traverse_obj(programs, ('programs', ..., 'id'), default=[]))
 
     def _entries(self, playlist_id, series_version):
         return OnDemandPagedList(

yt_dlp/extractor/acfun.py

@@ -27,6 +27,7 @@ class AcFunVideoBaseIE(InfoExtractor):
                     **parse_codecs(video.get('codecs', ''))
                 })
 
+        self._sort_formats(formats)
         return {
             'id': video_id,
             'formats': formats,
@@ -83,7 +84,7 @@ class AcFunVideoIE(AcFunVideoBaseIE):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(url, video_id)
-        json_all = self._search_json(r'window.videoInfo\s*=', webpage, 'videoInfo', video_id)
+        json_all = self._search_json(r'window.videoInfo\s*=\s*', webpage, 'videoInfo', video_id)
 
         title = json_all.get('title')
         video_list = json_all.get('videoList') or []
@@ -160,10 +161,10 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         ac_idx = parse_qs(url).get('ac', [None])[-1]
-        video_id = f'{video_id}{format_field(ac_idx, None, "__%s")}'
+        video_id = f'{video_id}{format_field(ac_idx, template="__%s")}'
 
         webpage = self._download_webpage(url, video_id)
-        json_bangumi_data = self._search_json(r'window.bangumiData\s*=', webpage, 'bangumiData', video_id)
+        json_bangumi_data = self._search_json(r'window.bangumiData\s*=\s*', webpage, 'bangumiData', video_id)
 
         if ac_idx:
             video_info = json_bangumi_data['hlVideoInfo']
@@ -180,7 +181,7 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
             if v.get('id') == season_id), 1)
 
         json_bangumi_list = self._search_json(
-            r'window\.bangumiList\s*=', webpage, 'bangumiList', video_id, fatal=False)
+            r'window\.bangumiList\s*=\s*', webpage, 'bangumiList', video_id, fatal=False)
         video_internal_id = int_or_none(traverse_obj(json_bangumi_data, ('currentVideoInfo', 'id')))
         episode_number = video_internal_id and next((
             idx for idx, v in enumerate(json_bangumi_list.get('items') or [], 1)

yt_dlp/extractor/adn.py

@@ -28,34 +28,30 @@ from ..utils import (
 
 
 class ADNIE(InfoExtractor):
-    IE_DESC = 'Animation Digital Network'
+    IE_DESC = 'Anime Digital Network'
-    _VALID_URL = r'https?://(?:www\.)?(?:animation|anime)digitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?animedigitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
-    _TESTS = [{
+    _TEST = {
-        'url': 'https://animationdigitalnetwork.fr/video/fruits-basket/9841-episode-1-a-ce-soir',
+        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'md5': '1c9ef066ceb302c86f80c2b371615261',
+        'md5': '0319c99885ff5547565cacb4f3f9348d',
         'info_dict': {
-            'id': '9841',
+            'id': '7778',
             'ext': 'mp4',
-            'title': 'Fruits Basket - Episode 1',
+            'title': 'Blue Exorcist - Kyôto Saga - Episode 1',
-            'description': 'md5:14be2f72c3c96809b0ca424b0097d336',
+            'description': 'md5:2f7b5aa76edbc1a7a92cedcda8a528d5',
-            'series': 'Fruits Basket',
+            'series': 'Blue Exorcist - Kyôto Saga',
-            'duration': 1437,
+            'duration': 1467,
-            'release_date': '20190405',
+            'release_date': '20170106',
             'comment_count': int,
             'average_rating': float,
-            'season_number': 1,
+            'season_number': 2,
-            'episode': 'À ce soir !',
+            'episode': 'Début des hostilités',
             'episode_number': 1,
-        },
+        }
-        'skip': 'Only available in region (FR, ...)',
+    }
-    }, {
-        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'only_matching': True,
-    }]
 
-    _NETRC_MACHINE = 'animationdigitalnetwork'
+    _NETRC_MACHINE = 'animedigitalnetwork'
-    _BASE = 'animationdigitalnetwork.fr'
+    _BASE_URL = 'http://animedigitalnetwork.fr'
-    _API_BASE_URL = 'https://gw.api.' + _BASE + '/'
+    _API_BASE_URL = 'https://gw.api.animedigitalnetwork.fr/'
     _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
     _HEADERS = {}
     _LOGIN_ERR_MESSAGE = 'Unable to log in'
@@ -79,11 +75,11 @@ class ADNIE(InfoExtractor):
         if subtitle_location:
             enc_subtitles = self._download_webpage(
                 subtitle_location, video_id, 'Downloading subtitles data',
-                fatal=False, headers={'Origin': 'https://' + self._BASE})
+                fatal=False, headers={'Origin': 'https://animedigitalnetwork.fr'})
         if not enc_subtitles:
             return None
 
-        # http://animationdigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
+        # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
         dec_subtitles = unpad_pkcs7(aes_cbc_decrypt_bytes(
             compat_b64decode(enc_subtitles[24:]),
             binascii.unhexlify(self._K + '7fac1178830cfe0c'),
@@ -168,7 +164,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             }, data=b'')['token']
 
         links_url = try_get(options, lambda x: x['video']['url']) or (video_base_url + 'link')
-        self._K = ''.join(random.choices('0123456789abcdef', k=16))
+        self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
         message = bytes_to_intlist(json.dumps({
             'k': self._K,
             't': token,
@@ -235,6 +231,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                     for f in m3u8_formats:
                         f['language'] = 'fr'
                 formats.extend(m3u8_formats)
+        self._sort_formats(formats)
 
         video = (self._download_json(
             self._API_BASE_URL + 'video/%s' % video_id, video_id,

yt_dlp/extractor/adobepass.py

@@ -1344,15 +1344,10 @@ MSO_INFO = {
         'username_field': 'username',
         'password_field': 'password',
     },
-    'AlticeOne': {
-        'name': 'Optimum TV',
-        'username_field': 'j_username',
-        'password_field': 'j_password',
-    },
 }
 
 
-class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
+class AdobePassIE(InfoExtractor):
     _SERVICE_PROVIDER_TEMPLATE = 'https://sp.auth.adobe.com/adobe-services/%s'
     _USER_AGENT = 'Mozilla/5.0 (X11; Linux i686; rv:47.0) Gecko/20100101 Firefox/47.0'
     _MVPD_CACHE = 'ap-mvpd'
@@ -1710,7 +1705,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                         mso_info.get('username_field', 'username'): username,
                         mso_info.get('password_field', 'password'): password
                     }
-                    if mso_id in ('Cablevision', 'AlticeOne'):
+                    if mso_id == 'Cablevision':
                         form_data['_eventId_proceed'] = ''
                     mvpd_confirm_page_res = post_form(provider_login_page_res, 'Logging in', form_data)
                     if mso_id != 'Rogers':

yt_dlp/extractor/adobetv.py

@@ -70,6 +70,7 @@ class AdobeTVBaseIE(InfoExtractor):
                     })
                     s3_extracted = True
             formats.append(f)
+        self._sort_formats(formats)
 
         return {
             'id': video_id,
@@ -268,6 +269,7 @@ class AdobeTVVideoIE(AdobeTVBaseIE):
                 'width': int_or_none(source.get('width') or None),
                 'url': source_src,
             })
+        self._sort_formats(formats)
 
         # For both metadata and downloaded files the duration varies among
         # formats. I just pick the max one

yt_dlp/extractor/adultswim.py

@@ -180,6 +180,7 @@ class AdultSwimIE(TurnerBaseIE):
                         info['subtitles'].setdefault('en', []).append({
                             'url': asset_url,
                         })
+            self._sort_formats(info['formats'])
 
             return info
         else:

yt_dlp/extractor/aenetworks.py

@@ -8,7 +8,7 @@ from ..utils import (
 )
 
 
-class AENetworksBaseIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
+class AENetworksBaseIE(ThePlatformIE):
     _BASE_URL_REGEX = r'''(?x)https?://
         (?:(?:www|play|watch)\.)?
         (?P<domain>
@@ -62,6 +62,7 @@ class AENetworksBaseIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
             subtitles = self._merge_subtitles(subtitles, tp_subtitles)
         if last_e and not formats:
             raise last_e
+        self._sort_formats(formats)
         return {
             'id': video_id,
             'formats': formats,
@@ -303,6 +304,7 @@ class HistoryTopicIE(AENetworksBaseIE):
 class HistoryPlayerIE(AENetworksBaseIE):
     IE_NAME = 'history:player'
     _VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:history|biography)\.com)/player/(?P<id>\d+)'
+    _TESTS = []
 
     def _real_extract(self, url):
         domain, video_id = self._match_valid_url(url).groups()

yt_dlp/extractor/aeonco.py

@@ -1,40 +0,0 @@
-from .common import InfoExtractor
-from .vimeo import VimeoIE
-
-
-class AeonCoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?aeon\.co/videos/(?P<id>[^/?]+)'
-    _TESTS = [{
-        'url': 'https://aeon.co/videos/raw-solar-storm-footage-is-the-punk-rock-antidote-to-sleek-james-webb-imagery',
-        'md5': 'e5884d80552c9b6ea8d268a258753362',
-        'info_dict': {
-            'id': '1284717',
-            'ext': 'mp4',
-            'title': 'Brilliant Noise',
-            'thumbnail': 'https://i.vimeocdn.com/video/21006315-1a1e49da8b07fd908384a982b4ba9ff0268c509a474576ebdf7b1392f4acae3b-d_960',
-            'uploader': 'Semiconductor',
-            'uploader_id': 'semiconductor',
-            'uploader_url': 'https://vimeo.com/semiconductor',
-            'duration': 348
-        }
-    }, {
-        'url': 'https://aeon.co/videos/dazzling-timelapse-shows-how-microbes-spoil-our-food-and-sometimes-enrich-it',
-        'md5': '4e5f3dad9dbda0dbfa2da41a851e631e',
-        'info_dict': {
-            'id': '728595228',
-            'ext': 'mp4',
-            'title': 'Wrought',
-            'thumbnail': 'https://i.vimeocdn.com/video/1484618528-c91452611f9a4e4497735a533da60d45b2fe472deb0c880f0afaab0cd2efb22a-d_1280',
-            'uploader': 'Biofilm Productions',
-            'uploader_id': 'user140352216',
-            'uploader_url': 'https://vimeo.com/user140352216',
-            'duration': 1344
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        vimeo_id = self._search_regex(r'hosterId":\s*"(?P<id>[0-9]+)', webpage, 'vimeo id')
-        vimeo_url = VimeoIE._smuggle_referrer(f'https://player.vimeo.com/video/{vimeo_id}', 'https://aeon.co')
-        return self.url_result(vimeo_url, VimeoIE)

yt_dlp/extractor/afreecatv.py

@@ -338,6 +338,7 @@ class AfreecaTVIE(InfoExtractor):
                     }]
                 if not formats and not self.get_param('ignore_no_formats'):
                     continue
+                self._sort_formats(formats)
                 file_info = common_entry.copy()
                 file_info.update({
                     'id': format_id,
@@ -379,7 +380,7 @@ class AfreecaTVIE(InfoExtractor):
         return info
 
 
-class AfreecaTVLiveIE(AfreecaTVIE):  # XXX: Do not subclass from concrete IE
+class AfreecaTVLiveIE(AfreecaTVIE):
 
     IE_NAME = 'afreecatv:live'
     _VALID_URL = r'https?://play\.afreeca(?:tv)?\.com/(?P<id>[^/]+)(?:/(?P<bno>\d+))?'
@@ -463,6 +464,8 @@ class AfreecaTVLiveIE(AfreecaTVIE):  # XXX: Do not subclass from concrete IE
                     'quality': quality_key(quality_str),
                 })
 
+        self._sort_formats(formats)
+
         station_info = self._download_json(
             'https://st.afreecatv.com/api/get_station_status.php', broadcast_no,
             query={'szBjId': broadcaster_id}, fatal=False,

yt_dlp/extractor/agora.py

@@ -1,251 +0,0 @@
-import functools
-import uuid
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    OnDemandPagedList,
-    int_or_none,
-    month_by_name,
-    parse_duration,
-    try_call,
-)
-
-
-class WyborczaVideoIE(InfoExtractor):
-    # this id is not an article id, it has to be extracted from the article
-    _VALID_URL = r'(?:wyborcza:video:|https?://wyborcza\.pl/(?:api-)?video/)(?P<id>\d+)'
-    IE_NAME = 'wyborcza:video'
-    _TESTS = [{
-        'url': 'wyborcza:video:26207634',
-        'info_dict': {
-            'id': '26207634',
-            'ext': 'mp4',
-            'title': '- Polska w 2020 r. jest innym państwem niż w 2015 r. Nie zmieniła się konstytucja, ale jest to już inny ustrój - mówi Adam Bodnar',
-            'description': ' ',
-            'uploader': 'Dorota Roman',
-            'duration': 2474,
-            'thumbnail': r're:https://.+\.jpg',
-        },
-    }, {
-        'url': 'https://wyborcza.pl/video/26207634',
-        'only_matching': True,
-    }, {
-        'url': 'https://wyborcza.pl/api-video/26207634',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        meta = self._download_json(f'https://wyborcza.pl/api-video/{video_id}', video_id)
-
-        formats = []
-        base_url = meta['redirector'].replace('http://', 'https://') + meta['basePath']
-        for quality in ('standard', 'high'):
-            if not meta['files'].get(quality):
-                continue
-            formats.append({
-                'url': base_url + meta['files'][quality],
-                'height': int_or_none(
-                    self._search_regex(
-                        r'p(\d+)[a-z]+\.mp4$', meta['files'][quality],
-                        'mp4 video height', default=None)),
-                'format_id': quality,
-            })
-        if meta['files'].get('dash'):
-            formats.extend(self._extract_mpd_formats(base_url + meta['files']['dash'], video_id))
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': meta.get('title'),
-            'description': meta.get('lead'),
-            'uploader': meta.get('signature'),
-            'thumbnail': meta.get('imageUrl'),
-            'duration': meta.get('duration'),
-        }
-
-
-class WyborczaPodcastIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?(?:
-            wyborcza\.pl/podcast(?:/0,172673\.html)?|
-            wysokieobcasy\.pl/wysokie-obcasy/0,176631\.html
-        )(?:\?(?:[^&#]+?&)*podcast=(?P<id>\d+))?
-    '''
-    _TESTS = [{
-        'url': 'https://wyborcza.pl/podcast/0,172673.html?podcast=100720#S.main_topic-K.C-B.6-L.1.podcast',
-        'info_dict': {
-            'id': '100720',
-            'ext': 'mp3',
-            'title': 'Cyfrodziewczyny. Kim były pionierki polskiej informatyki ',
-            'uploader': 'Michał Nogaś ',
-            'upload_date': '20210117',
-            'description': 'md5:49f0a06ffc4c1931210d3ab1416a651d',
-            'duration': 3684.0,
-            'thumbnail': r're:https://.+\.jpg',
-        },
-    }, {
-        'url': 'https://www.wysokieobcasy.pl/wysokie-obcasy/0,176631.html?podcast=100673',
-        'info_dict': {
-            'id': '100673',
-            'ext': 'mp3',
-            'title': 'Czym jest ubóstwo menstruacyjne i dlaczego dotyczy każdej i każdego z nas?',
-            'uploader': 'Agnieszka Urazińska ',
-            'upload_date': '20210115',
-            'description': 'md5:c161dc035f8dbb60077011fc41274899',
-            'duration': 1803.0,
-            'thumbnail': r're:https://.+\.jpg',
-        },
-    }, {
-        'url': 'https://wyborcza.pl/podcast',
-        'info_dict': {
-            'id': '334',
-            'title': 'Gościnnie: Wyborcza, 8:10',
-            'series': 'Gościnnie: Wyborcza, 8:10',
-        },
-        'playlist_mincount': 370,
-    }, {
-        'url': 'https://www.wysokieobcasy.pl/wysokie-obcasy/0,176631.html',
-        'info_dict': {
-            'id': '395',
-            'title': 'Gościnnie: Wysokie Obcasy',
-            'series': 'Gościnnie: Wysokie Obcasy',
-        },
-        'playlist_mincount': 12,
-    }]
-
-    def _real_extract(self, url):
-        podcast_id = self._match_id(url)
-
-        if not podcast_id:  # playlist
-            podcast_id = '395' if 'wysokieobcasy.pl/' in url else '334'
-            return self.url_result(TokFMAuditionIE._create_url(podcast_id), TokFMAuditionIE, podcast_id)
-
-        meta = self._download_json('https://wyborcza.pl/api/podcast', podcast_id,
-                                   query={'guid': podcast_id, 'type': 'wo' if 'wysokieobcasy.pl/' in url else None})
-
-        day, month, year = self._search_regex(r'^(\d\d?) (\w+) (\d{4})$', meta.get('publishedDate'),
-                                              'upload date', group=(1, 2, 3), default=(None, None, None))
-        return {
-            'id': podcast_id,
-            'url': meta['url'],
-            'title': meta.get('title'),
-            'description': meta.get('description'),
-            'thumbnail': meta.get('imageUrl'),
-            'duration': parse_duration(meta.get('duration')),
-            'uploader': meta.get('author'),
-            'upload_date': try_call(lambda: f'{year}{month_by_name(month, lang="pl"):0>2}{day:0>2}'),
-        }
-
-
-class TokFMPodcastIE(InfoExtractor):
-    _VALID_URL = r'(?:https?://audycje\.tokfm\.pl/podcast/|tokfm:podcast:)(?P<id>\d+),?'
-    IE_NAME = 'tokfm:podcast'
-    _TESTS = [{
-        'url': 'https://audycje.tokfm.pl/podcast/91275,-Systemowy-rasizm-Czy-zamieszki-w-USA-po-morderstwie-w-Minneapolis-doprowadza-do-zmian-w-sluzbach-panstwowych',
-        'info_dict': {
-            'id': '91275',
-            'ext': 'aac',
-            'title': 'md5:a9b15488009065556900169fb8061cce',
-            'episode': 'md5:a9b15488009065556900169fb8061cce',
-            'series': 'Analizy',
-        },
-    }]
-
-    def _real_extract(self, url):
-        media_id = self._match_id(url)
-
-        # in case it breaks see this but it returns a lot of useless data
-        # https://api.podcast.radioagora.pl/api4/getPodcasts?podcast_id=100091&with_guests=true&with_leaders_for_mobile=true
-        metadata = self._download_json(
-            f'https://audycje.tokfm.pl/getp/3{media_id}', media_id, 'Downloading podcast metadata')
-        if not metadata:
-            raise ExtractorError('No such podcast', expected=True)
-        metadata = metadata[0]
-
-        formats = []
-        for ext in ('aac', 'mp3'):
-            url_data = self._download_json(
-                f'https://api.podcast.radioagora.pl/api4/getSongUrl?podcast_id={media_id}&device_id={uuid.uuid4()}&ppre=false&audio={ext}',
-                media_id, 'Downloading podcast %s URL' % ext)
-            # prevents inserting the mp3 (default) multiple times
-            if 'link_ssl' in url_data and f'.{ext}' in url_data['link_ssl']:
-                formats.append({
-                    'url': url_data['link_ssl'],
-                    'ext': ext,
-                    'vcodec': 'none',
-                    'acodec': ext,
-                })
-
-        return {
-            'id': media_id,
-            'formats': formats,
-            'title': metadata.get('podcast_name'),
-            'series': metadata.get('series_name'),
-            'episode': metadata.get('podcast_name'),
-        }
-
-
-class TokFMAuditionIE(InfoExtractor):
-    _VALID_URL = r'(?:https?://audycje\.tokfm\.pl/audycja/|tokfm:audition:)(?P<id>\d+),?'
-    IE_NAME = 'tokfm:audition'
-    _TESTS = [{
-        'url': 'https://audycje.tokfm.pl/audycja/218,Analizy',
-        'info_dict': {
-            'id': '218',
-            'title': 'Analizy',
-            'series': 'Analizy',
-        },
-        'playlist_count': 1635,
-    }]
-
-    _PAGE_SIZE = 30
-    _HEADERS = {
-        'User-Agent': 'Mozilla/5.0 (Linux; Android 9; Redmi 3S Build/PQ3A.190801.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.101 Mobile Safari/537.36',
-    }
-
-    @staticmethod
-    def _create_url(id):
-        return f'https://audycje.tokfm.pl/audycja/{id}'
-
-    def _real_extract(self, url):
-        audition_id = self._match_id(url)
-
-        data = self._download_json(
-            f'https://api.podcast.radioagora.pl/api4/getSeries?series_id={audition_id}',
-            audition_id, 'Downloading audition metadata', headers=self._HEADERS)
-        if not data:
-            raise ExtractorError('No such audition', expected=True)
-        data = data[0]
-
-        entries = OnDemandPagedList(functools.partial(
-            self._fetch_page, audition_id, data), self._PAGE_SIZE)
-
-        return {
-            '_type': 'playlist',
-            'id': audition_id,
-            'title': data.get('series_name'),
-            'series': data.get('series_name'),
-            'entries': entries,
-        }
-
-    def _fetch_page(self, audition_id, data, page):
-        for retry in self.RetryManager():
-            podcast_page = self._download_json(
-                f'https://api.podcast.radioagora.pl/api4/getPodcasts?series_id={audition_id}&limit=30&offset={page}&with_guests=true&with_leaders_for_mobile=true',
-                audition_id, f'Downloading podcast list page {page + 1}', headers=self._HEADERS)
-            if not podcast_page:
-                retry.error = ExtractorError('Agora returned empty page', expected=True)
-
-        for podcast in podcast_page:
-            yield {
-                '_type': 'url_transparent',
-                'url': podcast['podcast_sharing_url'],
-                'ie_key': TokFMPodcastIE.ie_key(),
-                'title': podcast.get('podcast_name'),
-                'episode': podcast.get('podcast_name'),
-                'description': podcast.get('podcast_description'),
-                'timestamp': int_or_none(podcast.get('podcast_timestamp')),
-                'series': data.get('series_name'),
-            }

yt_dlp/extractor/airtv.py

@@ -1,96 +0,0 @@
-from .common import InfoExtractor
-from .youtube import YoutubeIE
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    mimetype2ext,
-    parse_iso8601,
-    traverse_obj
-)
-
-
-class AirTVIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.air\.tv/watch\?v=(?P<id>\w+)'
-    _TESTS = [{
-        # without youtube_id
-        'url': 'https://www.air.tv/watch?v=W87jcWleSn2hXZN47zJZsQ',
-        'info_dict': {
-            'id': 'W87jcWleSn2hXZN47zJZsQ',
-            'ext': 'mp4',
-            'release_date': '20221003',
-            'release_timestamp': 1664792603,
-            'channel_id': 'vgfManQlRQKgoFQ8i8peFQ',
-            'title': 'md5:c12d49ed367c3dadaa67659aff43494c',
-            'upload_date': '20221003',
-            'duration': 151,
-            'view_count': int,
-            'thumbnail': 'https://cdn-sp-gcs.air.tv/videos/W/8/W87jcWleSn2hXZN47zJZsQ/b13fc56464f47d9d62a36d110b9b5a72-4096x2160_9.jpg',
-            'timestamp': 1664792603,
-        }
-    }, {
-        # with youtube_id
-        'url': 'https://www.air.tv/watch?v=sv57EC8tRXG6h8dNXFUU1Q',
-        'info_dict': {
-            'id': '2ZTqmpee-bQ',
-            'ext': 'mp4',
-            'comment_count': int,
-            'tags': 'count:11',
-            'channel_follower_count': int,
-            'like_count': int,
-            'uploader': 'Newsflare',
-            'thumbnail': 'https://i.ytimg.com/vi_webp/2ZTqmpee-bQ/maxresdefault.webp',
-            'availability': 'public',
-            'title': 'Geese Chase Alligator Across Golf Course',
-            'uploader_id': 'NewsflareBreaking',
-            'channel_url': 'https://www.youtube.com/channel/UCzSSoloGEz10HALUAbYhngQ',
-            'description': 'md5:99b21d9cea59330149efbd9706e208f5',
-            'age_limit': 0,
-            'channel_id': 'UCzSSoloGEz10HALUAbYhngQ',
-            'uploader_url': 'http://www.youtube.com/user/NewsflareBreaking',
-            'view_count': int,
-            'categories': ['News & Politics'],
-            'live_status': 'not_live',
-            'playable_in_embed': True,
-            'channel': 'Newsflare',
-            'duration': 37,
-            'upload_date': '20180511',
-        }
-    }]
-
-    def _get_formats_and_subtitle(self, json_data, video_id):
-        formats, subtitles = [], {}
-        for source in traverse_obj(json_data, 'sources', 'sources_desktop', ...):
-            ext = determine_ext(source.get('src'), mimetype2ext(source.get('type')))
-            if ext == 'm3u8':
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(source.get('src'), video_id)
-                formats.extend(fmts)
-                self._merge_subtitles(subs, target=subtitles)
-            else:
-                formats.append({'url': source.get('src'), 'ext': ext})
-        return formats, subtitles
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-
-        nextjs_json = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['initialState']['videos'][display_id]
-        if nextjs_json.get('youtube_id'):
-            return self.url_result(
-                f'https://www.youtube.com/watch?v={nextjs_json.get("youtube_id")}', YoutubeIE)
-
-        formats, subtitles = self._get_formats_and_subtitle(nextjs_json, display_id)
-        return {
-            'id': display_id,
-            'title': nextjs_json.get('title') or self._html_search_meta('og:title', webpage),
-            'formats': formats,
-            'subtitles': subtitles,
-            'description': nextjs_json.get('description') or None,
-            'duration': int_or_none(nextjs_json.get('duration')),
-            'thumbnails': [
-                {'url': thumbnail}
-                for thumbnail in traverse_obj(nextjs_json, ('default_thumbnails', ...))],
-            'channel_id': traverse_obj(nextjs_json, 'channel', 'channel_slug'),
-            'timestamp': parse_iso8601(nextjs_json.get('created')),
-            'release_timestamp': parse_iso8601(nextjs_json.get('published')),
-            'view_count': int_or_none(nextjs_json.get('views')),
-        }