Release 2022.08.18.36

This reverts commit 6929b41a21.

.github/FUNDING.yml

@@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 
-custom: ['https://github.com/yt-dlp/yt-dlp/blob/master/Maintainers.md#maintainers']
+custom: ['https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators']

.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -1,12 +1,14 @@
-name: Broken site support
-description: Report issue with yt-dlp on a supported site
+name: Broken site
+description: Report broken or misfunctioning site
 labels: [triage, site-bug]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -14,17 +16,17 @@ body:
       description: |
         Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
       options:
-        - label: I'm reporting that yt-dlp is broken on a **supported** site
+        - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) 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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
@@ -45,13 +47,9 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -61,19 +59,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -2,11 +2,13 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -16,15 +18,15 @@ body:
       options:
         - label: I'm reporting a new site support request
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input
@@ -57,13 +59,9 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -73,19 +71,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -1,12 +1,14 @@
 name: Site feature request
-description: Request new functionality for a site supported by yt-dlp
+description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -16,13 +18,13 @@ body:
       options:
         - label: I'm requesting a site-specific feature
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
@@ -53,13 +55,9 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -69,19 +67,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -1,12 +1,14 @@
-name: Core bug report
+name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -16,11 +18,15 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - 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 read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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 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
   - type: textarea
     id: description
@@ -34,13 +40,9 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -50,19 +52,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -1,12 +1,14 @@
 name: Feature request
-description: Request a new feature unrelated to any particular site or extractor
+description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -18,11 +20,11 @@ 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 have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
   - type: textarea
     id: description
@@ -36,12 +38,8 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
   - type: textarea
     id: log
@@ -50,18 +48,18 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell

.github/ISSUE_TEMPLATE/6_question.yml

@@ -1,12 +1,14 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\* field
+          required: true
   - type: markdown
     attributes:
       value: |
@@ -24,11 +26,11 @@ 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 have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) 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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
   - type: textarea
     id: question
@@ -42,12 +44,8 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
   - type: textarea
     id: log
@@ -56,18 +54,18 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Get help on Discord
+  - name: Get help from the community on Discord
     url: https://discord.gg/H5MNcFW63r
-    about: Join the yt-dlp Discord server for support and discussion
+    about: Join the yt-dlp Discord for community-powered support!
+  - name: Matrix Bridge to the Discord server
+    url: https://matrix.to/#/#yt-dlp:matrix.org
+    about: For those who do not want to use Discord

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -1,5 +1,5 @@
-name: Broken site support
-description: Report issue with yt-dlp on a supported site
+name: Broken site
+description: Report broken or misfunctioning site
 labels: [triage, site-bug]
 body:
   %(no_skip)s
@@ -10,17 +10,17 @@ body:
       description: |
         Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
       options:
-        - label: I'm reporting that yt-dlp is broken on a **supported** site
+        - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 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), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) 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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -12,15 +12,15 @@ body:
       options:
         - label: I'm reporting a new site support request
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 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 the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -1,5 +1,5 @@
 name: Site feature request
-description: Request new functionality for a site supported by yt-dlp
+description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
   %(no_skip)s
@@ -12,13 +12,13 @@ body:
       options:
         - label: I'm requesting a site-specific feature
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -1,4 +1,4 @@
-name: Core bug report
+name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
@@ -12,11 +12,15 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - 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 read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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 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
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -1,5 +1,5 @@
 name: Feature request
-description: Request a new feature unrelated to any particular site or extractor
+description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
   %(no_skip)s
@@ -14,11 +14,11 @@ 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 have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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 the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -1,5 +1,5 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
   %(no_skip)s
@@ -20,11 +20,11 @@ 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 have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - 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), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) 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 [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+        - 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
   - type: textarea
     id: question

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,16 @@
-<!--
-    **IMPORTANT**: PRs without the template will be CLOSED
-    
-    Due to the high volume of pull requests, it may be a while before your PR is reviewed.
-    Please try to keep your pull request focused on a single bugfix or new feature.
-    Pull requests with a vast scope and/or very large diff will take much longer to review.
-    It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.
-
-    PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.
--->
+**IMPORTANT**: PRs without the template will be CLOSED
 
 ### Description of your *pull request* and other information
 
-ADD DETAILED DESCRIPTION HERE
+</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
+
+-->
+
+ADD DESCRIPTION HERE
 
 Fixes #
 
@@ -19,26 +18,26 @@ ### Description of your *pull request* and other information
 <details open><summary>Template</summary> <!-- OPEN is intentional -->
 
 <!--
-    # PLEASE FOLLOW THE GUIDE BELOW
 
-    - You will be asked some questions, please read them **carefully** and answer honestly
-    - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])
-    - Use *Preview* tab to see what your *pull request* will actually look like
+# PLEASE FOLLOW THE GUIDE BELOW
+
+- You will be asked some questions, please read them **carefully** and answer honestly
+- Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])
+- Use *Preview* tab to see how your *pull request* will actually look like
+
 -->
 
 ### Before submitting a *pull request* make sure you have:
 - [ ] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)
 - [ ] [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 those that apply and remove the others:
-- [ ] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)
-- [ ] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
-- [ ] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+### 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)
 
-### What is the purpose of your *pull request*? Check those that apply and remove the others:
+### What is the purpose of your *pull request*?
 - [ ] Fix or improvement to an extractor (Make sure to add/update tests)
 - [ ] 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/actionlint.yml

@@ -1,28 +0,0 @@
-self-hosted-runner:
-  labels:
-    # Workaround for the outdated runner list in actionlint v1.7.7
-    # Ref: https://github.com/rhysd/actionlint/issues/533
-    - windows-11-arm
-
-config-variables:
-  - KEEP_CACHE_WARM
-  - PUSH_VERSION_COMMIT
-  - UPDATE_TO_VERIFICATION
-  - PYPI_PROJECT
-  - PYPI_SUFFIX
-  - NIGHTLY_PYPI_PROJECT
-  - NIGHTLY_PYPI_SUFFIX
-  - NIGHTLY_ARCHIVE_REPO
-  - BUILD_NIGHTLY
-  - MASTER_PYPI_PROJECT
-  - MASTER_PYPI_SUFFIX
-  - MASTER_ARCHIVE_REPO
-  - BUILD_MASTER
-  - ISSUE_LOCKDOWN
-  - SANITIZE_COMMENT
-
-paths:
-  .github/workflows/build.yml:
-    ignore:
-      # SC1090 "Can't follow non-constant source": ignore when using `source` to activate venv
-      - '.+SC1090.+'

.github/workflows/build.yml

@@ -1,616 +1,324 @@
-name: Build Artifacts
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      channel:
-        required: false
-        default: stable
-        type: string
-      origin:
-        required: true
-        type: string
-      unix:
-        default: true
-        type: boolean
-      linux:
-        default: true
-        type: boolean
-      linux_armv7l:
-        default: true
-        type: boolean
-      musllinux:
-        default: true
-        type: boolean
-      macos:
-        default: true
-        type: boolean
-      windows:
-        default: true
-        type: boolean
-    secrets:
-      GPG_SIGNING_KEY:
-        required: false
-
-  workflow_dispatch:
-    inputs:
-      version:
-        description: |
-          VERSION: yyyy.mm.dd[.rev] or rev
-          (default: auto-generated)
-        required: false
-        default: ''
-        type: string
-      channel:
-        description: |
-          SOURCE of this build's updates: stable/nightly/master/<repo>
-        required: true
-        default: stable
-        type: string
-      unix:
-        description: yt-dlp, yt-dlp.tar.gz
-        default: true
-        type: boolean
-      linux:
-        description: yt-dlp_linux, yt-dlp_linux.zip, yt-dlp_linux_aarch64, yt-dlp_linux_aarch64.zip
-        default: true
-        type: boolean
-      linux_armv7l:
-        description: yt-dlp_linux_armv7l.zip
-        default: true
-        type: boolean
-      musllinux:
-        description: yt-dlp_musllinux, yt-dlp_musllinux.zip, yt-dlp_musllinux_aarch64, yt-dlp_musllinux_aarch64.zip
-        default: true
-        type: boolean
-      macos:
-        description: yt-dlp_macos, yt-dlp_macos.zip
-        default: true
-        type: boolean
-      windows:
-        description: yt-dlp.exe, yt-dlp_win.zip, yt-dlp_x86.exe, yt-dlp_win_x86.zip, yt-dlp_arm64.exe, yt-dlp_win_arm64.zip
-        default: true
-        type: boolean
-
-permissions:
-  contents: read
+name: Build
+on: workflow_dispatch
 
 jobs:
-  process:
+  prepare:
     runs-on: ubuntu-latest
     outputs:
-      origin: ${{ steps.process_inputs.outputs.origin }}
-      timestamp: ${{ steps.process_inputs.outputs.timestamp }}
-      version: ${{ steps.process_inputs.outputs.version }}
-      linux_matrix: ${{ steps.linux_matrix.outputs.matrix }}
+      version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
+      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
+      head_sha: ${{ steps.push_release.outputs.head_sha }}
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-python@v4
+      with:
+          python-version: '3.10'
+
+    - name: Set version suffix
+      id: version_suffix
+      env:
+        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
+      if: "env.PUSH_VERSION_COMMIT == ''"
+      run: echo ::set-output name=version_suffix::$(date -u +"%H%M%S")
+    - name: Bump version
+      id: bump_version
+      run: |
+        python devscripts/update-version.py ${{ steps.version_suffix.outputs.version_suffix }}
+        make issuetemplates
+
+    - name: Push to release
+      id: push_release
+      run: |
+        git config --global user.name github-actions
+        git config --global user.email github-actions@example.com
+        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 ::set-output name=head_sha::$(git rev-parse HEAD)
+    - name: Update master
+      env:
+        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
+      if: "env.PUSH_VERSION_COMMIT != ''"
+      run: git push origin ${{ github.event.ref }}
+
+
+  build_unix:
+    needs: prepare
+    runs-on: ubuntu-18.04  # Standalone executable should be built on minimum supported OS
 
     steps:
-      - name: Process inputs
-        id: process_inputs
-        env:
-          INPUTS: ${{ toJSON(inputs) }}
-          REPOSITORY: ${{ github.repository }}
-        shell: python
-        run: |
-          import datetime as dt
-          import json
-          import os
-          import re
-          INPUTS = json.loads(os.environ['INPUTS'])
-          timestamp = dt.datetime.now(tz=dt.timezone.utc).strftime('%Y.%m.%d.%H%M%S.%f')
-          version = INPUTS.get('version')
-          if version and '.' not in version:
-              # build.yml was dispatched with only a revision as the version input value
-              version_parts = [*timestamp.split('.')[:3], version]
-          elif not version:
-              # build.yml was dispatched without any version input value, so include .HHMMSS revision
-              version_parts = timestamp.split('.')[:4]
-          else:
-              # build.yml was called or dispatched with a complete version input value
-              version_parts = version.split('.')
-          assert all(re.fullmatch(r'[0-9]+', part) for part in version_parts), 'Version must be numeric'
-          outputs = {
-              'origin': INPUTS.get('origin') or os.environ['REPOSITORY'],
-              'timestamp': timestamp,
-              'version': '.'.join(version_parts),
-          }
-          print(json.dumps(outputs, indent=2))
-          with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-              f.write('\n'.join(f'{key}={value}' for key, value in outputs.items()))
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+          python-version: '3.10'
+    - name: Install Requirements
+      run: |
+          sudo apt-get -y install zip pandoc man
+          python -m pip install --upgrade pip setuptools wheel twine
+          python -m pip install Pyinstaller -r requirements.txt
 
-      - name: Build Linux matrix
-        id: linux_matrix
-        env:
-          INPUTS: ${{ toJSON(inputs) }}
-          PYTHON_VERSION: '3.13'
-          UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
-        shell: python
-        run: |
-          import json
-          import os
-          EXE_MAP = {
-              'linux': [{
-                  'os': 'linux',
-                  'arch': 'x86_64',
-                  'runner': 'ubuntu-24.04',
-              }, {
-                  'os': 'linux',
-                  'arch': 'aarch64',
-                  'runner': 'ubuntu-24.04-arm',
-              }],
-              'linux_armv7l': [{
-                  'os': 'linux',
-                  'arch': 'armv7l',
-                  'runner': 'ubuntu-24.04-arm',
-                  'qemu_platform': 'linux/arm/v7',
-                  'onefile': False,
-                  'cache_requirements': True,
-                  'update_to': 'yt-dlp/yt-dlp@2023.03.04',
-              }],
-              'musllinux': [{
-                  'os': 'musllinux',
-                  'arch': 'x86_64',
-                  'runner': 'ubuntu-24.04',
-                  'python_version': '3.14',
-              }, {
-                  'os': 'musllinux',
-                  'arch': 'aarch64',
-                  'runner': 'ubuntu-24.04-arm',
-                  'python_version': '3.14',
-              }],
-          }
-          INPUTS = json.loads(os.environ['INPUTS'])
-          matrix = [exe for key, group in EXE_MAP.items() for exe in group if INPUTS.get(key)]
-          if not matrix:
-              # If we send an empty matrix when no linux inputs are given, the entire workflow fails
-              matrix = [EXE_MAP['linux'][0]]
-          for exe in matrix:
-              exe['exe'] = '_'.join(filter(None, (
-                  'yt-dlp',
-                  exe['os'],
-                  exe['arch'] != 'x86_64' and exe['arch'],
-              )))
-              exe.setdefault('qemu_platform', None)
-              exe.setdefault('onefile', True)
-              exe.setdefault('onedir', True)
-              exe.setdefault('cache_requirements', False)
-              exe.setdefault('python_version', os.environ['PYTHON_VERSION'])
-              exe.setdefault('update_to', os.environ['UPDATE_TO'])
-          if not any(INPUTS.get(key) for key in EXE_MAP):
-              print('skipping linux job')
-          else:
-              print(json.dumps(matrix, indent=2))
-          with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-              f.write(f'matrix={json.dumps(matrix)}')
-
-  unix:
-    needs: process
-    if: inputs.unix
-    runs-on: ubuntu-latest
-    env:
-      CHANNEL: ${{ inputs.channel }}
-      ORIGIN: ${{ needs.process.outputs.origin }}
-      VERSION: ${{ needs.process.outputs.version }}
-      UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
-
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0  # Needed for changelog
-
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.10"
-
-      - name: Install Requirements
-        run: |
-          sudo apt -y install zip pandoc man sed
-
-      - name: Prepare
-        run: |
-          python devscripts/update-version.py -c "${CHANNEL}" -r "${ORIGIN}" "${VERSION}"
-          python devscripts/update_changelog.py -vv
+    - name: Prepare
+      run: |
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python devscripts/make_lazy_extractors.py
+    - name: Build Unix executables
+      run: |
+          make all tar
+          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: Build Unix platform-independent binary
-        run: |
-          make all-extra tar
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          yt-dlp
+          yt-dlp.tar.gz
+          dist/yt-dlp_linux
+          dist/yt-dlp_linux.zip
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          chmod +x ./yt-dlp
-          cp ./yt-dlp ./yt-dlp_downgraded
-          version="$(./yt-dlp --version)"
-          ./yt-dlp_downgraded -v --update-to "${UPDATE_TO}"
-          downgraded_version="$(./yt-dlp_downgraded --version)"
-          [[ "${version}" != "${downgraded_version}" ]]
+    - name: Build and publish on PyPi
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+      if: "env.TWINE_PASSWORD != ''"
+      run: |
+        rm -rf dist/*
+        python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
+        python setup.py sdist bdist_wheel
+        twine upload dist/*
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ github.job }}
-          path: |
-            yt-dlp
-            yt-dlp.tar.gz
-          compression-level: 0
+    - name: Install SSH private key for Homebrew
+      env:
+        BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
+      if: "env.BREW_TOKEN != ''"
+      uses: yt-dlp/ssh-agent@v0.5.3
+      with:
+          ssh-private-key: ${{ env.BREW_TOKEN }}
+    - name: Update Homebrew Formulae
+      env:
+        BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
+      if: "env.BREW_TOKEN != ''"
+      run: |
+        git clone git@github.com:yt-dlp/homebrew-taps taps/
+        python devscripts/update-formulae.py taps/Formula/yt-dlp.rb "${{ needs.prepare.outputs.ytdlp_version }}"
+        git -C taps/ config user.name github-actions
+        git -C taps/ config user.email github-actions@example.com
+        git -C taps/ commit -am 'yt-dlp: ${{ needs.prepare.outputs.ytdlp_version }}'
+        git -C taps/ push
 
-  linux:
-    name: ${{ matrix.os }} (${{ matrix.arch }})
-    if: inputs.linux || inputs.linux_armv7l || inputs.musllinux
-    needs: process
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.process.outputs.linux_matrix) }}
-    env:
-      CHANNEL: ${{ inputs.channel }}
-      ORIGIN: ${{ needs.process.outputs.origin }}
-      VERSION: ${{ needs.process.outputs.version }}
-      EXE_NAME: ${{ matrix.exe }}
-      PYTHON_VERSION: ${{ matrix.python_version }}
-      UPDATE_TO: ${{ (vars.UPDATE_TO_VERIFICATION && matrix.update_to) || '' }}
-      SKIP_ONEDIR_BUILD: ${{ (!matrix.onedir && '1') || '' }}
-      SKIP_ONEFILE_BUILD: ${{ (!matrix.onefile && '1') || '' }}
+
+  build_macos:
+    runs-on: macos-11
+    needs: prepare
 
     steps:
-      - uses: actions/checkout@v5
-
-      - name: Cache requirements
-        if: matrix.cache_requirements
-        id: cache-venv
-        uses: actions/cache@v4
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
-        with:
-          path: |
-            venv
-          key: cache-reqs-${{ matrix.os }}_${{ matrix.arch }}-${{ github.ref }}-${{ needs.process.outputs.timestamp }}
-          restore-keys: |
-            cache-reqs-${{ matrix.os }}_${{ matrix.arch }}-${{ github.ref }}-
-            cache-reqs-${{ matrix.os }}_${{ matrix.arch }}-
-
-      - name: Set up QEMU
-        if: matrix.qemu_platform
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: ${{ matrix.qemu_platform }}
-
-      - name: Build executable
-        env:
-          SERVICE: ${{ matrix.os }}_${{ matrix.arch }}
-        run: |
-          mkdir -p ./venv
-          mkdir -p ./dist
-          pushd bundle/docker
-          docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
-          popd
-          if [[ -z "${SKIP_ONEFILE_BUILD}" ]]; then
-            sudo chown "${USER}:docker" "./dist/${EXE_NAME}"
-          fi
-
-      - name: Verify executable in container
-        env:
-          SERVICE: ${{ matrix.os }}_${{ matrix.arch }}_verify
-        run: |
-          cd bundle/docker
-          docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ matrix.os }}_${{ matrix.arch }}
-          path: |
-            dist/${{ matrix.exe }}*
-          compression-level: 0
-
-  macos:
-    needs: process
-    if: inputs.macos
-    permissions:
-      contents: read
-    runs-on: macos-14
-    env:
-      CHANNEL: ${{ inputs.channel }}
-      ORIGIN: ${{ needs.process.outputs.origin }}
-      VERSION: ${{ needs.process.outputs.version }}
-      UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
-
-    steps:
-      - uses: actions/checkout@v5
-      # NB: Building universal2 does not work with python from actions/setup-python
-
-      - name: Cache requirements
-        id: cache-venv
-        uses: actions/cache@v4
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
-        with:
-          path: |
-            ~/yt-dlp-build-venv
-          key: cache-reqs-${{ github.job }}-${{ github.ref }}-${{ needs.process.outputs.timestamp }}
-          restore-keys: |
-            cache-reqs-${{ github.job }}-${{ github.ref }}-
-            cache-reqs-${{ github.job }}-
-
-      - name: Install Requirements
-        run: |
+    - uses: actions/checkout@v3
+    # NB: In order to create a universal2 application, the version of python3 in /usr/bin has to be used
+    - name: Install Requirements
+      run: |
           brew install coreutils
-          # We need to use system Python in order to roll our own universal2 curl_cffi wheel
-          brew uninstall --ignore-dependencies python3
-          python3 -m venv ~/yt-dlp-build-venv
-          source ~/yt-dlp-build-venv/bin/activate
-          python3 devscripts/install_deps.py --only-optional-groups --include-group build
-          python3 devscripts/install_deps.py --print --include-group pyinstaller > requirements.txt
-          # We need to ignore wheels otherwise we break universal2 builds
-          python3 -m pip install -U --no-binary :all: -r requirements.txt
-          # We need to fuse our own universal2 wheels for curl_cffi
-          python3 -m pip install -U 'delocate==0.11.0'
-          mkdir curl_cffi_whls curl_cffi_universal2
-          python3 devscripts/install_deps.py --print --only-optional-groups --include-group curl-cffi > requirements.txt
-          for platform in "macosx_11_0_arm64" "macosx_11_0_x86_64"; do
-            python3 -m pip download \
-              --only-binary=:all: \
-              --platform "${platform}" \
-              -d curl_cffi_whls \
-              -r requirements.txt
-          done
-          ( # Overwrite x86_64-only libs with fat/universal2 libs or else Pyinstaller will do the opposite
-            # See https://github.com/yt-dlp/yt-dlp/pull/10069
-            cd curl_cffi_whls
-            mkdir -p curl_cffi/.dylibs
-            python_libdir=$(python3 -c 'import sys; from pathlib import Path; print(Path(sys.path[1]).parent)')
-            for dylib in lib{ssl,crypto}.3.dylib; do
-              cp "${python_libdir}/${dylib}" "curl_cffi/.dylibs/${dylib}"
-              for wheel in curl_cffi*macos*x86_64.whl; do
-                zip "${wheel}" "curl_cffi/.dylibs/${dylib}"
-              done
-            done
-          )
-          python3 -m delocate.cmd.delocate_fuse curl_cffi_whls/curl_cffi*.whl -w curl_cffi_universal2
-          python3 -m delocate.cmd.delocate_fuse curl_cffi_whls/cffi*.whl -w curl_cffi_universal2
-          for wheel in curl_cffi_universal2/*cffi*.whl; do
-            mv -n -- "${wheel}" "${wheel/x86_64/universal2}"
-          done
-          python3 -m pip install --force-reinstall -U curl_cffi_universal2/*cffi*.whl
+          /usr/bin/python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
 
-      - name: Prepare
-        run: |
-          python3 devscripts/update-version.py -c "${CHANNEL}" -r "${ORIGIN}" "${VERSION}"
-          python3 devscripts/make_lazy_extractors.py
-      - name: Build
-        run: |
-          source ~/yt-dlp-build-venv/bin/activate
-          python3 -m bundle.pyinstaller --target-architecture universal2 --onedir
+    - name: Prepare
+      run: |
+          /usr/bin/python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+          /usr/bin/python3 devscripts/make_lazy_extractors.py
+    - name: Build
+      run: |
+          /usr/bin/python3 pyinst.py --target-architecture universal2 --onedir
           (cd ./dist/yt-dlp_macos && zip -r ../yt-dlp_macos.zip .)
-          python3 -m bundle.pyinstaller --target-architecture universal2
+          /usr/bin/python3 pyinst.py --target-architecture universal2
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          chmod +x ./dist/yt-dlp_macos
-          cp ./dist/yt-dlp_macos ./dist/yt-dlp_macos_downgraded
-          version="$(./dist/yt-dlp_macos --version)"
-          ./dist/yt-dlp_macos_downgraded -v --update-to "${UPDATE_TO}"
-          downgraded_version="$(./dist/yt-dlp_macos_downgraded --version)"
-          [[ "$version" != "$downgraded_version" ]]
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp_macos
+          dist/yt-dlp_macos.zip
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ github.job }}
-          path: |
-            dist/yt-dlp_macos
-            dist/yt-dlp_macos.zip
-          compression-level: 0
 
-  windows:
-    name: windows (${{ matrix.arch }})
-    needs: process
-    if: inputs.windows
-    permissions:
-      contents: read
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - arch: 'x64'
-          runner: windows-2025
-          python_version: '3.10'
-          platform_tag: win_amd64
-          pyi_version: '6.16.0'
-          pyi_tag: '2025.09.13.221251'
-          pyi_hash: b6496c7630c3afe66900cfa824e8234a8c2e2c81704bd7facd79586abc76c0e5
-        - arch: 'x86'
-          runner: windows-2025
-          python_version: '3.10'
-          platform_tag: win32
-          pyi_version: '6.16.0'
-          pyi_tag: '2025.09.13.221251'
-          pyi_hash: 2d881843580efdc54f3523507fc6d9c5b6051ee49c743a6d9b7003ac5758c226
-        - arch: 'arm64'
-          runner: windows-11-arm
-          python_version: '3.13'  # arm64 only has Python >= 3.11 available
-          platform_tag: win_arm64
-          pyi_version: '6.16.0'
-          pyi_tag: '2025.09.13.221251'
-          pyi_hash: 4250c9085e34a95c898f3ee2f764914fc36ec59f0d97c28e6a75fcf21f7b144f
-    env:
-      CHANNEL: ${{ inputs.channel }}
-      ORIGIN: ${{ needs.process.outputs.origin }}
-      VERSION: ${{ needs.process.outputs.version }}
-      SUFFIX: ${{ (matrix.arch != 'x64' && format('_{0}', matrix.arch)) || '' }}
-      UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
-      BASE_CACHE_KEY: cache-reqs-${{ github.job }}_${{ matrix.arch }}-${{ matrix.python_version }}
-      PYI_REPO: https://github.com/yt-dlp/Pyinstaller-Builds
-      PYI_WHEEL: pyinstaller-${{ matrix.pyi_version }}-py3-none-${{ matrix.platform_tag }}.whl
+  build_macos_legacy:
+    runs-on: macos-latest
+    needs: prepare
 
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6
-        with:
-          python-version: ${{ matrix.python_version }}
-          architecture: ${{ matrix.arch }}
+    - uses: actions/checkout@v3
+    - name: Install Python
+      # We need the official Python, because the GA ones only support newer macOS versions
+      env:
+        PYTHON_VERSION: 3.10.5
+        MACOSX_DEPLOYMENT_TARGET: 10.9  # Used up by the Python build tools
+      run: |
+          # Hack to get the latest patch version. Uncomment if needed
+          #brew install python@3.10
+          #export PYTHON_VERSION=$( $(brew --prefix)/opt/python@3.10/bin/python3 --version | cut -d ' ' -f 2 )
+          curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o "python.pkg"
+          sudo installer -pkg python.pkg -target /
+          python3 --version
+    - name: Install Requirements
+      run: |
+          brew install coreutils
+          python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
 
-      - name: Cache requirements
-        id: cache-venv
-        if: matrix.arch == 'arm64'
-        uses: actions/cache@v4
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
-        with:
-          path: |
-            /yt-dlp-build-venv
-          key: ${{ env.BASE_CACHE_KEY }}-${{ github.ref }}-${{ needs.process.outputs.timestamp }}
-          restore-keys: |
-            ${{ env.BASE_CACHE_KEY }}-${{ github.ref }}-
-            ${{ env.BASE_CACHE_KEY }}-
+    - name: Prepare
+      run: |
+          python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+          python3 devscripts/make_lazy_extractors.py
+    - name: Build
+      run: |
+          python3 pyinst.py
+          mv dist/yt-dlp_macos dist/yt-dlp_macos_legacy
 
-      - name: Install Requirements
-        env:
-          ARCH: ${{ matrix.arch }}
-          PYI_URL: ${{ env.PYI_REPO }}/releases/download/${{ matrix.pyi_tag }}/${{ env.PYI_WHEEL }}
-          PYI_HASH: ${{ matrix.pyi_hash }}
-        shell: pwsh
-        run: |
-          python -m venv /yt-dlp-build-venv
-          /yt-dlp-build-venv/Scripts/Activate.ps1
-          python -m pip install -U pip
-          # Install custom PyInstaller build and verify hash
-          mkdir /pyi-wheels
-          python -m pip download -d /pyi-wheels --no-deps --require-hashes "pyinstaller@${Env:PYI_URL}#sha256=${Env:PYI_HASH}"
-          python -m pip install --force-reinstall -U "/pyi-wheels/${Env:PYI_WHEEL}"
-          python devscripts/install_deps.py --only-optional-groups --include-group build
-          if ("${Env:ARCH}" -eq "x86") {
-            python devscripts/install_deps.py
-          } else {
-            python devscripts/install_deps.py --include-group curl-cffi
-          }
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp_macos_legacy
 
-      - name: Prepare
-        shell: pwsh
-        run: |
-          python devscripts/update-version.py -c "${Env:CHANNEL}" -r "${Env:ORIGIN}" "${Env:VERSION}"
+
+  build_windows:
+    runs-on: windows-latest
+    needs: prepare
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:  # 3.8 is used for Win7 support
+          python-version: '3.8'
+    - name: Install Requirements
+      run: |  # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
+          python -m pip install --upgrade pip setuptools wheel py2exe
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
+
+    - name: Prepare
+      run: |
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python devscripts/make_lazy_extractors.py
+    - name: Build
+      run: |
+          python setup.py py2exe
+          Move-Item ./dist/yt-dlp.exe ./dist/yt-dlp_min.exe
+          python pyinst.py
+          python pyinst.py --onedir
+          Compress-Archive -Path ./dist/yt-dlp/* -DestinationPath ./dist/yt-dlp_win.zip
 
-      - name: Build
-        shell: pwsh
-        run: |
-          /yt-dlp-build-venv/Scripts/Activate.ps1
-          python -m bundle.pyinstaller
-          python -m bundle.pyinstaller --onedir
-          Compress-Archive -Path ./dist/yt-dlp${Env:SUFFIX}/* -DestinationPath ./dist/yt-dlp_win${Env:SUFFIX}.zip
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp.exe
+          dist/yt-dlp_min.exe
+          dist/yt-dlp_win.zip
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        shell: pwsh
-        run: |
-          $name = "yt-dlp${Env:SUFFIX}"
-          Copy-Item "./dist/${name}.exe" "./dist/${name}_downgraded.exe"
-          $version = & "./dist/${name}.exe" --version
-          & "./dist/${name}_downgraded.exe" -v --update-to "${Env:UPDATE_TO}"
-          $downgraded_version = & "./dist/${name}_downgraded.exe" --version
-          if ($version -eq $downgraded_version) {
-            exit 1
-          }
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ github.job }}-${{ matrix.arch }}
-          path: |
-            dist/yt-dlp${{ env.SUFFIX }}.exe
-            dist/yt-dlp_win${{ env.SUFFIX }}.zip
-          compression-level: 0
+  build_windows32:
+    runs-on: windows-latest
+    needs: prepare
 
-  meta_files:
-    if: always() && !cancelled()
-    needs:
-      - process
-      - unix
-      - linux
-      - macos
-      - windows
-    runs-on: ubuntu-latest
     steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v5
-        with:
-          path: artifact
-          pattern: build-bin-*
-          merge-multiple: true
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:  # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
+          python-version: '3.7'
+          architecture: 'x86'
+    - name: Install Requirements
+      run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
 
-      - name: Make SHA2-SUMS files
-        run: |
-          cd ./artifact/
-          # make sure SHA sums are also printed to stdout
-          sha256sum -- * | tee ../SHA2-256SUMS
-          sha512sum -- * | tee ../SHA2-512SUMS
-          # also print as permanent annotations to the summary page
-          while read -r shasum; do
-            echo "::notice title=${shasum##* }::sha256: ${shasum% *}"
-          done < ../SHA2-256SUMS
+    - name: Prepare
+      run: |
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+          python devscripts/make_lazy_extractors.py
+    - name: Build
+      run: |
+          python pyinst.py
 
-      - name: Make Update spec
-        run: |
-          cat >> _update_spec << EOF
-          # This file is used for regulating self-update
-          lock 2022.08.18.36 .+ Python 3\.6
-          lock 2023.11.16 zip Python 3\.7
-          lock 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lock 2024.10.22 py2exe .+
-          lock 2024.10.22 zip Python 3\.8
-          lock 2024.10.22 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
-          lock 2025.08.11 darwin_legacy_exe .+
-          lock 2025.08.27 linux_armv7l_exe .+
-          lock 2025.10.14 zip Python 3\.9
-          lockV2 yt-dlp/yt-dlp 2022.08.18.36 .+ Python 3\.6
-          lockV2 yt-dlp/yt-dlp 2023.11.16 zip Python 3\.7
-          lockV2 yt-dlp/yt-dlp 2023.11.16 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lockV2 yt-dlp/yt-dlp 2024.10.22 py2exe .+
-          lockV2 yt-dlp/yt-dlp 2024.10.22 zip Python 3\.8
-          lockV2 yt-dlp/yt-dlp 2024.10.22 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
-          lockV2 yt-dlp/yt-dlp 2025.08.11 darwin_legacy_exe .+
-          lockV2 yt-dlp/yt-dlp 2025.08.27 linux_armv7l_exe .+
-          lockV2 yt-dlp/yt-dlp 2025.10.14 zip Python 3\.9
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 zip Python 3\.7
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2023.11.15.232826 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 py2exe .+
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 zip Python 3\.8
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2024.10.22.051025 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2025.08.12.233030 darwin_legacy_exe .+
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2025.08.30.232839 linux_armv7l_exe .+
-          lockV2 yt-dlp/yt-dlp-nightly-builds 2025.10.14.232845 zip Python 3\.9
-          lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 zip Python 3\.7
-          lockV2 yt-dlp/yt-dlp-master-builds 2023.11.15.232812 win_x86_exe .+ Windows-(?:Vista|2008Server)
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.045052 py2exe .+
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 zip Python 3\.8
-          lockV2 yt-dlp/yt-dlp-master-builds 2024.10.22.060347 win(?:_x86)?_exe Python 3\.[78].+ Windows-(?:7-|2008ServerR2)
-          lockV2 yt-dlp/yt-dlp-master-builds 2025.08.12.232447 darwin_legacy_exe .+
-          lockV2 yt-dlp/yt-dlp-master-builds 2025.09.05.212910 linux_armv7l_exe .+
-          lockV2 yt-dlp/yt-dlp-master-builds 2025.10.14.232330 zip Python 3\.9
-          EOF
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp_x86.exe
 
-      - name: Sign checksum files
-        env:
-          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
-        if: env.GPG_SIGNING_KEY
-        run: |
-          gpg --batch --import <<< "${{ secrets.GPG_SIGNING_KEY }}"
-          for signfile in ./SHA*SUMS; do
-            gpg --batch --detach-sign "$signfile"
-          done
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-${{ github.job }}
-          path: |
-            _update_spec
-            SHA*SUMS*
-          compression-level: 0
-          overwrite: true
+  publish_release:
+    runs-on: ubuntu-latest
+    needs: [prepare, build_unix, build_windows, build_windows32, build_macos, build_macos_legacy]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+
+    - name: Get Changelog
+      run: |
+        changelog=$(grep -oPz '(?s)(?<=### ${{ needs.prepare.outputs.ytdlp_version }}\n{2}).+?(?=\n{2,3}###)' Changelog.md) || true
+        echo "changelog<<EOF" >> $GITHUB_ENV
+        echo "$changelog" >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
+    - name: Make Update spec
+      run: |
+        echo "# This file is used for regulating self-update" >> _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
+          sha256sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-256SUMS
+          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/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
+          sha512sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-512SUMS
+          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/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
+
+    - name: Publish Release
+      uses: yt-dlp/action-gh-release@v1
+      with:
+        tag_name: ${{ needs.prepare.outputs.ytdlp_version }}
+        name: yt-dlp ${{ needs.prepare.outputs.ytdlp_version }}
+        target_commitish: ${{ needs.prepare.outputs.head_sha }}
+        body: |
+          #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
+
+          ---
+          <details open><summary><h3>Changelog</summary>
+          <p>
+
+          ${{ env.changelog }}
+
+          </p>
+          </details>
+        files: |
+          SHA2-256SUMS
+          SHA2-512SUMS
+          artifact/yt-dlp
+          artifact/yt-dlp.tar.gz
+          artifact/yt-dlp.exe
+          artifact/yt-dlp_win.zip
+          artifact/yt-dlp_min.exe
+          artifact/yt-dlp_x86.exe
+          artifact/yt-dlp_macos
+          artifact/yt-dlp_macos.zip
+          artifact/yt-dlp_macos_legacy
+          artifact/dist/yt-dlp_linux
+          artifact/dist/yt-dlp_linux.zip
+          _update_spec

.github/workflows/cache-warmer.yml

@@ -1,23 +0,0 @@
-name: Keep cache warm
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 22 1,6,11,16,21,27 * *'
-
-jobs:
-  build:
-    if: |
-      vars.KEEP_CACHE_WARM || github.event_name == 'workflow_dispatch'
-    uses: ./.github/workflows/build.yml
-    with:
-      version: '999999'
-      channel: stable
-      origin: ${{ github.repository }}
-      unix: false
-      linux: false
-      linux_armv7l: true
-      musllinux: false
-      macos: true
-      windows: true
-    permissions:
-      contents: read

.github/workflows/challenge-tests.yml

@@ -1,77 +0,0 @@
-name: Challenge Tests
-on:
-  push:
-    paths:
-      - .github/workflows/challenge-tests.yml
-      - test/test_jsc/*.py
-      - yt_dlp/extractor/youtube/jsc/**.js
-      - yt_dlp/extractor/youtube/jsc/**.py
-      - yt_dlp/extractor/youtube/pot/**.py
-      - yt_dlp/utils/_jsruntime.py
-  pull_request:
-    paths:
-      - .github/workflows/challenge-tests.yml
-      - test/test_jsc/*.py
-      - yt_dlp/extractor/youtube/jsc/**.js
-      - yt_dlp/extractor/youtube/jsc/**.py
-      - yt_dlp/extractor/youtube/pot/**.py
-      - yt_dlp/utils/_jsruntime.py
-permissions:
-  contents: read
-
-concurrency:
-  group: challenge-tests-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  tests:
-    name: Challenge Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', pypy-3.11]
-    env:
-      QJS_VERSION: '2025-04-26'  # Earliest version with rope strings
-    steps:
-    - uses: actions/checkout@v5
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Deno
-      uses: denoland/setup-deno@v2
-      with:
-        deno-version: '2.0.0'  # minimum supported version
-    - name: Install Bun
-      uses: oven-sh/setup-bun@v2
-      with:
-        # minimum supported version is 1.0.31 but earliest available Windows version is 1.1.0
-        bun-version: ${{ (matrix.os == 'windows-latest' && '1.1.0') || '1.0.31' }}
-    - name: Install Node
-      uses: actions/setup-node@v6
-      with:
-        node-version: '20.0'  # minimum supported version
-    - name: Install QuickJS (Linux)
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-          wget "https://bellard.org/quickjs/binary_releases/quickjs-linux-x86_64-${QJS_VERSION}.zip" -O quickjs.zip
-          unzip quickjs.zip qjs
-          sudo install qjs /usr/local/bin/qjs
-    - name: Install QuickJS (Windows)
-      if: matrix.os == 'windows-latest'
-      shell: pwsh
-      run: |
-          Invoke-WebRequest "https://bellard.org/quickjs/binary_releases/quickjs-win-x86_64-${Env:QJS_VERSION}.zip" -OutFile quickjs.zip
-          unzip quickjs.zip
-    - name: Install test requirements
-      run: |
-        python ./devscripts/install_deps.py --print --only-optional-groups --include-group test > requirements.txt
-        python ./devscripts/install_deps.py --print -c certifi -c requests -c urllib3 -c yt-dlp-ejs >> requirements.txt
-        python -m pip install -U -r requirements.txt
-    - name: Run tests
-      timeout-minutes: 15
-      run: |
-        python -m yt_dlp -v --js-runtimes node --js-runtimes bun --js-runtimes quickjs || true
-        python ./devscripts/run_tests.py test/test_jsc -k download

.github/workflows/codeql.yml

@@ -1,65 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ 'master', 'gh-pages', 'release' ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ 'master' ]
-  schedule:
-    - cron: '59 11 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'python' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Use only 'java' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v5
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/core.yml

@@ -1,34 +1,5 @@
 name: Core Tests
-on:
-  push:
-    paths:
-      - .github/**
-      - devscripts/**
-      - test/**
-      - yt_dlp/**.py
-      - '!yt_dlp/extractor/**.py'
-      - yt_dlp/extractor/youtube/**.py
-      - yt_dlp/extractor/__init__.py
-      - yt_dlp/extractor/common.py
-      - yt_dlp/extractor/extractors.py
-  pull_request:
-    paths:
-      - .github/**
-      - devscripts/**
-      - test/**
-      - yt_dlp/**.py
-      - '!yt_dlp/extractor/**.py'
-      - yt_dlp/extractor/youtube/**.py
-      - yt_dlp/extractor/__init__.py
-      - yt_dlp/extractor/common.py
-      - yt_dlp/extractor/extractors.py
-permissions:
-  contents: read
-
-concurrency:
-  group: core-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
+on: [push, pull_request]
 jobs:
   tests:
     name: Core Tests
@@ -38,54 +9,26 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        # CPython 3.10 is in quick-test
-        python-version: ['3.11', '3.12', '3.13', '3.14', pypy-3.11]
+        # CPython 3.9 is in quick-test
+        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.10'
+          python-version: '3.8'
+          run-tests-ext: bat
         - os: windows-latest
-          python-version: '3.11'
-        - os: windows-latest
-          python-version: '3.12'
-        - os: windows-latest
-          python-version: '3.13'
-        - os: windows-latest
-          python-version: '3.14'
-        - os: windows-latest
-          python-version: pypy-3.11
+          python-version: pypy-3.9
+          run-tests-ext: bat
     steps:
-    - uses: actions/checkout@v5
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install test requirements
-      run: python ./devscripts/install_deps.py --include-group test --include-group curl-cffi
+    - name: Install pytest
+      run: pip install pytest
     - name: Run tests
-      timeout-minutes: 15
       continue-on-error: False
-      env:
-        source: ${{ (github.event_name == 'push' && github.event.before) || 'origin/master' }}
-        target: ${{ (github.event_name == 'push' && github.event.after) || 'HEAD' }}
-      shell: bash
-      run: |
-        flags=()
-        # Check if a networking file is involved
-        patterns="\
-        ^yt_dlp/networking/
-        ^yt_dlp/utils/networking\.py$
-        ^test/test_http_proxy\.py$
-        ^test/test_networking\.py$
-        ^test/test_networking_utils\.py$
-        ^test/test_socks\.py$
-        ^test/test_websockets\.py$
-        ^pyproject\.toml$
-        "
-        if git diff --name-only "${source}" "${target}" | grep -Ef <(printf '%s' "${patterns}"); then
-          flags+=(--flaky)
-        fi
-        python3 -m yt_dlp -v || true  # Print debug head
-        python3 -m devscripts.run_tests "${flags[@]}" --pytest-args '--reruns 2 --reruns-delay 3.0' core
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} core
+  # Linter is in quick-test

.github/workflows/download.yml

@@ -1,24 +1,21 @@
 name: Download Tests
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
   quick:
     name: Quick Download Tests
     if: "contains(github.event.head_commit.message, 'ci run dl')"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: 3.9
     - name: Install test requirements
-      run: python ./devscripts/install_deps.py --include-group dev
+      run: pip install pytest
     - name: Run tests
       continue-on-error: true
-      run: python ./devscripts/run_tests.py download
+      run: ./devscripts/run_tests.sh download
 
   full:
     name: Full Download Tests
@@ -28,21 +25,24 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.11', '3.12', '3.13', '3.14', pypy-3.11]
+        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.10'
+          python-version: '3.8'
+          run-tests-ext: bat
         - os: windows-latest
-          python-version: pypy-3.11
+          python-version: pypy-3.9
+          run-tests-ext: bat
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install test requirements
-      run: python ./devscripts/install_deps.py --include-group dev
+    - name: Install pytest
+      run: pip install pytest
     - name: Run tests
       continue-on-error: true
-      run: python ./devscripts/run_tests.py download
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }} download

.github/workflows/issue-lockdown.yml

@@ -1,21 +0,0 @@
-name: Issue Lockdown
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  issues: write
-
-jobs:
-  lockdown:
-    name: Issue Lockdown
-    if: vars.ISSUE_LOCKDOWN
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Lock new issue"
-        env:
-          GH_TOKEN: ${{ github.token }}
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-          REPOSITORY: ${{ github.repository }}
-        run: |
-          gh issue lock "${ISSUE_NUMBER}" -R "${REPOSITORY}"

.github/workflows/quick-test.yml

@@ -1,42 +1,33 @@
 name: Quick Test
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
   tests:
     name: Core Test
     if: "!contains(github.event.head_commit.message, 'ci skip all')"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v6
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: 3.9
     - name: Install test requirements
-      run: python ./devscripts/install_deps.py --only-optional-groups --include-group test
+      run: pip install pytest pycryptodomex
     - name: Run tests
-      timeout-minutes: 15
-      run: |
-        python3 -m yt_dlp -v || true
-        python3 ./devscripts/run_tests.py --pytest-args '--reruns 2 --reruns-delay 3.0' core
-  check:
-    name: Code check
+      run: ./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@v5
-    - uses: actions/setup-python@v6
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
-    - name: Install dev dependencies
-      run: python ./devscripts/install_deps.py --only-optional-groups --include-group static-analysis
+        python-version: 3.9
+    - name: Install flake8
+      run: pip install flake8
     - name: Make lazy extractors
-      run: python ./devscripts/make_lazy_extractors.py
-    - name: Run ruff
-      run: ruff check --output-format github .
-    - name: Run autopep8
-      run: autopep8 --diff .
-    - name: Check file mode
-      run: git ls-files --format="%(objectmode) %(path)" yt_dlp/ | ( ! grep -v "^100644" )
+      run: python devscripts/make_lazy_extractors.py
+    - name: Run flake8
+      run: flake8 .

.github/workflows/release-master.yml

@@ -1,48 +0,0 @@
-name: Release (master)
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "yt_dlp/**.py"
-      - "!yt_dlp/version.py"
-      - "bundle/**"
-      - "pyproject.toml"
-      - "Makefile"
-      - ".github/workflows/build.yml"
-      - ".github/workflows/release.yml"
-      - ".github/workflows/release-master.yml"
-concurrency:
-  group: release-master
-permissions:
-  contents: read
-
-jobs:
-  release:
-    if: vars.BUILD_MASTER
-    uses: ./.github/workflows/release.yml
-    with:
-      prerelease: true
-      source: ${{ (github.repository != 'yt-dlp/yt-dlp' && vars.MASTER_ARCHIVE_REPO) || 'master' }}
-      target: 'master'
-    permissions:
-      contents: write
-      id-token: write  # mandatory for trusted publishing
-    secrets: inherit
-
-  publish_pypi:
-    needs: [release]
-    if: vars.MASTER_PYPI_PROJECT
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v5
-        with:
-          path: dist
-          name: build-pypi
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true

.github/workflows/release-nightly.yml

@@ -1,63 +0,0 @@
-name: Release (nightly)
-on:
-  schedule:
-    - cron: '23 23 * * *'
-permissions:
-  contents: read
-
-jobs:
-  check_nightly:
-    if: vars.BUILD_NIGHTLY
-    runs-on: ubuntu-latest
-    outputs:
-      commit: ${{ steps.check_for_new_commits.outputs.commit }}
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-      - name: Check for new commits
-        id: check_for_new_commits
-        run: |
-          relevant_files=(
-            "yt_dlp/*.py"
-            ':!yt_dlp/version.py'
-            "bundle/*.py"
-            "bundle/docker/compose.yml"
-            "bundle/docker/linux/*"
-            "pyproject.toml"
-            "Makefile"
-            ".github/workflows/build.yml"
-            ".github/workflows/release.yml"
-            ".github/workflows/release-nightly.yml"
-          )
-          echo "commit=$(git log --format=%H -1 --since="24 hours ago" -- "${relevant_files[@]}")" | tee "$GITHUB_OUTPUT"
-
-  release:
-    needs: [check_nightly]
-    if: ${{ needs.check_nightly.outputs.commit }}
-    uses: ./.github/workflows/release.yml
-    with:
-      prerelease: true
-      source: ${{ (github.repository != 'yt-dlp/yt-dlp' && vars.NIGHTLY_ARCHIVE_REPO) || 'nightly' }}
-      target: 'nightly'
-    permissions:
-      contents: write
-      id-token: write  # mandatory for trusted publishing
-    secrets: inherit
-
-  publish_pypi:
-    needs: [release]
-    if: vars.NIGHTLY_PYPI_PROJECT
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v5
-        with:
-          path: dist
-          name: build-pypi
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true

.github/workflows/release.yml

@@ -1,326 +0,0 @@
-name: Release
-on:
-  workflow_call:
-    inputs:
-      source:
-        required: false
-        default: ''
-        type: string
-      target:
-        required: false
-        default: ''
-        type: string
-      version:
-        required: false
-        default: ''
-        type: string
-      linux_armv7l:
-        required: false
-        default: false
-        type: boolean
-      prerelease:
-        required: false
-        default: true
-        type: boolean
-  workflow_dispatch:
-    inputs:
-      source:
-        description: |
-          SOURCE of this release's updates:
-          channel, repo, tag, or channel/repo@tag
-          (default: <current_repo>)
-        required: false
-        default: ''
-        type: string
-      target:
-        description: |
-          TARGET to publish this release to:
-          channel, tag, or channel@tag
-          (default: <source> if writable else <current_repo>[@source_tag])
-        required: false
-        default: ''
-        type: string
-      version:
-        description: |
-          VERSION: yyyy.mm.dd[.rev] or rev
-          (default: auto-generated)
-        required: false
-        default: ''
-        type: string
-      linux_armv7l:
-        description: Include linux_armv7l
-        default: true
-        type: boolean
-      prerelease:
-        description: Pre-release
-        default: false
-        type: boolean
-
-permissions:
-  contents: read
-
-jobs:
-  prepare:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    outputs:
-      channel: ${{ steps.setup_variables.outputs.channel }}
-      version: ${{ steps.setup_variables.outputs.version }}
-      target_repo: ${{ steps.setup_variables.outputs.target_repo }}
-      target_repo_token: ${{ steps.setup_variables.outputs.target_repo_token }}
-      target_tag: ${{ steps.setup_variables.outputs.target_tag }}
-      pypi_project: ${{ steps.setup_variables.outputs.pypi_project }}
-      pypi_suffix: ${{ steps.setup_variables.outputs.pypi_suffix }}
-      head_sha: ${{ steps.get_target.outputs.head_sha }}
-
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.10"  # Keep this in sync with test-workflows.yml
-
-      - name: Process inputs
-        id: process_inputs
-        env:
-          INPUTS: ${{ toJSON(inputs) }}
-        run: |
-          python -m devscripts.setup_variables process_inputs
-
-      - name: Setup variables
-        id: setup_variables
-        env:
-          INPUTS: ${{ toJSON(inputs) }}
-          PROCESSED: ${{ toJSON(steps.process_inputs.outputs) }}
-          REPOSITORY: ${{ github.repository }}
-          PUSH_VERSION_COMMIT: ${{ vars.PUSH_VERSION_COMMIT }}
-          PYPI_PROJECT: ${{ vars.PYPI_PROJECT }}
-          SOURCE_PYPI_PROJECT: ${{ vars[format('{0}_pypi_project', steps.process_inputs.outputs.source_repo)] }}
-          SOURCE_PYPI_SUFFIX: ${{ vars[format('{0}_pypi_suffix', steps.process_inputs.outputs.source_repo)] }}
-          TARGET_PYPI_PROJECT: ${{ vars[format('{0}_pypi_project', steps.process_inputs.outputs.target_repo)] }}
-          TARGET_PYPI_SUFFIX: ${{ vars[format('{0}_pypi_suffix', steps.process_inputs.outputs.target_repo)] }}
-          SOURCE_ARCHIVE_REPO: ${{ vars[format('{0}_archive_repo', steps.process_inputs.outputs.source_repo)] }}
-          TARGET_ARCHIVE_REPO: ${{ vars[format('{0}_archive_repo', steps.process_inputs.outputs.target_repo)] }}
-          HAS_SOURCE_ARCHIVE_REPO_TOKEN: ${{ !!secrets[format('{0}_archive_repo_token', steps.process_inputs.outputs.source_repo)] }}
-          HAS_TARGET_ARCHIVE_REPO_TOKEN: ${{ !!secrets[format('{0}_archive_repo_token', steps.process_inputs.outputs.target_repo)] }}
-          HAS_ARCHIVE_REPO_TOKEN: ${{ !!secrets.ARCHIVE_REPO_TOKEN }}
-        run: |
-          python -m devscripts.setup_variables
-
-      - name: Update version & documentation
-        env:
-          CHANNEL: ${{ steps.setup_variables.outputs.channel }}
-          # Use base repo since this could be committed; build jobs will call this again with true origin
-          REPOSITORY: ${{ github.repository }}
-          VERSION: ${{ steps.setup_variables.outputs.version }}
-        run: |
-          python devscripts/update-version.py -c "${CHANNEL}" -r "${REPOSITORY}" "${VERSION}"
-          python devscripts/update_changelog.py -vv
-          make doc
-
-      - name: Push to release
-        id: push_release
-        env:
-          VERSION: ${{ steps.setup_variables.outputs.version }}
-          GITHUB_EVENT_SENDER_LOGIN: ${{ github.event.sender.login }}
-          GITHUB_EVENT_REF: ${{ github.event.ref }}
-        if: |
-          !inputs.prerelease && steps.setup_variables.outputs.target_repo == github.repository
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add -u
-          git commit -m "Release ${VERSION}" \
-            -m "Created by: ${GITHUB_EVENT_SENDER_LOGIN}" -m ":ci skip all"
-          git push origin --force "${GITHUB_EVENT_REF}:release"
-
-      - name: Get target commitish
-        id: get_target
-        run: |
-          echo "head_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: Update master
-        env:
-          GITHUB_EVENT_REF: ${{ github.event.ref }}
-        if: |
-          vars.PUSH_VERSION_COMMIT && !inputs.prerelease && steps.setup_variables.outputs.target_repo == github.repository
-        run: git push origin "${GITHUB_EVENT_REF}"
-
-  build:
-    needs: prepare
-    uses: ./.github/workflows/build.yml
-    with:
-      version: ${{ needs.prepare.outputs.version }}
-      channel: ${{ needs.prepare.outputs.channel }}
-      origin: ${{ needs.prepare.outputs.target_repo }}
-      linux_armv7l: ${{ inputs.linux_armv7l }}
-    permissions:
-      contents: read
-    secrets:
-      GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
-
-  publish_pypi:
-    needs: [prepare, build]
-    if: ${{ needs.prepare.outputs.pypi_project }}
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.10"
-
-      - name: Install Requirements
-        run: |
-          sudo apt -y install pandoc man
-          python devscripts/install_deps.py --only-optional-groups --include-group build
-
-      - name: Prepare
-        env:
-          VERSION: ${{ needs.prepare.outputs.version }}
-          SUFFIX: ${{ needs.prepare.outputs.pypi_suffix }}
-          CHANNEL: ${{ needs.prepare.outputs.channel }}
-          TARGET_REPO: ${{ needs.prepare.outputs.target_repo }}
-          PYPI_PROJECT: ${{ needs.prepare.outputs.pypi_project }}
-        run: |
-          python devscripts/update-version.py -c "${CHANNEL}" -r "${TARGET_REPO}" -s "${SUFFIX}" "${VERSION}"
-          python devscripts/update_changelog.py -vv
-          python devscripts/make_lazy_extractors.py
-          sed -i -E '0,/(name = ")[^"]+(")/s//\1'"${PYPI_PROJECT}"'\2/' pyproject.toml
-
-      - name: Build
-        run: |
-          rm -rf dist/*
-          make pypi-files
-          printf '%s\n\n' \
-            'Official repository: <https://github.com/yt-dlp/yt-dlp>' \
-            '**PS**: Some links in this document will not work since this is a copy of the README.md from Github' > ./README.md.new
-          cat ./README.md >> ./README.md.new && mv -f ./README.md.new ./README.md
-          python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
-          make clean-cache
-          python -m build --no-isolation .
-
-      - name: Upload artifacts
-        if: github.event_name != 'workflow_dispatch'
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-pypi
-          path: |
-            dist/*
-          compression-level: 0
-
-      - name: Publish to PyPI
-        if: github.event_name == 'workflow_dispatch'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true
-
-  publish:
-    needs: [prepare, build]
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    env:
-      TARGET_REPO: ${{ needs.prepare.outputs.target_repo }}
-      TARGET_TAG: ${{ needs.prepare.outputs.target_tag }}
-      VERSION: ${{ needs.prepare.outputs.version }}
-      HEAD_SHA: ${{ needs.prepare.outputs.head_sha }}
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-      - uses: actions/download-artifact@v5
-        with:
-          path: artifact
-          pattern: build-*
-          merge-multiple: true
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.10"
-
-      - name: Generate release notes
-        env:
-          REPOSITORY: ${{ github.repository }}
-          BASE_REPO: yt-dlp/yt-dlp
-          NIGHTLY_REPO: yt-dlp/yt-dlp-nightly-builds
-          MASTER_REPO: yt-dlp/yt-dlp-master-builds
-          DOCS_PATH: ${{ env.TARGET_REPO == github.repository && format('/tree/{0}', env.TARGET_TAG) || '' }}
-        run: |
-          printf '%s' \
-            "[![Installation](https://img.shields.io/badge/-Which%20file%20to%20download%3F-white.svg?style=for-the-badge)]" \
-              "(https://github.com/${REPOSITORY}#installation \"Installation instructions\") " \
-            "[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)]" \
-              "(https://discord.gg/H5MNcFW63r \"Discord\") " \
-            "[![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)]" \
-              "(https://github.com/${BASE_REPO}/blob/master/Maintainers.md#maintainers \"Donate\") " \
-            "[![Documentation](https://img.shields.io/badge/-Docs-brightgreen.svg?style=for-the-badge&logo=GitBook&labelColor=555555)]" \
-              "(https://github.com/${REPOSITORY}${DOCS_PATH}#readme \"Documentation\") " > ./RELEASE_NOTES
-          if [[ "${TARGET_REPO}" == "${BASE_REPO}" ]]; then
-            printf '%s' \
-              "[![Nightly](https://img.shields.io/badge/Nightly%20builds-purple.svg?style=for-the-badge)]" \
-                "(https://github.com/${NIGHTLY_REPO}/releases/latest \"Nightly builds\") " \
-              "[![Master](https://img.shields.io/badge/Master%20builds-lightblue.svg?style=for-the-badge)]" \
-                "(https://github.com/${MASTER_REPO}/releases/latest \"Master builds\")" >> ./RELEASE_NOTES
-          fi
-          printf '\n\n%s\n\n%s%s%s\n\n---\n' \
-            "#### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)" \
-            "The zipimport Unix executable contains code licensed under ISC and MIT. " \
-            "The PyInstaller-bundled executables are subject to these and other licenses, all of which are compiled in " \
-            "[THIRD_PARTY_LICENSES.txt](https://github.com/${BASE_REPO}/blob/${HEAD_SHA}/THIRD_PARTY_LICENSES.txt)" >> ./RELEASE_NOTES
-          python ./devscripts/make_changelog.py -vv --collapsible >> ./RELEASE_NOTES
-          printf '%s\n\n' '**This is a pre-release build**' >> ./PRERELEASE_NOTES
-          cat ./RELEASE_NOTES >> ./PRERELEASE_NOTES
-          printf '%s\n\n' "Generated from: https://github.com/${REPOSITORY}/commit/${HEAD_SHA}" >> ./ARCHIVE_NOTES
-          cat ./RELEASE_NOTES >> ./ARCHIVE_NOTES
-
-      - name: Publish to archive repo
-        env:
-          GH_TOKEN: ${{ secrets[needs.prepare.outputs.target_repo_token] }}
-          GH_REPO: ${{ needs.prepare.outputs.target_repo }}
-          TITLE_PREFIX: ${{ startswith(env.TARGET_REPO, 'yt-dlp/') && 'yt-dlp ' || '' }}
-          TITLE: ${{ inputs.target != env.TARGET_REPO && inputs.target || needs.prepare.outputs.channel }}
-        if: |
-          inputs.prerelease && env.GH_TOKEN && env.GH_REPO && env.GH_REPO != github.repository
-        run: |
-          gh release create \
-            --notes-file ARCHIVE_NOTES \
-            --title "${TITLE_PREFIX}${TITLE} ${VERSION}" \
-            "${VERSION}" \
-            artifact/*
-
-      - name: Prune old release
-        env:
-          GH_TOKEN: ${{ github.token }}
-        if: |
-          env.TARGET_REPO == github.repository && env.TARGET_TAG != env.VERSION
-        run: |
-          gh release delete --yes --cleanup-tag "${TARGET_TAG}" || true
-          git tag --delete "${TARGET_TAG}" || true
-          sleep 5  # Enough time to cover deletion race condition
-
-      - name: Publish release
-        env:
-          GH_TOKEN: ${{ github.token }}
-          NOTES_FILE: ${{ inputs.prerelease && 'PRERELEASE_NOTES' || 'RELEASE_NOTES' }}
-          TITLE_PREFIX: ${{ github.repository == 'yt-dlp/yt-dlp' && 'yt-dlp ' || '' }}
-          TITLE: ${{ env.TARGET_TAG != env.VERSION && format('{0} ', env.TARGET_TAG) || '' }}
-          PRERELEASE: ${{ inputs.prerelease && '1' || '0' }}
-        if: |
-          env.TARGET_REPO == github.repository
-        run: |
-          gh_options=(
-            --notes-file "${NOTES_FILE}"
-            --target "${HEAD_SHA}"
-            --title "${TITLE_PREFIX}${TITLE}${VERSION}"
-          )
-          if ((PRERELEASE)); then
-            gh_options+=(--prerelease)
-          fi
-          gh release create "${gh_options[@]}" "${TARGET_TAG}" artifact/*

.github/workflows/sanitize-comment.yml

@@ -1,17 +0,0 @@
-name: Sanitize comment
-
-on:
-  issue_comment:
-    types: [created, edited]
-
-permissions:
-  issues: write
-
-jobs:
-  sanitize-comment:
-    name: Sanitize comment
-    if: vars.SANITIZE_COMMENT && !github.event.issue.pull_request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Sanitize comment
-        uses: yt-dlp/sanitize-comment@v1

.github/workflows/test-workflows.yml

@@ -1,52 +0,0 @@
-name: Test and lint workflows
-on:
-  push:
-    paths:
-      - .github/workflows/*
-      - bundle/docker/linux/*.sh
-      - devscripts/setup_variables.py
-      - devscripts/setup_variables_tests.py
-      - devscripts/utils.py
-  pull_request:
-    paths:
-      - .github/workflows/*
-      - bundle/docker/linux/*.sh
-      - devscripts/setup_variables.py
-      - devscripts/setup_variables_tests.py
-      - devscripts/utils.py
-permissions:
-  contents: read
-env:
-  ACTIONLINT_VERSION: "1.7.7"
-  ACTIONLINT_SHA256SUM: 023070a287cd8cccd71515fedc843f1985bf96c436b7effaecce67290e7e0757
-  ACTIONLINT_REPO: https://github.com/rhysd/actionlint
-
-jobs:
-  check:
-    name: Check workflows
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.10"  # Keep this in sync with release.yml's prepare job
-      - name: Install requirements
-        env:
-          ACTIONLINT_TARBALL: ${{ format('actionlint_{0}_linux_amd64.tar.gz', env.ACTIONLINT_VERSION) }}
-        run: |
-          python -m devscripts.install_deps --only-optional-groups --include-group test
-          sudo apt -y install shellcheck
-          python -m pip install -U pyflakes
-          curl -LO "${ACTIONLINT_REPO}/releases/download/v${ACTIONLINT_VERSION}/${ACTIONLINT_TARBALL}"
-          printf '%s  %s' "${ACTIONLINT_SHA256SUM}" "${ACTIONLINT_TARBALL}" | sha256sum -c -
-          tar xvzf "${ACTIONLINT_TARBALL}" actionlint
-          chmod +x actionlint
-      - name: Run actionlint
-        run: |
-          ./actionlint -color
-      - name: Check Docker shell scripts
-        run: |
-          shellcheck bundle/docker/linux/*.sh
-      - name: Test GHA devscripts
-        run: |
-          pytest -Werror --tb=short --color=yes devscripts/setup_variables_tests.py

.gitignore

@@ -30,28 +30,23 @@ cookies
 *.f4v
 *.flac
 *.flv
-*.gif
 *.jpeg
 *.jpg
-*.lrc
 *.m4a
+*.mpga
 *.m4v
 *.mhtml
 *.mkv
 *.mov
 *.mp3
 *.mp4
-*.mpg
-*.mpga
-*.oga
 *.ogg
 *.opus
 *.png
 *.sbv
 *.srt
-*.ssa
 *.swf
-*.tt
+*.swp
 *.ttml
 *.url
 *.vtt
@@ -66,7 +61,7 @@ cookies
 # Python
 *.pyc
 *.pyo
-.*_cache
+.pytest_cache
 wine-py2exe/
 py2exe.log
 build/
@@ -74,7 +69,6 @@ dist/
 zip/
 tmp/
 venv/
-.venv/
 completions/
 
 # Misc
@@ -91,8 +85,6 @@ updates_key.pem
 .tox
 *.class
 *.isorted
-*.stackdump
-uv.lock
 
 # Generated
 AUTHORS
@@ -105,9 +97,6 @@ README.txt
 *.zsh
 *.spec
 test/testdata/sigs/player-*.js
-test/testdata/thumbnails/empty.webp
-test/testdata/thumbnails/foo\ %d\ bar/foo_%d.*
-.ejs-*
 
 # Binary
 /youtube-dl
@@ -122,14 +111,14 @@ yt-dlp.zip
 .vscode
 *.sublime-*
 *.code-workspace
-*.swp
 
 # Lazy extractors
 */extractor/lazy_extractors.py
 
 # Plugins
-ytdlp_plugins/
-yt-dlp-plugins
-
-# Packages
-yt_dlp_ejs/
+ytdlp_plugins/extractor/*
+!ytdlp_plugins/extractor/__init__.py
+!ytdlp_plugins/extractor/sample.py
+ytdlp_plugins/postprocessor/*
+!ytdlp_plugins/postprocessor/__init__.py
+!ytdlp_plugins/postprocessor/sample.py

.pre-commit-config.yaml

@@ -1,14 +0,0 @@
-repos:
-- repo: local
-  hooks:
-  - id: linter
-    name: Apply linter fixes
-    entry: ruff check --fix .
-    language: system
-    types: [python]
-    require_serial: true
-  - id: format
-    name: Apply formatting fixes
-    entry: autopep8 --in-place .
-    language: system
-    types: [python]

.pre-commit-hatch.yaml

@@ -1,9 +0,0 @@
-repos:
-- repo: local
-  hooks:
-  - id: fix
-    name: Apply code fixes
-    entry: hatch fmt
-    language: system
-    types: [python]
-    require_serial: true

CONTRIBUTING.md

@@ -12,7 +12,6 @@ # CONTRIBUTING TO YT-DLP
     - [Is your question about yt-dlp?](#is-your-question-about-yt-dlp)
     - [Are you willing to share account details if needed?](#are-you-willing-to-share-account-details-if-needed)
     - [Is the website primarily used for piracy](#is-the-website-primarily-used-for-piracy)
-- [AUTOMATED CONTRIBUTIONS (AI / LLM) POLICY](#automated-contributions-ai--llm-policy)
 - [DEVELOPER INSTRUCTIONS](#developer-instructions)
     - [Adding new feature or making overarching changes](#adding-new-feature-or-making-overarching-changes)
     - [Adding support for a new site](#adding-support-for-a-new-site)
@@ -38,18 +37,14 @@ # OPENING AN ISSUE
 **Please include the full output of yt-dlp when run with `-vU`**, i.e. **add** `-vU` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
 ```
 $ yt-dlp -vU <your command line>
-[debug] Command-line config: ['-vU', 'https://www.example.com/']
-[debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-[debug] yt-dlp version nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-[debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-[debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-[debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+[debug] Command-line config: ['-v', 'demo.com']
+[debug] Encodings: locale UTF-8, fs utf-8, out utf-8, pref UTF-8
+[debug] yt-dlp version 2021.09.25 (zip)
+[debug] Python version 3.8.10 (CPython 64bit) - Linux-5.4.0-74-generic-x86_64-with-glibc2.29
+[debug] exe versions: ffmpeg 4.2.4, ffprobe 4.2.4
 [debug] Proxy map: {}
-[debug] Request Handlers: urllib, requests, websockets, curl_cffi
-[debug] Loaded 1838 extractors
-[debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
+Current Build Hash 25cc412d1d3c0725a1f2f5b7e4682f6fb40e6d15f7024e96f7afd572e9919535
+yt-dlp is up to date (2021.09.25)
 ...
 ```
 **Do not post screenshots of verbose logs; only plain text is acceptable.**
@@ -84,7 +79,7 @@ ###  Are you using the latest version?
 
 ###  Is the issue already documented?
 
-Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/yt-dlp/yt-dlp/search?type=Issues) of this repository. If there is an issue, subscribe to it to be notified when there is any progress. Unless you have something useful to add to the conversation, please refrain from commenting.
+Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/yt-dlp/yt-dlp/search?type=Issues) of this repository. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2021.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
 
 Additionally, it is also helpful to see if the issue has already been documented in the [youtube-dl issue tracker](https://github.com/ytdl-org/youtube-dl/issues). If similar issues have already been reported in youtube-dl (but not in our issue tracker), links to them can be included in your issue report here.
 
@@ -127,140 +122,87 @@ ### Are you willing to share account details if needed?
 While these steps won't necessarily ensure that no misuse of the account takes place, these are still some good practices to follow.
 
 - Look for people with `Member` (maintainers of the project) or `Contributor` (people who have previously contributed code) tag on their messages.
-- Change the password before sharing the account to something random.
+- Change the password before sharing the account to something random (use [this](https://passwordsgenerator.net/) if you don't have a random password generator).
 - Change the password after receiving the account back.
 
 ### Is the website primarily used for piracy?
 
-We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) to not support services that is primarily used for infringing copyright. Additionally, it has been decided to not to support porn sites that specialize in fakes. We also cannot support any service that serves only [DRM protected content](https://en.wikipedia.org/wiki/Digital_rights_management).
+We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) to not support services that is primarily used for infringing copyright. Additionally, it has been decided to not to support porn sites that specialize in deep fake. We also cannot support any service that serves only [DRM protected content](https://en.wikipedia.org/wiki/Digital_rights_management). 
 
 
-# AUTOMATED CONTRIBUTIONS (AI / LLM) POLICY
-
-Please refrain from submitting issues or pull requests that have been generated by an LLM or other fully-automated tools. Any submission that is in violation of this policy will be closed, and the submitter may be blocked from this repository without warning.
-
-If you submit an issue, you need to understand what your issue description is saying. You need to be able to answer questions about your bug report or feature request. Using an AI tool to *proofread* your issue/comment text is acceptable. Using an AI tool to *write* your issue/comment text is unacceptable.
-
-If you submit a pull request, you need to understand what every line of code you've changed does. If you can't explain why your PR is doing something, then do not submit it. Using an AI tool to generate entire lines of code is unacceptable.
-
-The rationale behind this policy is that automated contributions are a waste of the maintainers' time. Humans spend their time and brainpower reviewing every submission. Issues or pull requests generated by automation tools create an imbalance of effort between the submitter and the reviewer. Nobody learns anything when a maintainer reviews code written by an LLM.
-
-Additionally, AI-generated code conflicts with this project's license (Unlicense), since you cannot truly release code into the public domain if you didn't author it yourself.
 
 
 # DEVELOPER INSTRUCTIONS
 
-Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases), get them via [the other installation methods](README.md#installation) or directly run it using `python -m yt_dlp`.
+Most users do not need to build yt-dlp and can [download the builds](https://github.com/yt-dlp/yt-dlp/releases) or get them via [the other installation methods](README.md#installation).
 
-`yt-dlp` uses [`hatch`](<https://hatch.pypa.io>) as a project management tool.
-You can easily install it using [`pipx`](<https://pipx.pypa.io>) via `pipx install hatch`, or else via `pip` or your package manager of choice. Make sure you are using at least version `1.10.0`, otherwise some functionality might not work as expected.
+To run yt-dlp as a developer, you don't need to build anything either. Simply execute
 
-If you plan on contributing to `yt-dlp`, best practice is to start by running the following command:
+    python -m yt_dlp
 
-```shell
-$ hatch run setup
-```
+To run the test, simply invoke your favorite test runner, or execute a test file directly; any of the following work:
 
-The above command will install a `pre-commit` hook so that required checks/fixes (linting, formatting) will run automatically before each commit. If any code needs to be linted or formatted, then the commit will be blocked and the necessary changes will be made; you should review all edits and re-commit the fixed version.
-
-After this you can use `hatch shell` to enable a virtual environment that has `yt-dlp` and its development dependencies installed.
-
-In addition, the following script commands can be used to run simple tasks such as linting or testing (without having to run `hatch shell` first):
-* `hatch fmt`: Automatically fix linter violations and apply required code formatting changes
-    * See `hatch fmt --help` for more info
-* `hatch test`: Run extractor or core tests
-    * See `hatch test --help` for more info
+    python -m unittest discover
+    python test/test_download.py
+    nosetests
+    pytest
 
 See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
 
-While it is strongly recommended to use `hatch` for yt-dlp development, if you are unable to do so, alternatively you can manually create a virtual environment and use the following commands:
-
-```shell
-# To only install development dependencies:
-$ python -m devscripts.install_deps --include dev
-
-# Or, for an editable install plus dev dependencies:
-$ python -m pip install -e ".[default,dev]"
-
-# To setup the pre-commit hook:
-$ pre-commit install
-
-# To be used in place of `hatch test`:
-$ python -m devscripts.run_tests
-
-# To be used in place of `hatch fmt`:
-$ ruff check --fix .
-$ autopep8 --in-place .
-
-# To only check code instead of applying fixes:
-$ ruff check .
-$ autopep8 --diff .
-```
-
 If you want to create a build of yt-dlp yourself, you can follow the instructions [here](README.md#compile).
 
 
 ## Adding new feature or making overarching changes
 
-Before you start writing code for implementing a new feature, open an issue explaining your feature request and at least one use case. This allows the maintainers to decide whether such a feature is desired for the project in the first place, and will provide an avenue to discuss some implementation details. If you open a pull request for a new feature without discussing with us first, do not be surprised when we ask for large changes to the code, or even reject it outright.
+Before you start writing code for implementing a new feature, open an issue explaining your feature request and atleast one use case. This allows the maintainers to decide whether such a feature is desired for the project in the first place, and will provide an avenue to discuss some implementation details. If you open a pull request for a new feature without discussing with us first, do not be surprised when we ask for large changes to the code, or even reject it outright.
 
 The same applies for changes to the documentation, code style, or overarching changes to the architecture
 
 
 ## 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`):
 
 1. [Fork this repository](https://github.com/yt-dlp/yt-dlp/fork)
 1. Check out the source code with:
 
-    ```shell
-    $ git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
-    ```
+        git clone git@github.com:YOUR_GITHUB_USERNAME/yt-dlp.git
 
 1. Start a new git branch with
 
-    ```shell
-    $ cd yt-dlp
-    $ git checkout -b yourextractor
-    ```
+        cd yt-dlp
+        git checkout -b yourextractor
 
 1. Start with this simple template and save it to `yt_dlp/extractor/yourextractor.py`:
 
     ```python
     from .common import InfoExtractor
-
-
+    
+    
     class YourExtractorIE(InfoExtractor):
         _VALID_URL = r'https?://(?:www\.)?yourextractor\.com/watch/(?P<id>[0-9]+)'
         _TESTS = [{
             'url': 'https://yourextractor.com/watch/42',
             'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)',
             'info_dict': {
-                # For videos, only the 'id' and 'ext' fields are required to RUN the test:
                 'id': '42',
                 'ext': 'mp4',
-                # Then if the test run fails, it will output the missing/incorrect fields.
-                # Properties can be added as:
-                # * A value, e.g.
-                #     'title': 'Video title goes here',
-                # * MD5 checksum; start the string with 'md5:', e.g.
-                #     'description': 'md5:098f6bcd4621d373cade4e832627b4f6',
-                # * A regular expression; start the string with 're:', e.g.
-                #     'thumbnail': r're:https?://.*\.jpg$',
-                # * A count of elements in a list; start the string with 'count:', e.g.
-                #     'tags': 'count:10',
-                # * Any Python type, e.g.
-                #     'view_count': int,
+                'title': 'Video title goes here',
+                'thumbnail': r're:^https?://.*\.jpg$',
+                # TODO more properties, either as:
+                # * A value
+                # * MD5 checksum; start the string with md5:
+                # * A regular expression; start the string with re:
+                # * Any Python type, e.g. int or float
             }
         }]
 
         def _real_extract(self, url):
             video_id = self._match_id(url)
             webpage = self._download_webpage(url, video_id)
-
+    
             # TODO more code goes here, for example ...
             title = self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
 
@@ -272,33 +214,27 @@ ## Adding support for a new site
                 # TODO more properties (see yt_dlp/extractor/common.py)
             }
     ```
-1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`. Also note that when adding a parenthesized import group, the last import in the group must have a trailing comma in order for this formatting to be respected by our code formatter.
-1. Run `hatch test YourExtractor`. This *may fail* at first, but you can continually re-run it until you're done. Upon failure, it will output the missing fields and/or correct values which you can copy. If you decide to add more than one test, the tests will then be named `YourExtractor`, `YourExtractor_1`, `YourExtractor_2`, etc. Note that tests with an `only_matching` key in the test's dict are not included in the count. You can also run all the tests in one go with `YourExtractor_all`
-1. Make sure you have at least one test for your extractor. Even if all videos covered by the extractor are expected to be inaccessible for automated testing, tests should still be added with a `skip` parameter indicating why the particular test is disabled from running.
-1. Have a look at [`yt_dlp/extractor/common.py`](yt_dlp/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](yt_dlp/extractor/common.py#L119-L440). Add tests and code for as many as you want.
-1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions), passes [ruff](https://docs.astral.sh/ruff/tutorial/#getting-started) code checks and is properly formatted:
+1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`.
+1. Run `python test/test_download.py TestDownload.test_YourExtractor` (note that `YourExtractor` doesn't end with `IE`). This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, the tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in. You can also run all the tests in one go with `TestDownload.test_YourExtractor_all`
+1. Make sure you have atleast one test for your extractor. Even if all videos covered by the extractor are expected to be inaccessible for automated testing, tests should still be added with a `skip` parameter indicating why the particular test is disabled from running.
+1. Have a look at [`yt_dlp/extractor/common.py`](yt_dlp/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](yt_dlp/extractor/common.py#L91-L426). Add tests and code for as many as you want.
+1. Make sure your code follows [yt-dlp coding conventions](#yt-dlp-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
 
-    ```shell
-    $ hatch fmt --check
-    ```
+        $ flake8 yt_dlp/extractor/yourextractor.py
 
-    You can use `hatch fmt` to automatically fix problems. Rules that the linter/formatter enforces should not be disabled with `# noqa` unless a maintainer requests it. The only exception allowed is for old/printf-style string formatting in GraphQL query templates (use `# noqa: UP031`).
-
-1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython >=3.10 and PyPy >=3.11. Backward compatibility is not required for even older versions of Python.
+1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.7 and above. Backward compatibility is not required for even older versions of Python.
 1. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files, [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
 
-    ```shell
-    $ git add yt_dlp/extractor/_extractors.py
-    $ git add yt_dlp/extractor/yourextractor.py
-    $ git commit -m '[yourextractor] Add extractor'
-    $ git push origin yourextractor
-    ```
+        $ git add yt_dlp/extractor/_extractors.py
+        $ git add yt_dlp/extractor/yourextractor.py
+        $ git commit -m '[yourextractor] Add extractor'
+        $ git push origin yourextractor
 
 1. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
 
 In any case, thank you very much for your contributions!
 
-**Tip:** To test extractors that require login information, create a file `test/local_parameters.json` and add `"usenetrc": true` or your `username`&`password` or `cookiefile`/`cookiesfrombrowser` in it:
+**Tip:** To test extractors that require login information, create a file `test/local_parameters.json` and add `"usenetrc": true` or your username and password in it:
 ```json
 {
     "username": "your user name",
@@ -310,21 +246,22 @@ ## yt-dlp coding conventions
 
 This section introduces a guide lines for writing idiomatic, robust and future-proof extractor code.
 
-Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old yt-dlp versions working. Even though this breakage issue may be easily fixed by a new version of yt-dlp, this could take some time, during which the extractor will remain broken.
+Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old yt-dlp versions working. Even though this breakage issue may be easily fixed by a new version of yt-dlp, this could take some time, during which the the extractor will remain broken.
 
 
 ### Mandatory and optional metafields
 
-For extraction to work yt-dlp relies on metadata your extractor extracts and provides to yt-dlp expressed by an [information dictionary](yt_dlp/extractor/common.py#L119-L440) or simply *info dict*. Only the following meta fields in the *info dict* are considered mandatory for a successful extraction process by yt-dlp:
+For extraction to work yt-dlp relies on metadata your extractor extracts and provides to yt-dlp expressed by an [information dictionary](yt_dlp/extractor/common.py#L91-L426) or simply *info dict*. Only the following meta fields in the *info dict* are considered mandatory for a successful extraction process by yt-dlp:
 
  - `id` (media identifier)
+ - `title` (media title)
  - `url` (media download URL) or `formats`
 
-The aforementioned metadata fields are the critical data without which extraction does not make any sense. If any of them fail to be extracted, then the extractor is considered broken. All other metadata extraction should be completely non-fatal.
+The aforementioned metafields are the critical data that the extraction does not make any sense without and if any of them fail to be extracted then the extractor is considered completely broken. While all extractors must return a `title`, they must also allow it's extraction to be non-fatal.
 
 For pornographic sites, appropriate `age_limit` must also be returned.
 
-The extractor is allowed to return the info dict without url or formats in some special cases if it allows the user to extract useful information with `--ignore-no-formats-error` - e.g. when the video is a live stream that has not started yet.
+The extractor is allowed to return the info dict without url or formats in some special cases if it allows the user to extract usefull information with `--ignore-no-formats-error` - e.g. when the video is a live stream that has not started yet.
 
 [Any field](yt_dlp/extractor/common.py#219-L426) apart from the aforementioned ones are considered **optional**. That means that extraction should be **tolerant** to situations when sources for these fields can potentially be unavailable (even if they are always available at the moment) and **future-proof** in order not to break the extraction of general purpose mandatory fields.
 
@@ -335,7 +272,7 @@ #### Example
 ```python
 meta = self._download_json(url, video_id)
 ```
-
+    
 Assume at this point `meta`'s layout is:
 
 ```python
@@ -414,9 +351,8 @@ #### Example
 ```python
 thumbnail_data = data.get('thumbnails') or []
 thumbnails = [{
-    'url': item['url'],
-    'height': item.get('h'),
-} for item in thumbnail_data if item.get('url')]  # correct
+    'url': item['url']
+} for item in thumbnail_data]  # correct
 ```
 
 and not like:
@@ -424,27 +360,12 @@ #### Example
 ```python
 thumbnail_data = data.get('thumbnails')
 thumbnails = [{
-    'url': item['url'],
-    'height': item.get('h'),
+    'url': item['url']
 } 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
 
@@ -759,15 +680,15 @@ #### Examples
 
 ### Use convenience conversion and parsing functions
 
-Wrap all extracted numeric data into safe functions from [`yt_dlp/utils/`](yt_dlp/utils/): `int_or_none`, `float_or_none`. Use them for string to number conversions as well.
+Wrap all extracted numeric data into safe functions from [`yt_dlp/utils.py`](yt_dlp/utils.py): `int_or_none`, `float_or_none`. Use them for string to number conversions as well.
 
 Use `url_or_none` for safe URL processing.
 
 Use `traverse_obj` and `try_call` (superseeds `dict_get` and `try_get`) for safe metadata extraction from parsed JSON.
 
-Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction.
+Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction. 
 
-Explore [`yt_dlp/utils/`](yt_dlp/utils/) for more useful convenience functions.
+Explore [`yt_dlp/utils.py`](yt_dlp/utils.py) for more useful convenience functions.
 
 #### Examples
 
@@ -780,10 +701,12 @@ #### Examples
 ```
 
 
-## My pull request is labeled pending-fixes
+# My pull request is labeled pending-fixes
 
 The `pending-fixes` label is added when there are changes requested to a PR. When the necessary changes are made, the label should be removed. However, despite our best efforts, it may sometimes happen that the maintainer did not see the changes or forgot to remove the label. If your PR is still marked as `pending-fixes` a few days after all requested changes have been made, feel free to ping the maintainer who labeled your issue and ask them to re-review and remove the label.
 
 
+
+
 # EMBEDDING YT-DLP
 See [README.md#embedding-yt-dlp](README.md#embedding-yt-dlp) for instructions on how to embed yt-dlp in another Python program

CONTRIBUTORS

@@ -1,10 +1,8 @@
 pukkandan (owner)
-shirt-dev (maintainer)
-coletdjnz (maintainer)
-Ashish0804 (maintainer)
-bashonly (maintainer)
-Grub4K (maintainer)
-seproDev (maintainer)
+shirt-dev (collaborator)
+coletdjnz/colethedj (collaborator)
+Ashish0804 (collaborator)
+nao20010128nao/Lesmiscore (collaborator)
 h-h-h-h
 pauldubois98
 nixxo
@@ -297,524 +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
-Hill-98
-LXYan2333
-mushbite
-venkata-krishnas
-7vlad7
-alexklapheke
-arobase-che
-bepvte
-bergoid
-blmarket
-brandon-dacrib
-c-basalt
-CoryTibbettsDev
-Cyberes
-D0LLYNH0
-danog
-DataGhost
-falbrechtskirchinger
-foreignBlade
-garret1317
-hasezoey
-hoaluvn
-ItzMaxTV
-ivanskodje
-jo-nike
-kangalio
-linsui
-makew0rld
-menschel
-mikf
-mrscrapy
-NDagestad
-Neurognostic
-NextFire
-nick-cd
-permunkle
-pzhlkj6612
-ringus1
-rjy
-Schmoaaaaah
-sjthespian
-theperfectpunk
-toomyzoom
-truedread
-TxI5
-unbeatable-101
-vampirefrog
-vidiot720
-viktor-enzell
-zhgwn
-barthelmannk
-berkanteber
-OverlordQ
-rexlambert22
-Ti4eeT4e
-AmanSal1
-bbilly1
-meliber
-nnoboa
-rdamas
-RfadnjdExt
-urectanc
-nao20010128nao/Lesmiscore
-04-pasha-04
-aaruni96
-aky-01
-AmirAflak
-ApoorvShah111
-at-wat
-davinkevin
-demon071
-denhotte
-FinnRG
-fireattack
-Frankgoji
-GD-Slime
-hatsomatt
-ifan-t
-kshitiz305
-kylegustavo
-mabdelfattah
-nathantouze
-niemands
-Rajeshwaran2001
-RedDeffender
-Rohxn16
-sb0stn
-SevenLives
-simon300000
-snixon
-soundchaser128
-szabyg
-trainman261
-trislee
-wader
-Yalab7
-zhallgato
-zhong-yiyu
-Zprokkel
-AS6939
-drzraf
-handlerug
-jiru
-madewokherd
-xofe
-awalgarg
-midnightveil
-naginatana
-Riteo
-1100101
-aniolpages
-bartbroere
-CrendKing
-Esokrates
-HitomaruKonpaku
-LoserFox
-peci1
-saintliao
-shubhexists
-SirElderling
-almx
-elivinsky
-starius
-TravisDupes
-amir16yp
-Fymyte
-Ganesh910
-hashFactory
-kclauhk
-Kyraminol
-lstrojny
-middlingphys
-NickCis
-nicodato
-prettykool
-S-Aarab
-sonmezberkay
-TSRBerry
-114514ns
-agibson-fl
-alard
-alien-developers
-antonkesy
-ArnauvGilotra
-Arthurszzz
-Bibhav48
-Bl4Cc4t
-boredzo
-Caesim404
-chkuendig
-chtk
-Danish-H
-dasidiot
-diman8
-divStar
-DmitryScaletta
-feederbox826
-gmes78
-gonzalezjo
-hui1601
-infanf
-jazz1611
-jingtra
-jkmartindale
-johnvictorfs
-llistochek
-marcdumais
-martinxyz
-michal-repo
-mrmedieval
-nbr23
-Nicals
-Noor-5
-NurTasin
-pompos02
-Pranaxcau
-pwaldhauer
-RaduManole
-RalphORama
-rrgomes
-ruiminggu
-rvsit
-sefidel
-shmohawk
-Snack-X
-src-tinkerer
-stilor
-syntaxsurge
-t-nil
-ufukk
-vista-narvas
-x11x
-xpadev-net
-Xpl0itU
-YoshichikaAAA
-zhijinwuu
-alb
-hruzgar
-kasper93
-leoheitmannruiz
-luiso1979
-nipotan
-Offert4324
-sta1us
-Tomoka1
-trwstin
-alexhuot1
-clienthax
-DaPotato69
-emqi
-hugohaa
-imanoreotwe
-JakeFinley96
-lostfictions
-minamotorin
-ocococococ
-Podiumnoche
-RasmusAntons
-roeniss
-shoxie007
-Szpachlarz
-The-MAGI
-TuxCoder
-voidful
-vtexier
-WyohKnott
-trueauracoral
-ASertacAkkaya
-axpauls
-chilinux
-hafeoz
-JSubelj
-jucor
-megumintyan
-mgedmin
-Niluge-KiWi
-peisenwang
-TheZ3ro
-tippfehlr
-varunchopra
-DrakoCpp
-PatrykMis
-DinhHuy2010
-exterrestris
-harbhim
-LeSuisse
-DunnesH
-iancmy
-mokrueger
-luvyana
-szantnerb
-hugepower
-scribblemaniac
-Codenade
-Demon000
-Deukhoofd
-grqz
-hibes
-Khaoklong51
-kieraneglin
-lengzuo
-naglis
-ndyanx
-otovalek
-quad
-rakslice
-sahilsinghss73
-tony-hn
-xingchensong
-BallzCrasher
-coreywright
-eric321
-poyhen
-tetra-fox
-444995
-63427083
-allendema
-DarkZeros
-DTrombett
-imranh2
-KarboniteKream
-mikkovedru
-pktiuk
-rubyevadestaxes
-avagordon01
-CounterPillow
-JoseAngelB
-KBelmin
-kesor
-MellowKyler
-Wesley107772
-a13ssandr0
-ChocoLZS
-doe1080
-hugovdev
-jshumphrey
-julionc
-manavchaudhary1
-powergold1
-Sakura286
-SamDecrock
-stratus-ss
-subrat-lima
-gitninja1234
-jkruse
-xiaomac
-wesson09
-Crypto90
-MutantPiggieGolem1
-Sanceilaks
-Strkmn
-0x9fff00
-4ft35t
-7x11x13
-b5i
-cotko
-d3d9
-Dioarya
-finch71
-hexahigh
-InvalidUsernameException
-jixunmoe
-knackku
-krandor
-kvk-2015
-lonble
-msm595
-n10dollar
-NecroRomnt
-pjrobertson
-subsense
-test20140
-arantius
-entourage8
-lfavole
-mp3butcher
-slipinthedove
-YoshiTabletopGamer
-Arc8ne
-benfaerber
-chrisellsworth
-fries1234
-Kenshin9977
-MichaelDeBoey
-msikma
-pedro
-pferreir
-red-acid
-refack
-rysson
-somini
-thedenv
-vallovic
-arabcoders
-mireq
-mlabeeb03
-1271
-CasperMcFadden95
-Kicer86
-Kiritomo
-leeblackc
-meGAmeS1
-NeonMan
-pj47x
-troex
-WouterGordts
-baierjan
-GeoffreyFrogeye
-Pawka
-v3DJG6GL
-yozel
-brian6932
-iednod55
-maxbin123
-nullpos
-anlar
-eason1478
-ceandreasen
-chauhantirth
-helpimnotdrowning
-adamralph
-averageFOSSenjoyer
-bubo
-flanter21
-Georift
-moonshinerd
-R0hanW
-ShockedPlot7560
-swayll
-atsushi2965
-barryvan
-injust
-iribeirocampos
-rolandcrosby
-Sojiroh
-tchebb
-AzartX47
-e2dk4r
-junyilou
-PierreMesure
-Randalix
-runarmod
-gitchasing
-zakaryan2004
-cdce8p
-nicolaasjan
-willsmillie
-CasualYT31
-cecilia-sanare
-dhwz
-robin-mu
-shssoichiro
-thanhtaivtt
-uoag

Collaborators.md

@@ -0,0 +1,52 @@
+# Collaborators
+
+This is a list of the collaborators of the project and their major contributions. See the [Changelog](Changelog.md) for more details.
+
+You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [authors of youtube-dl](https://github.com/ytdl-org/youtube-dl/blob/master/AUTHORS)
+
+
+## [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)
+
+* Owner of the fork
+
+
+
+## [shirt](https://github.com/shirt-dev)
+
+[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/shirt)
+
+* Multithreading (`-N`) and aria2c support for fragment downloads
+* Support for media initialization and discontinuity in HLS
+* The self-updater (`-U`)
+
+
+
+## [coletdjnz](https://github.com/coletdjnz)
+
+[![gh-sponsor](https://img.shields.io/badge/_-Sponsor-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
+
+* 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
+
+
+
+## [Ashish0804](https://github.com/Ashish0804) <sub><sup>[Inactive]</sup></sub>
+
+[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804)
+
+* Added support for new websites BiliIntl, DiscoveryPlusIndia, OlympicsReplay, PlanetMarathi, ShemarooMe, Utreon, Zee5 etc
+* Added playlist/series downloads for Hotstar, ParamountPlus, Rumble, SonyLIV, Trovo, TubiTv, Voot etc
+* Improved/fixed support for HiDive, HotStar, Hungama, LBRY, LinkedInLearning, Mxplayer, SonyLiv, TV2, Vimeo, VLive etc
+
+
+## [Lesmiscore](https://github.com/Lesmiscore) (nao20010128nao)
+
+**Bitcoin**: bc1qfd02r007cutfdjwjmyy9w23rjvtls6ncve7r3s  
+**Monacoin**: mona1q3tf7dzvshrhfe3md379xtvt2n22duhglv5dskr
+
+* 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

MANIFEST.in

@@ -0,0 +1,10 @@
+include AUTHORS
+include Changelog.md
+include LICENSE
+include README.md
+include completions/*/*
+include supportedsites.md
+include yt-dlp.1
+include requirements.txt
+recursive-include devscripts *
+recursive-include test *

Maintainers.md

@@ -1,87 +0,0 @@
-# Maintainers
-
-This file lists the maintainers of yt-dlp and their major contributions. See the [Changelog](Changelog.md) for more details.
-
-You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [authors of youtube-dl](https://github.com/ytdl-org/youtube-dl/blob/master/AUTHORS)
-
-## Core Maintainers
-
-Core Maintainers are responsible for reviewing and merging contributions, publishing releases, and steering the overall direction of the project.
-
-**You can contact the core maintainers via `maintainers@yt-dlp.org`.**
-
-This is **NOT** a support channel. [Open an issue](https://github.com/yt-dlp/yt-dlp/issues/new/choose) if you need help or want to report a bug.
-
-### [coletdjnz](https://github.com/coletdjnz)
-
-[![gh-sponsor](https://img.shields.io/badge/_-Github-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
-
-* Overhauled the networking stack and implemented support for `requests` and `curl_cffi` (`--impersonate`) HTTP clients
-* Reworked the plugin architecture to support installing plugins across all yt-dlp distributions (exe, pip, etc.)
-* Maintains support for YouTube
-* Added and fixed support for various other sites
-
-### [bashonly](https://github.com/bashonly)
-
-* Rewrote and maintains the build/release workflows and the self-updater: executables, automated/nightly/master releases, `--update-to`
-* Overhauled external downloader cookie handling
-* Added `--cookies-from-browser` support for Firefox containers
-* Overhauled and maintains support for sites like Youtube, Vimeo, Twitter, TikTok, etc
-* Added support for sites like Dacast, Kick, Loom, SproutVideo, Triller, Weverse, etc
-
-
-### [Grub4K](https://github.com/Grub4K)
-
-[![gh-sponsor](https://img.shields.io/badge/_-Github-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/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)
-
-* `--update-to`, self-updater rewrite, automated/nightly/master releases
-* Reworked internals like `traverse_obj`, various core refactors and bugs fixes
-* Implemented proper progress reporting for parallel downloads
-* Improved/fixed/added Bundestag, crunchyroll, pr0gramm, Twitter, WrestleUniverse etc
-
-
-### [sepro](https://github.com/seproDev)
-
-* UX improvements: Warn when ffmpeg is missing, warn when double-clicking exe
-* Code cleanup: Remove dead extractors, mark extractors as broken, enable/apply ruff rules
-* Improved/fixed/added ArdMediathek, DRTV, Floatplane, MagentaMusik, Naver, Nebula, OnDemandKorea, Vbox7 etc
-
-
-## Inactive Core Maintainers
-
-### [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-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/pukkandan)
-
-* Founder of the fork
-* Lead Maintainer from 2021-2024
-
-
-### [shirt](https://github.com/shirt-dev)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/shirt)
-
-* Multithreading (`-N`) and aria2c support for fragment downloads
-* Support for media initialization and discontinuity in HLS
-* The self-updater (`-U`)
-
-
-### [Ashish0804](https://github.com/Ashish0804)
-
-[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804)
-
-* Added support for new websites BiliIntl, DiscoveryPlusIndia, OlympicsReplay, PlanetMarathi, ShemarooMe, Utreon, Zee5 etc
-* Added playlist/series downloads for Hotstar, ParamountPlus, Rumble, SonyLIV, Trovo, TubiTv, Voot etc
-* Improved/fixed support for HiDive, HotStar, Hungama, LBRY, LinkedInLearning, Mxplayer, SonyLiv, TV2, Vimeo, VLive etc
-
-## Triage Maintainers
-
-Triage Maintainers are frequent contributors who can manage issues and pull requests.
-
-- [gamer191](https://github.com/gamer191)
-- [garret1317](https://github.com/garret1317)
-- [pzhlkj6612](https://github.com/pzhlkj6612)
-- [DTrombett](https://github.com/dtrombett)
-- [doe1080](https://github.com/doe1080)
-- [grqz](https://github.com/grqz)

Makefile

@@ -1,40 +1,30 @@
 all: lazy-extractors yt-dlp doc pypi-files
-all-extra: lazy-extractors yt-dlp-extra doc pypi-files
 clean: clean-test clean-dist
 clean-all: clean clean-cache
 completions: completion-bash completion-fish completion-zsh
-doc: README.md CONTRIBUTING.md CONTRIBUTORS issuetemplates supportedsites
+doc: README.md CONTRIBUTING.md issuetemplates supportedsites
 ot: offlinetest
 tar: yt-dlp.tar.gz
 
-# Keep this list in sync with pyproject.toml includes/artifacts
+# Keep this list in sync with MANIFEST.in
 # intended use: when building a source distribution,
-# make pypi-files && python3 -m build -sn .
+# make pypi-files && python setup.py sdist
 pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \
-            completions yt-dlp.1 pyproject.toml devscripts/* test/*
+	        completions yt-dlp.1 requirements.txt setup.cfg devscripts/* test/*
 
-.PHONY: all clean clean-all clean-test clean-dist clean-cache \
-        completions completion-bash completion-fish completion-zsh \
-        doc issuetemplates supportedsites ot offlinetest codetest test \
-        tar pypi-files lazy-extractors install uninstall \
-        all-extra yt-dlp-extra current-ejs-version
-
-.IGNORE: current-ejs-version
-.SILENT: current-ejs-version
+.PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites
 
 clean-test:
-	rm -rf tmp/ *.annotations.xml *.aria2 *.description *.dump *.frag \
+	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 *.lrc *.m4a *.m4v *.mhtml *.mkv *.mov *.mp3 *.mp4 \
-	*.mpg *.mpga *.oga *.ogg *.opus *.png *.sbv *.srt *.ssa *.swf *.tt *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp \
-	test/testdata/sigs/player-*.js test/testdata/thumbnails/empty.webp "test/testdata/thumbnails/foo %d bar/foo_%d."*
+	*.3gp *.ape *.ass *.avi *.desktop *.f4v *.flac *.flv *.jpeg *.jpg *.m4a *.mpga *.m4v *.mhtml *.mkv *.mov \
+	*.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 \
-	yt-dlp.zip .ejs-* yt_dlp_ejs/
+	yt_dlp/extractor/lazy_extractors.py *.spec CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe yt_dlp.egg-info/ AUTHORS .mailmap
 clean-cache:
 	find . \( \
-		-type d -name ".*_cache" -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
+		-type d -name .pytest_cache -o -type d -name __pycache__ -o -name "*.pyc" -o -name "*.class" \
 	\) -prune -exec rm -rf {} \;
 
 completion-bash: completions/bash/yt-dlp
@@ -43,19 +33,17 @@ 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
 PYTHON ?= /usr/bin/env python3
-GNUTAR ?= tar
 
-# set markdown input format to "markdown-smart" for pandoc version 2+ and to "markdown" for pandoc prior to version 2
-PANDOC_VERSION_CMD = pandoc -v 2>/dev/null | head -n1 | cut -d' ' -f2 | head -c1
-PANDOC_VERSION != $(PANDOC_VERSION_CMD)
-PANDOC_VERSION ?= $(shell $(PANDOC_VERSION_CMD))
-MARKDOWN_CMD = if [ "$(PANDOC_VERSION)" = "1" -o "$(PANDOC_VERSION)" = "0" ]; then echo markdown; else echo markdown-smart; fi
-MARKDOWN != $(MARKDOWN_CMD)
-MARKDOWN ?= $(shell $(MARKDOWN_CMD))
+# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
+SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
+
+# set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
+MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
 
 install: lazy-extractors yt-dlp yt-dlp.1 completions
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -77,59 +65,34 @@ uninstall:
 	rm -f $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
 
 codetest:
-	ruff check .
-	autopep8 --diff .
+	flake8 .
 
 test:
-	$(PYTHON) -m pytest -Werror
+	$(PYTHON) -m pytest
 	$(MAKE) codetest
 
 offlinetest: codetest
-	$(PYTHON) -m pytest -Werror -m "not download"
+	$(PYTHON) -m pytest -k "not download"
 
-PY_CODE_FOLDERS_CMD = find yt_dlp -type f -name '__init__.py' | sed 's|/__init__\.py||' | grep -v '/__' | sort
-PY_CODE_FOLDERS != $(PY_CODE_FOLDERS_CMD)
-PY_CODE_FOLDERS ?= $(shell $(PY_CODE_FOLDERS_CMD))
-
-PY_CODE_FILES_CMD = for f in $(PY_CODE_FOLDERS) ; do echo "$$f" | sed 's|$$|/*.py|' ; done
-PY_CODE_FILES != $(PY_CODE_FILES_CMD)
-PY_CODE_FILES ?= $(shell $(PY_CODE_FILES_CMD))
-
-JS_CODE_FOLDERS_CMD = find yt_dlp -type f -name '*.js' | sed 's|/[^/]\{1,\}\.js$$||' | uniq
-JS_CODE_FOLDERS != $(JS_CODE_FOLDERS_CMD)
-JS_CODE_FOLDERS ?= $(shell $(JS_CODE_FOLDERS_CMD))
-
-JS_CODE_FILES_CMD = for f in $(JS_CODE_FOLDERS) ; do echo "$$f" | sed 's|$$|/*.js|' ; done
-JS_CODE_FILES != $(JS_CODE_FILES_CMD)
-JS_CODE_FILES ?= $(shell $(JS_CODE_FILES_CMD))
-
-yt-dlp.zip: $(PY_CODE_FILES) $(JS_CODE_FILES)
+# XXX: This is hard to maintain
+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 $(PY_CODE_FOLDERS) ; do \
+	for d in $(CODE_FOLDERS) ; do \
 	  mkdir -p zip/$$d ;\
 	  cp -pPR $$d/*.py zip/$$d/ ;\
 	done
-	for d in $(JS_CODE_FOLDERS) ; do \
-	  mkdir -p zip/$$d ;\
-	  cp -pPR $$d/*.js zip/$$d/ ;\
-	done
-	(cd zip && touch -t 200001010101 $(PY_CODE_FILES) $(JS_CODE_FILES))
-	rm -f zip/yt_dlp/__main__.py
-	(cd zip && zip -q ../yt-dlp.zip $(PY_CODE_FILES) $(JS_CODE_FILES))
+	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 yt_dlp/*/*/*.py __main__.py
 	rm -rf zip
-
-yt-dlp: yt-dlp.zip
-	mkdir -p zip
-	cp -pP yt_dlp/__main__.py zip/
-	touch -t 200001010101 zip/__main__.py
-	(cd zip && zip -q ../yt-dlp.zip __main__.py)
 	echo '#!$(PYTHON)' > yt-dlp
 	cat yt-dlp.zip >> yt-dlp
 	rm yt-dlp.zip
 	chmod a+x yt-dlp
-	rm -rf zip
 
-README.md: $(PY_CODE_FILES) devscripts/make_readme.py
+README.md: yt_dlp/*.py yt_dlp/*/*.py devscripts/make_readme.py
 	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --ignore-config --help | $(PYTHON) devscripts/make_readme.py
 
 CONTRIBUTING.md: README.md devscripts/make_contributing.py
@@ -154,90 +117,41 @@ yt-dlp.1: README.md devscripts/prepare_manpage.py
 	pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1
 	rm -f yt-dlp.1.temp.md
 
-completions/bash/yt-dlp: $(PY_CODE_FILES) devscripts/bash-completion.in
+completions/bash/yt-dlp: yt_dlp/*.py yt_dlp/*/*.py devscripts/bash-completion.in
 	mkdir -p completions/bash
 	$(PYTHON) devscripts/bash-completion.py
 
-completions/zsh/_yt-dlp: $(PY_CODE_FILES) devscripts/zsh-completion.in
+completions/zsh/_yt-dlp: yt_dlp/*.py yt_dlp/*/*.py devscripts/zsh-completion.in
 	mkdir -p completions/zsh
 	$(PYTHON) devscripts/zsh-completion.py
 
-completions/fish/yt-dlp.fish: $(PY_CODE_FILES) devscripts/fish-completion.in
+completions/fish/yt-dlp.fish: yt_dlp/*.py yt_dlp/*/*.py devscripts/fish-completion.in
 	mkdir -p completions/fish
 	$(PYTHON) devscripts/fish-completion.py
 
-_EXTRACTOR_FILES_CMD = find yt_dlp/extractor -name '*.py' -and -not -name 'lazy_extractors.py'
-_EXTRACTOR_FILES != $(_EXTRACTOR_FILES_CMD)
-_EXTRACTOR_FILES ?= $(shell $(_EXTRACTOR_FILES_CMD))
+_EXTRACTOR_FILES = $(shell find yt_dlp/extractor -name '*.py' -and -not -name 'lazy_extractors.py')
 yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
 	$(PYTHON) devscripts/make_lazy_extractors.py $@
 
 yt-dlp.tar.gz: all
-	@$(GNUTAR) -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' \
 		--exclude '*.pyo' \
 		--exclude '*~' \
 		--exclude '__pycache__' \
-		--exclude '.*_cache' \
+		--exclude '.pytest_cache' \
 		--exclude '.git' \
 		-- \
 		README.md supportedsites.md Changelog.md LICENSE \
-		CONTRIBUTING.md Maintainers.md CONTRIBUTORS AUTHORS \
-		Makefile yt-dlp.1 README.txt completions .gitignore \
-		yt-dlp yt_dlp pyproject.toml devscripts test
+		CONTRIBUTING.md Collaborators.md CONTRIBUTORS AUTHORS \
+		Makefile MANIFEST.in yt-dlp.1 README.txt completions \
+		setup.py setup.cfg yt-dlp yt_dlp requirements.txt \
+		devscripts test
 
-AUTHORS: Changelog.md
-	@if [ -d '.git' ] && command -v git > /dev/null ; then \
-	  echo 'Generating $@ from git commit history' ; \
-	  git shortlog -s -n HEAD | cut -f2 | sort > $@ ; \
-	fi
+AUTHORS: .mailmap
+	git shortlog -s -n | cut -f2 | sort > AUTHORS
 
-CONTRIBUTORS: Changelog.md
-	@if [ -d '.git' ] && command -v git > /dev/null ; then \
-	  echo 'Updating $@ from git commit history' ; \
-	  $(PYTHON) devscripts/make_changelog.py -v -c > /dev/null ; \
-	fi
-
-# The following EJS_-prefixed variables are auto-generated by devscripts/update_ejs.py
-# DO NOT EDIT!
-EJS_VERSION = 0.3.1
-EJS_WHEEL_NAME = yt_dlp_ejs-0.3.1-py3-none-any.whl
-EJS_WHEEL_HASH = sha256:a6e3548874db7c774388931752bb46c7f4642c044b2a189e56968f3d5ecab622
-EJS_PY_FOLDERS = yt_dlp_ejs yt_dlp_ejs/yt yt_dlp_ejs/yt/solver
-EJS_PY_FILES = yt_dlp_ejs/__init__.py yt_dlp_ejs/_version.py yt_dlp_ejs/yt/__init__.py yt_dlp_ejs/yt/solver/__init__.py
-EJS_JS_FOLDERS = yt_dlp_ejs/yt/solver
-EJS_JS_FILES = yt_dlp_ejs/yt/solver/core.min.js yt_dlp_ejs/yt/solver/lib.min.js
-
-yt-dlp-extra: current-ejs-version .ejs-$(EJS_VERSION) $(EJS_PY_FILES) $(EJS_JS_FILES) yt-dlp.zip
-	mkdir -p zip
-	for d in $(EJS_PY_FOLDERS) ; do \
-	  mkdir -p zip/$$d ;\
-	  cp -pPR $$d/*.py zip/$$d/ ;\
-	done
-	for d in $(EJS_JS_FOLDERS) ; do \
-	  mkdir -p zip/$$d ;\
-	  cp -pPR $$d/*.js zip/$$d/ ;\
-	done
-	(cd zip && touch -t 200001010101 $(EJS_PY_FILES) $(EJS_JS_FILES))
-	(cd zip && zip -q ../yt-dlp.zip $(EJS_PY_FILES) $(EJS_JS_FILES))
-	cp -pP yt_dlp/__main__.py zip/
-	touch -t 200001010101 zip/__main__.py
-	(cd zip && zip -q ../yt-dlp.zip __main__.py)
-	echo '#!$(PYTHON)' > yt-dlp
-	cat yt-dlp.zip >> yt-dlp
-	rm yt-dlp.zip
-	chmod a+x yt-dlp
-	rm -rf zip
-
-.ejs-$(EJS_VERSION):
-	@echo Downloading yt-dlp-ejs
-	@echo "yt-dlp-ejs==$(EJS_VERSION) --hash $(EJS_WHEEL_HASH)" > .ejs-requirements.txt
-	$(PYTHON) -m pip download -d ./build --no-deps --require-hashes -r .ejs-requirements.txt
-	unzip -o build/$(EJS_WHEEL_NAME) "yt_dlp_ejs/*"
-	@touch .ejs-$(EJS_VERSION)
-
-current-ejs-version:
-	rm -rf .ejs-*
-	touch .ejs-$$($(PYTHON) -c 'import sys; sys.path = [""]; from yt_dlp_ejs import version; print(version)' 2>/dev/null)
+.mailmap:
+	git shortlog -s -e -n | awk '!(out[$$NF]++) { $$1="";sub(/^[ \t]+/,""); print}' > .mailmap

bundle/docker/compose.yml

@@ -1,178 +0,0 @@
-services:
-
-  linux_x86_64:
-    build:
-      context: linux
-      target: build
-      platforms:
-        - "linux/amd64"
-      args:
-        BUILDIMAGE: ghcr.io/yt-dlp/manylinux2014_x86_64-shared:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      CHANNEL: ${CHANNEL:?}
-      ORIGIN: ${ORIGIN:?}
-      VERSION:
-      PYTHON_VERSION:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../..:/yt-dlp
-
-  linux_x86_64_verify:
-    build:
-      context: linux
-      target: verify
-      platforms:
-        - "linux/amd64"
-      args:
-        VERIFYIMAGE: quay.io/pypa/manylinux2014_x86_64:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      UPDATE_TO:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../../dist:/build
-
-  linux_aarch64:
-    build:
-      context: linux
-      target: build
-      platforms:
-        - "linux/arm64"
-      args:
-        BUILDIMAGE: ghcr.io/yt-dlp/manylinux2014_aarch64-shared:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      CHANNEL: ${CHANNEL:?}
-      ORIGIN: ${ORIGIN:?}
-      VERSION:
-      PYTHON_VERSION:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../..:/yt-dlp
-
-  linux_aarch64_verify:
-    build:
-      context: linux
-      target: verify
-      platforms:
-        - "linux/arm64"
-      args:
-        VERIFYIMAGE: quay.io/pypa/manylinux2014_aarch64:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      UPDATE_TO:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../../dist:/build
-
-  linux_armv7l:
-    build:
-      context: linux
-      target: build
-      platforms:
-        - "linux/arm/v7"
-      args:
-        BUILDIMAGE: ghcr.io/yt-dlp/manylinux_2_31_armv7l-shared:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      CHANNEL: ${CHANNEL:?}
-      ORIGIN: ${ORIGIN:?}
-      VERSION:
-      PYTHON_VERSION:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../..:/yt-dlp
-      - ../../venv:/yt-dlp-build-venv
-
-  linux_armv7l_verify:
-    build:
-      context: linux
-      target: verify
-      platforms:
-        - "linux/arm/v7"
-      args:
-        VERIFYIMAGE: arm32v7/debian:bullseye
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      UPDATE_TO:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../../dist:/build
-
-  musllinux_x86_64:
-    build:
-      context: linux
-      target: build
-      platforms:
-        - "linux/amd64"
-      args:
-        BUILDIMAGE: ghcr.io/yt-dlp/musllinux_1_2_x86_64-shared:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      CHANNEL: ${CHANNEL:?}
-      ORIGIN: ${ORIGIN:?}
-      VERSION:
-      PYTHON_VERSION:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../..:/yt-dlp
-
-  musllinux_x86_64_verify:
-    build:
-      context: linux
-      target: verify
-      platforms:
-        - "linux/amd64"
-      args:
-        VERIFYIMAGE: alpine:3.22
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      UPDATE_TO:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../../dist:/build
-
-  musllinux_aarch64:
-    build:
-      context: linux
-      target: build
-      platforms:
-        - "linux/arm64"
-      args:
-        BUILDIMAGE: ghcr.io/yt-dlp/musllinux_1_2_aarch64-shared:latest
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      CHANNEL: ${CHANNEL:?}
-      ORIGIN: ${ORIGIN:?}
-      VERSION:
-      PYTHON_VERSION:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-      EXCLUDE_CURL_CFFI: "1"
-    volumes:
-      - ../..:/yt-dlp
-
-  musllinux_aarch64_verify:
-    build:
-      context: linux
-      target: verify
-      platforms:
-        - "linux/arm64"
-      args:
-        VERIFYIMAGE: alpine:3.22
-    environment:
-      EXE_NAME: ${EXE_NAME:?}
-      UPDATE_TO:
-      SKIP_ONEDIR_BUILD:
-      SKIP_ONEFILE_BUILD:
-    volumes:
-      - ../../dist:/build

bundle/docker/linux/Dockerfile

@@ -1,16 +0,0 @@
-ARG BUILDIMAGE=ghcr.io/yt-dlp/manylinux2014_x86_64-shared:latest
-ARG VERIFYIMAGE=alpine:3.22
-
-
-FROM $BUILDIMAGE AS build
-
-WORKDIR /yt-dlp
-COPY build.sh /build.sh
-ENTRYPOINT ["/build.sh"]
-
-
-FROM $VERIFYIMAGE AS verify
-
-WORKDIR /testing
-COPY verify.sh /verify.sh
-ENTRYPOINT ["/verify.sh"]

bundle/docker/linux/build.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-set -exuo pipefail
-
-if [[ -z "${PYTHON_VERSION:-}" ]]; then
-    PYTHON_VERSION="3.13"
-    echo "Defaulting to using Python ${PYTHON_VERSION}"
-fi
-
-function runpy {
-    "/opt/shared-cpython-${PYTHON_VERSION}/bin/python${PYTHON_VERSION}" "$@"
-}
-
-function venvpy {
-    "python${PYTHON_VERSION}" "$@"
-}
-
-INCLUDES=(
-    --include-group pyinstaller
-    --include-group secretstorage
-)
-
-if [[ -z "${EXCLUDE_CURL_CFFI:-}" ]]; then
-    INCLUDES+=(--include-group curl-cffi)
-fi
-
-runpy -m venv /yt-dlp-build-venv
-# shellcheck disable=SC1091
-source /yt-dlp-build-venv/bin/activate
-# Inside the venv we use venvpy instead of runpy
-venvpy -m ensurepip --upgrade --default-pip
-venvpy -m devscripts.install_deps --only-optional-groups --include-group build
-venvpy -m devscripts.install_deps "${INCLUDES[@]}"
-venvpy -m devscripts.make_lazy_extractors
-venvpy devscripts/update-version.py -c "${CHANNEL}" -r "${ORIGIN}" "${VERSION}"
-
-if [[ -z "${SKIP_ONEDIR_BUILD:-}" ]]; then
-    mkdir -p /build
-    venvpy -m bundle.pyinstaller --onedir --distpath=/build
-    pushd "/build/${EXE_NAME}"
-    chmod +x "${EXE_NAME}"
-    venvpy -m zipfile -c "/yt-dlp/dist/${EXE_NAME}.zip" ./
-    popd
-fi
-
-if [[ -z "${SKIP_ONEFILE_BUILD:-}" ]]; then
-    venvpy -m bundle.pyinstaller
-    chmod +x "./dist/${EXE_NAME}"
-fi

bundle/docker/linux/verify.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-set -eu
-
-if [ -n "${SKIP_ONEFILE_BUILD:-}" ]; then
-    if [ -n "${SKIP_ONEDIR_BUILD:-}" ]; then
-        echo "All executable builds were skipped"
-        exit 1
-    fi
-    echo "Extracting zip to verify onedir build"
-    if command -v python3 >/dev/null 2>&1; then
-        python3 -m zipfile -e "/build/${EXE_NAME}.zip" ./
-    else
-        echo "Attempting to install unzip"
-        if command -v dnf >/dev/null 2>&1; then
-            dnf -y install --allowerasing unzip
-        elif command -v yum >/dev/null 2>&1; then
-            yum -y install unzip
-        elif command -v apt-get >/dev/null 2>&1; then
-            DEBIAN_FRONTEND=noninteractive apt-get update -qq
-            DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends unzip
-        elif command -v apk >/dev/null 2>&1; then
-            apk add --no-cache unzip
-        else
-            echo "Unsupported image"
-            exit 1
-        fi
-        unzip "/build/${EXE_NAME}.zip" -d ./
-    fi
-    chmod +x "./${EXE_NAME}"
-    "./${EXE_NAME}" -v || true
-    "./${EXE_NAME}" --version
-    exit 0
-fi
-
-echo "Verifying onefile build"
-cp "/build/${EXE_NAME}" ./
-chmod +x "./${EXE_NAME}"
-
-if [ -z "${UPDATE_TO:-}" ]; then
-    "./${EXE_NAME}" -v || true
-    "./${EXE_NAME}" --version
-    exit 0
-fi
-
-cp "./${EXE_NAME}" "./${EXE_NAME}_downgraded"
-version="$("./${EXE_NAME}" --version)"
-"./${EXE_NAME}_downgraded" -v --update-to "${UPDATE_TO}"
-downgraded_version="$("./${EXE_NAME}_downgraded" --version)"
-if [ "${version}" = "${downgraded_version}" ]; then
-    exit 1
-fi

devscripts/__init__.py

@@ -0,0 +1 @@
+# Empty file needed to make devscripts.utils properly importable from outside

devscripts/bash-completion.in

@@ -6,17 +6,13 @@ __yt_dlp()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="{{flags}}"
     keywords=":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
-    fileopts="-a|--batch-file|--download-archive|--cookies|--load-info-json"
+    fileopts="-a|--batch-file|--download-archive|--cookies|--load-info"
     diropts="--cache-dir"
 
     if [[ ${prev} =~ ${fileopts} ]]; then
-        local IFS=$'\n'
-        type compopt &>/dev/null && compopt -o filenames
         COMPREPLY=( $(compgen -f -- ${cur}) )
         return 0
     elif [[ ${prev} =~ ${diropts} ]]; then
-        local IFS=$'\n'
-        type compopt &>/dev/null && compopt -o dirnames
         COMPREPLY=( $(compgen -d -- ${cur}) )
         return 0
     fi

devscripts/bash-completion.py

@@ -9,8 +9,8 @@
 
 import yt_dlp
 
-BASH_COMPLETION_FILE = 'completions/bash/yt-dlp'
-BASH_COMPLETION_TEMPLATE = 'devscripts/bash-completion.in'
+BASH_COMPLETION_FILE = "completions/bash/yt-dlp"
+BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
 def build_completion(opt_parser):
@@ -21,9 +21,9 @@ def build_completion(opt_parser):
             opts_flag.append(option.get_opt_string())
     with open(BASH_COMPLETION_TEMPLATE) as f:
         template = f.read()
-    with open(BASH_COMPLETION_FILE, 'w') as f:
+    with open(BASH_COMPLETION_FILE, "w") as f:
         # just using the special char
-        filled_template = template.replace('{{flags}}', ' '.join(opts_flag))
+        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)
 
 

devscripts/changelog_override.json

@@ -1,312 +0,0 @@
-[
-    {
-        "action": "add",
-        "when": "29cb20bd563c02671b31dd840139e93dd37150a1",
-        "short": "[priority] **A new release type has been added!**\n    * [`nightly`](https://github.com/yt-dlp/yt-dlp/releases/tag/nightly) builds will be made after each push, containing the latest fixes (but also possibly bugs).\n    * When using `--update`/`-U`, a release binary will only update to its current channel (either `stable` or `nightly`).\n    * The `--update-to` option has been added allowing the user more control over program upgrades (or downgrades).\n    * `--update-to` can change the release channel (`stable`, `nightly`) and also upgrade or downgrade to specific tags.\n    * **Usage**: `--update-to CHANNEL`, `--update-to TAG`, `--update-to CHANNEL@TAG`"
-    },
-    {
-        "action": "add",
-        "when": "5038f6d713303e0967d002216e7a88652401c22a",
-        "short": "[priority] **YouTube throttling fixes!**"
-    },
-    {
-        "action": "remove",
-        "when": "2e023649ea4e11151545a34dc1360c114981a236"
-    },
-    {
-        "action": "add",
-        "when": "01aba2519a0884ef17d5f85608dbd2a455577147",
-        "short": "[priority] YouTube: Improved throttling and signature fixes"
-    },
-    {
-        "action": "change",
-        "when": "c86e433c35fe5da6cb29f3539eef97497f84ed38",
-        "short": "[extractor/niconico:series] Fix extraction (#6898)",
-        "authors": ["sqrtNOT"]
-    },
-    {
-        "action": "change",
-        "when": "69a40e4a7f6caa5662527ebd2f3c4e8aa02857a2",
-        "short": "[extractor/youtube:music_search_url] Extract title (#7102)",
-        "authors": ["kangalio"]
-    },
-    {
-        "action": "change",
-        "when": "8417f26b8a819cd7ffcd4e000ca3e45033e670fb",
-        "short": "Add option `--color` (#6904)",
-        "authors": ["Grub4K"]
-    },
-    {
-        "action": "change",
-        "when": "b4e0d75848e9447cee2cd3646ce54d4744a7ff56",
-        "short": "Improve `--download-sections`\n    - Support negative time-ranges\n    - Add `*from-url` to obey time-ranges in URL",
-        "authors": ["pukkandan"]
-    },
-    {
-        "action": "change",
-        "when": "1e75d97db21152acc764b30a688e516f04b8a142",
-        "short": "[extractor/youtube] Add `ios` to default clients used\n        - IOS is affected neither by 403 nor by nsig so helps mitigate them preemptively\n        - IOS also has higher bit-rate 'premium' formats though they are not labeled as such",
-        "authors": ["pukkandan"]
-    },
-    {
-        "action": "change",
-        "when": "f2ff0f6f1914b82d4a51681a72cc0828115dcb4a",
-        "short": "[extractor/motherless] Add gallery support, fix groups (#7211)",
-        "authors": ["rexlambert22", "Ti4eeT4e"]
-    },
-    {
-        "action": "change",
-        "when": "a4486bfc1dc7057efca9dd3fe70d7fa25c56f700",
-        "short": "[misc] Revert \"Add automatic duplicate issue detection\"",
-        "authors": ["pukkandan"]
-    },
-    {
-        "action": "add",
-        "when": "1ceb657bdd254ad961489e5060f2ccc7d556b729",
-        "short": "[priority] Security: [[CVE-2023-35934](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-35934)] Fix [Cookie leak](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-v8mc-9377-rwjj)\n    - `--add-header Cookie:` is deprecated and auto-scoped to input URL domains\n    - Cookies are scoped when passed to external downloaders\n    - Add `cookies` field to info.json and deprecate `http_headers.Cookie`"
-    },
-    {
-        "action": "change",
-        "when": "b03fa7834579a01cc5fba48c0e73488a16683d48",
-        "short": "[ie/twitter] Revert 92315c03774cfabb3a921884326beb4b981f786b",
-        "authors": ["pukkandan"]
-    },
-    {
-        "action": "change",
-        "when": "fcd6a76adc49d5cd8783985c7ce35384b72e545f",
-        "short": "[test] Add tests for socks proxies (#7908)",
-        "authors": ["coletdjnz"]
-    },
-    {
-        "action": "change",
-        "when": "4bf912282a34b58b6b35d8f7e6be535770c89c76",
-        "short": "[rh:urllib] Remove dot segments during URL normalization (#7662)",
-        "authors": ["coletdjnz"]
-    },
-    {
-        "action": "change",
-        "when": "59e92b1f1833440bb2190f847eb735cf0f90bc85",
-        "short": "[rh:urllib] Simplify gzip decoding (#7611)",
-        "authors": ["Grub4K"]
-    },
-    {
-        "action": "add",
-        "when": "c1d71d0d9f41db5e4306c86af232f5f6220a130b",
-        "short": "[priority] **The minimum *recommended* Python version has been raised to 3.8**\nSince Python 3.7 has reached end-of-life, support for it will be dropped soon. [Read more](https://github.com/yt-dlp/yt-dlp/issues/7803)"
-    },
-    {
-        "action": "add",
-        "when": "61bdf15fc7400601c3da1aa7a43917310a5bf391",
-        "short": "[priority] Security: [[CVE-2023-40581](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-40581)] [Prevent RCE when using `--exec` with `%q` on Windows](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-42h4-v29r-42qg)\n    - The shell escape function is now using `\"\"` instead of `\\\"`.\n    - `utils.Popen` has been patched to properly quote commands."
-    },
-    {
-        "action": "change",
-        "when": "8a8b54523addf46dfd50ef599761a81bc22362e6",
-        "short": "[rh:requests] Add handler for `requests` HTTP library (#3668)\n\n\tAdds support for HTTPS proxies and persistent connections (keep-alive)",
-        "authors": ["bashonly", "coletdjnz", "Grub4K"]
-    },
-    {
-        "action": "add",
-        "when": "1d03633c5a1621b9f3a756f0a4f9dc61fab3aeaa",
-        "short": "[priority] **The release channels have been adjusted!**\n\t* [`master`](https://github.com/yt-dlp/yt-dlp-master-builds) builds are made after each push, containing the latest fixes (but also possibly bugs). This was previously the `nightly` channel.\n\t* [`nightly`](https://github.com/yt-dlp/yt-dlp-nightly-builds) builds are now made once a day, if there were any changes."
-    },
-    {
-        "action": "add",
-        "when": "f04b5bedad7b281bee9814686bba1762bae092eb",
-        "short": "[priority] Security: [[CVE-2023-46121](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46121)] Patch [Generic Extractor MITM Vulnerability via Arbitrary Proxy Injection](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-3ch3-jhc6-5r8x)\n\t- Disallow smuggling of arbitrary `http_headers`; extractors now only use specific headers"
-    },
-    {
-        "action": "change",
-        "when": "15f22b4880b6b3f71f350c64d70976ae65b9f1ca",
-        "short": "[webvtt] Allow spaces before newlines for CueBlock (#7681)",
-        "authors": ["TSRBerry"]
-    },
-    {
-        "action": "change",
-        "when": "4ce57d3b873c2887814cbec03d029533e82f7db5",
-        "short": "[ie] Support multi-period MPD streams (#6654)",
-        "authors": ["alard", "pukkandan"]
-    },
-    {
-        "action": "change",
-        "when": "aa7e9ae4f48276bd5d0173966c77db9484f65a0a",
-        "short": "[ie/xvideos] Support new URL format (#9502)",
-        "authors": ["sta1us"]
-    },
-    {
-        "action": "remove",
-        "when": "22e4dfacb61f62dfbb3eb41b31c7b69ba1059b80"
-    },
-    {
-        "action": "change",
-        "when": "e3a3ed8a981d9395c4859b6ef56cd02bc3148db2",
-        "short": "[cleanup:ie] No `from` stdlib imports in extractors",
-        "authors": ["pukkandan"]
-    },
-    {
-        "action": "add",
-        "when": "9590cc6b4768e190183d7d071a6c78170889116a",
-        "short": "[priority] Security: [[CVE-2024-22423](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-22423)] [Prevent RCE when using `--exec` with `%q` on Windows](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-hjq6-52gw-2g7p)\n    - The shell escape function now properly escapes `%`, `\\` and `\\n`.\n    - `utils.Popen` has been patched accordingly."
-    },
-    {
-        "action": "change",
-        "when": "41ba4a808b597a3afed78c89675a30deb6844450",
-        "short": "[ie/tiktok] Extract via mobile API only if extractor-arg is passed (#9938)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "remove",
-        "when": "6e36d17f404556f0e3a43f441c477a71a91877d9"
-    },
-    {
-        "action": "change",
-        "when": "beaf832c7a9d57833f365ce18f6115b88071b296",
-        "short": "[ie/soundcloud] Add `formats` extractor-arg (#10004)",
-        "authors": ["bashonly", "Grub4K"]
-    },
-    {
-        "action": "change",
-        "when": "5c019f6328ad40d66561eac3c4de0b3cd070d0f6",
-        "short": "[cleanup] Misc (#9765)",
-        "authors": ["bashonly", "Grub4K", "seproDev"]
-    },
-    {
-        "action": "change",
-        "when": "e6a22834df1776ec4e486526f6df2bf53cb7e06f",
-        "short": "[ie/orf:on] Add `prefer_segments_playlist` extractor-arg (#10314)",
-        "authors": ["seproDev"]
-    },
-    {
-        "action": "add",
-        "when": "6aaf96a3d6e7d0d426e97e11a2fcf52fda00e733",
-        "short": "[priority] Security: [[CVE-2024-38519](https://nvd.nist.gov/vuln/detail/CVE-2024-38519)] [Properly sanitize file-extension to prevent file system modification and RCE](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-79w7-vh3h-8g4j)\n    - Unsafe extensions are now blocked from being downloaded"
-    },
-    {
-        "action": "add",
-        "when": "6075a029dba70a89675ae1250e7cdfd91f0eba41",
-        "short": "[priority] Security: [[ie/douyutv] Do not use dangerous javascript source/URL](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-3v33-3wmw-3785)\n    - A dependency on potentially malicious third-party JavaScript code has been removed from the Douyu extractors"
-    },
-    {
-        "action": "add",
-        "when": "fb8b7f226d251e521a89b23c415e249e5b788e5c",
-        "short": "[priority] **The minimum *recommended* Python version has been raised to 3.9**\nSince Python 3.8 will reach end-of-life in October 2024, support for it will be dropped soon. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10086)"
-    },
-    {
-        "action": "change",
-        "when": "b31b81d85f00601710d4fac590c3e4efb4133283",
-        "short": "[ci] Rerun failed tests (#11143)",
-        "authors": ["Grub4K"]
-    },
-    {
-        "action": "add",
-        "when": "a886cf3e900f4a2ec00af705f883539269545609",
-        "short": "[priority] **py2exe is no longer supported**\nThis release's `yt-dlp_min.exe` will be the last, and it's actually a PyInstaller-bundled executable so that yt-dlp users updating their py2exe build with `-U` will be automatically migrated. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10087)"
-    },
-    {
-        "action": "add",
-        "when": "a886cf3e900f4a2ec00af705f883539269545609",
-        "short": "[priority] **Following this release, yt-dlp's Python dependencies *must* be installed using the `default` group**\nIf you're installing yt-dlp with pip/pipx or requiring yt-dlp in your own Python project, you'll need to specify `yt-dlp[default]` if you want to also install yt-dlp's optional dependencies (which were previously included by default). [Read more](https://github.com/yt-dlp/yt-dlp/pull/11255)"
-    },
-    {
-        "action": "add",
-        "when": "87884f15580910e4e0fe0e1db73508debc657471",
-        "short": "[priority] **Beginning with this release, yt-dlp's Python dependencies *must* be installed using the `default` group**\nIf you're installing yt-dlp with pip/pipx or requiring yt-dlp in your own Python project, you'll need to specify `yt-dlp[default]` if you want to also install yt-dlp's optional dependencies (which were previously included by default). [Read more](https://github.com/yt-dlp/yt-dlp/pull/11255)"
-    },
-    {
-        "action": "add",
-        "when": "d784464399b600ba9516bbcec6286f11d68974dd",
-        "short": "[priority] **The minimum *required* Python version has been raised to 3.9**\nPython 3.8 reached its end-of-life on 2024.10.07, and yt-dlp has now removed support for it. As an unfortunate side effect, the official `yt-dlp.exe` and `yt-dlp_x86.exe` binaries are no longer supported on Windows 7. [Read more](https://github.com/yt-dlp/yt-dlp/issues/10086)"
-    },
-    {
-        "action": "change",
-        "when": "914af9a0cf51c9a3f74aa88d952bee8334c67511",
-        "short": "Expand paths in `--plugin-dirs` (#11334)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "change",
-        "when": "c29f5a7fae93a08f3cfbb6127b2faa75145b06a0",
-        "short": "[ie/generic] Do not impersonate by default (#11336)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "change",
-        "when": "57212a5f97ce367590aaa5c3e9a135eead8f81f7",
-        "short": "[ie/vimeo] Fix API retries (#11351)",
-        "authors": ["bashonly"]
-    },
-    {
-        "action": "add",
-        "when": "52c0ffe40ad6e8404d93296f575007b05b04c686",
-        "short": "[priority] **Login with OAuth is no longer supported for YouTube**\nDue to a change made by the site, yt-dlp is no longer able to support OAuth login for YouTube. [Read more](https://github.com/yt-dlp/yt-dlp/issues/11462#issuecomment-2471703090)"
-    },
-    {
-        "action": "change",
-        "when": "76ac023ff02f06e8c003d104f02a03deeddebdcd",
-        "short": "[ie/youtube:tab] Improve shorts title extraction (#11997)",
-        "authors": ["bashonly", "d3d9"]
-    },
-    {
-        "action": "add",
-        "when": "88eb1e7a9a2720ac89d653c0d0e40292388823bb",
-        "short": "[priority] **New option `--preset-alias`/`-t` has been added**\nThis provides convenient predefined aliases for common use cases. Available presets include `mp4`, `mp3`, `mkv`, `aac`, and `sleep`. See [the README](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#preset-aliases) for more details."
-    },
-    {
-        "action": "remove",
-        "when": "d596824c2f8428362c072518856065070616e348"
-    },
-    {
-        "action": "remove",
-        "when": "7b81634fb1d15999757e7a9883daa6ef09ea785b"
-    },
-    {
-        "action": "remove",
-        "when": "500761e41acb96953a5064e951d41d190c287e46"
-    },
-    {
-        "action": "add",
-        "when": "f3008bc5f89d2691f2f8dfc51b406ef4e25281c3",
-        "short": "[priority] **Default behaviour changed from `--mtime` to `--no-mtime`**\nyt-dlp no longer applies the server modified time to downloaded files by default. [Read more](https://github.com/yt-dlp/yt-dlp/issues/12780)"
-    },
-    {
-        "action": "add",
-        "when": "959ac99e98c3215437e573c22d64be42d361e863",
-        "short": "[priority] Security: [[CVE-2025-54072](https://nvd.nist.gov/vuln/detail/CVE-2025-54072)] [Fix `--exec` placeholder expansion on Windows](https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-45hg-7f49-5h56)\n    - When `--exec` is used on Windows, the filepath expanded from `{}` (or the default placeholder) is now properly escaped"
-    },
-    {
-        "action": "change",
-        "when": "b831406a1d3be34c159835079d12bae624c43610",
-        "short": "[ie/rtve.es:program] Add extractor (#12955)",
-        "authors": ["meGAmeS1", "seproDev"]
-    },
-    {
-        "action": "add",
-        "when": "23c658b9cbe34a151f8f921ab1320bb5d4e40a4d",
-        "short": "[priority] **The minimum *recommended* Python version has been raised to 3.10**\nSince Python 3.9 will reach end-of-life in October 2025, support for it will be dropped soon. [Read more](https://github.com/yt-dlp/yt-dlp/issues/13858)"
-    },
-    {
-        "action": "add",
-        "when": "cc5a5caac5fbc0d605b52bde0778d6fd5f97b5ab",
-        "short": "[priority] **darwin_legacy_exe builds are being discontinued**\nThis release's `yt-dlp_macos_legacy` binary will likely be the last one. [Read more](https://github.com/yt-dlp/yt-dlp/issues/13856)"
-    },
-    {
-        "action": "add",
-        "when": "c76ce28e06c816eb5b261dfb6aff6e69dd9b7382",
-        "short": "[priority] **linux_armv7l_exe builds are being discontinued**\nThis release's `yt-dlp_linux_armv7l` binary could be the last one. [Read more](https://github.com/yt-dlp/yt-dlp/issues/13976)"
-    },
-    {
-        "action": "add",
-        "when": "08d78996831bd8e1e3c2592d740c3def00bbf548",
-        "short": "[priority] **Several options have been deprecated**\nIn order to simplify the codebase and reduce maintenance burden, various options have been deprecated. Please remove them from your commands/configurations. [Read more](https://github.com/yt-dlp/yt-dlp/issues/14198)"
-    },
-    {
-        "action": "add",
-        "when": "4e6a693057cfaf1ce1f07b019ed3bfce2bf936f6",
-        "short": "[priority] **The minimum *required* Python version has been raised to 3.10**\nPython 3.9 has reached its end-of-life as of October 2025, and yt-dlp has now removed support for it. [Read more](https://github.com/yt-dlp/yt-dlp/issues/13858)"
-    },
-    {
-        "action": "add",
-        "when": "2c9091e355a7ba5d1edb69796ecdca48199b77fb",
-        "short": "[priority] **A stopgap release with a *TEMPORARY partial* fix for YouTube support**\nSome formats may still be unavailable, especially if cookies are passed to yt-dlp. The ***NEXT*** release, expected very soon, **will require an external JS runtime (e.g. Deno)** in order for YouTube downloads to work properly. [Read more](https://github.com/yt-dlp/yt-dlp/issues/14404)"
-    }
-]

devscripts/changelog_override.schema.json

@@ -1,96 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "type": "array",
-    "uniqueItems": true,
-    "items": {
-        "type": "object",
-        "oneOf": [
-            {
-                "type": "object",
-                "properties": {
-                    "action": {
-                        "enum": [
-                            "add"
-                        ]
-                    },
-                    "when": {
-                        "type": "string",
-                        "pattern": "^([0-9a-f]{40}|\\d{4}\\.\\d{2}\\.\\d{2})$"
-                    },
-                    "hash": {
-                        "type": "string",
-                        "pattern": "^[0-9a-f]{40}$"
-                    },
-                    "short": {
-                        "type": "string"
-                    },
-                    "authors": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "required": [
-                    "action",
-                    "short"
-                ]
-            },
-            {
-                "type": "object",
-                "properties": {
-                    "action": {
-                        "enum": [
-                            "remove"
-                        ]
-                    },
-                    "when": {
-                        "type": "string",
-                        "pattern": "^([0-9a-f]{40}|\\d{4}\\.\\d{2}\\.\\d{2})$"
-                    },
-                    "hash": {
-                        "type": "string",
-                        "pattern": "^[0-9a-f]{40}$"
-                    }
-                },
-                "required": [
-                    "action",
-                    "hash"
-                ]
-            },
-            {
-                "type": "object",
-                "properties": {
-                    "action": {
-                        "enum": [
-                            "change"
-                        ]
-                    },
-                    "when": {
-                        "type": "string",
-                        "pattern": "^([0-9a-f]{40}|\\d{4}\\.\\d{2}\\.\\d{2})$"
-                    },
-                    "hash": {
-                        "type": "string",
-                        "pattern": "^[0-9a-f]{40}$"
-                    },
-                    "short": {
-                        "type": "string"
-                    },
-                    "authors": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "required": [
-                    "action",
-                    "hash",
-                    "short",
-                    "authors"
-                ]
-            }
-        ]
-    }
-}

devscripts/cli_to_api.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import yt_dlp
-import yt_dlp.options
-
-create_parser = yt_dlp.options.create_parser
-
-
-def parse_patched_options(opts):
-    patched_parser = create_parser()
-    patched_parser.defaults.update({
-        'ignoreerrors': False,
-        'retries': 0,
-        'fragment_retries': 0,
-        'extract_flat': False,
-        'concat_playlist': 'never',
-        'update_self': False,
-    })
-    yt_dlp.options.create_parser = lambda: patched_parser
-    try:
-        return yt_dlp.parse_options(opts)
-    finally:
-        yt_dlp.options.create_parser = create_parser
-
-
-default_opts = parse_patched_options([]).ydl_opts
-
-
-def cli_to_api(opts, cli_defaults=False):
-    opts = (yt_dlp.parse_options if cli_defaults else parse_patched_options)(opts).ydl_opts
-
-    diff = {k: v for k, v in opts.items() if default_opts[k] != v}
-    if 'postprocessors' in diff:
-        diff['postprocessors'] = [pp for pp in diff['postprocessors']
-                                  if pp not in default_opts['postprocessors']]
-    return diff
-
-
-if __name__ == '__main__':
-    from pprint import pprint
-
-    print('\nThe arguments passed translate to:\n')
-    pprint(cli_to_api(sys.argv[1:]))
-    print('\nCombining these with the CLI defaults gives:\n')
-    pprint(cli_to_api(sys.argv[1:], True))

devscripts/generate_aes_testdata.py

@@ -11,12 +11,13 @@
 import subprocess
 
 from yt_dlp.aes import aes_encrypt, key_expansion
+from yt_dlp.utils import intlist_to_bytes
 
 secret_msg = b'Secret message goes here'
 
 
 def hex_str(int_list):
-    return codecs.encode(bytes(int_list), 'hex')
+    return codecs.encode(intlist_to_bytes(int_list), 'hex')
 
 
 def openssl_encode(algo, key, iv):

devscripts/generate_third_party_licenses.py

@@ -1,329 +0,0 @@
-import requests
-from dataclasses import dataclass
-from pathlib import Path
-import hashlib
-
-DEFAULT_OUTPUT = 'THIRD_PARTY_LICENSES.txt'
-CACHE_LOCATION = '.license_cache'
-HEADER = '''THIRD-PARTY LICENSES
-
-This file aggregates license texts of third-party components included with the yt-dlp PyInstaller-bundled executables.
-yt-dlp itself is licensed under the Unlicense (see LICENSE file).
-Source code for bundled third-party components is available from the original projects.
-If you cannot obtain it, the maintainers will provide it as per license obligation; maintainer emails are listed in pyproject.toml.'''
-
-
-@dataclass(frozen=True)
-class Dependency:
-    name: str
-    license_url: str
-    project_url: str = ''
-    license: str = ''
-    comment: str = ''
-
-
-DEPENDENCIES: list[Dependency] = [
-    # Core runtime environment components
-    Dependency(
-        name='Python',
-        license='PSF-2.0',
-        license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/LICENSE',
-        project_url='https://www.python.org/',
-    ),
-    Dependency(
-        name='Microsoft Distributable Code',
-        license_url='https://raw.githubusercontent.com/python/cpython/refs/heads/main/PC/crtlicense.txt',
-        comment='Only included in Windows builds',
-    ),
-    Dependency(
-        name='bzip2',
-        license='bzip2-1.0.6',
-        license_url='https://gitlab.com/federicomenaquintero/bzip2/-/raw/master/COPYING',
-        project_url='https://sourceware.org/bzip2/',
-    ),
-    Dependency(
-        name='libffi',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/libffi/libffi/refs/heads/master/LICENSE',
-        project_url='https://sourceware.org/libffi/',
-    ),
-    Dependency(
-        name='OpenSSL 3.0+',
-        license='Apache-2.0',
-        license_url='https://raw.githubusercontent.com/openssl/openssl/refs/heads/master/LICENSE.txt',
-        project_url='https://www.openssl.org/',
-    ),
-    Dependency(
-        name='SQLite',
-        license='Public Domain',  # Technically does not need to be included
-        license_url='https://sqlite.org/src/raw/e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d?at=LICENSE.md',
-        project_url='https://www.sqlite.org/',
-    ),
-    Dependency(
-        name='liblzma',
-        license='0BSD',  # Technically does not need to be included
-        license_url='https://raw.githubusercontent.com/tukaani-project/xz/refs/heads/master/COPYING',
-        project_url='https://tukaani.org/xz/',
-    ),
-    Dependency(
-        name='mpdecimal',
-        license='BSD-2-Clause',
-        # No official repo URL
-        license_url='https://gist.githubusercontent.com/seproDev/9e5dbfc08af35c3f2463e64eb9b27161/raw/61f5a98bc1a4ad7d48b1c793fc3314d4d43c2ab1/mpdecimal_COPYRIGHT.txt',
-        project_url='https://www.bytereef.org/mpdecimal/',
-    ),
-    Dependency(
-        name='zlib',
-        license='zlib',
-        license_url='https://raw.githubusercontent.com/madler/zlib/refs/heads/develop/LICENSE',
-        project_url='https://zlib.net/',
-    ),
-    Dependency(
-        name='Expat',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/libexpat/libexpat/refs/heads/master/COPYING',
-        project_url='https://libexpat.github.io/',
-    ),
-    Dependency(
-        name='ncurses',
-        license='X11-distribute-modifications-variant',
-        license_url='https://raw.githubusercontent.com/mirror/ncurses/refs/heads/master/COPYING',
-        comment='Only included in Linux/macOS builds',
-        project_url='https://invisible-island.net/ncurses/',
-    ),
-    Dependency(
-        name='GNU Readline',
-        license='GPL-3.0-or-later',
-        license_url='https://tiswww.case.edu/php/chet/readline/COPYING',
-        comment='Only included in Linux builds',
-        project_url='https://www.gnu.org/software/readline/',
-    ),
-    Dependency(
-        name='libstdc++',
-        license='GPL-3.0-with-GCC-exception',
-        license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',
-        comment='Only included in Linux builds',
-        project_url='https://gcc.gnu.org/onlinedocs/libstdc++/',
-    ),
-    Dependency(
-        name='libgcc',
-        license='GPL-3.0-with-GCC-exception',
-        license_url='https://raw.githubusercontent.com/gcc-mirror/gcc/refs/heads/master/COPYING.RUNTIME',
-        comment='Only included in Linux builds',
-        project_url='https://gcc.gnu.org/',
-    ),
-    Dependency(
-        name='libuuid',
-        license='BSD-3-Clause',
-        license_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/lib/uuid/COPYING',
-        comment='Only included in Linux builds',
-        project_url='https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/uuid',
-    ),
-    Dependency(
-        name='libintl',
-        license='LGPL-2.1-or-later',
-        license_url='https://raw.githubusercontent.com/autotools-mirror/gettext/refs/heads/master/gettext-runtime/intl/COPYING.LIB',
-        comment='Only included in macOS builds',
-        project_url='https://www.gnu.org/software/gettext/',
-    ),
-    Dependency(
-        name='libidn2',
-        license='LGPL-3.0-or-later',
-        license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.LESSERv3',
-        comment='Only included in macOS builds',
-        project_url='https://www.gnu.org/software/libidn/',
-    ),
-    Dependency(
-        name='libidn2 (Unicode character data files)',
-        license='Unicode-TOU AND Unicode-DFS-2016',
-        license_url='https://gitlab.com/libidn/libidn2/-/raw/master/COPYING.unicode',
-        comment='Only included in macOS builds',
-        project_url='https://www.gnu.org/software/libidn/',
-    ),
-    Dependency(
-        name='libunistring',
-        license='LGPL-3.0-or-later',
-        license_url='https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob_plain;f=COPYING.LIB;hb=HEAD',
-        comment='Only included in macOS builds',
-        project_url='https://www.gnu.org/software/libunistring/',
-    ),
-    Dependency(
-        name='librtmp',
-        license='LGPL-2.1-or-later',
-        # No official repo URL
-        license_url='https://gist.githubusercontent.com/seproDev/31d8c691ccddebe37b8b379307cb232d/raw/053408e98547ea8c7d9ba3a80c965f33e163b881/librtmp_COPYING.txt',
-        comment='Only included in macOS builds',
-        project_url='https://rtmpdump.mplayerhq.hu/',
-    ),
-    Dependency(
-        name='zstd',
-        license='BSD-3-Clause',
-        license_url='https://raw.githubusercontent.com/facebook/zstd/refs/heads/dev/LICENSE',
-        comment='Only included in macOS builds',
-        project_url='https://facebook.github.io/zstd/',
-    ),
-
-    # Python packages
-    Dependency(
-        name='brotli',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/google/brotli/refs/heads/master/LICENSE',
-        project_url='https://brotli.org/',
-    ),
-    Dependency(
-        name='curl_cffi',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/lexiforest/curl_cffi/refs/heads/main/LICENSE',
-        comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',
-        project_url='https://curl-cffi.readthedocs.io/',
-    ),
-    # Dependency of curl_cffi
-    Dependency(
-        name='curl-impersonate',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/lexiforest/curl-impersonate/refs/heads/main/LICENSE',
-        comment='Not included in `yt-dlp_x86` and `yt-dlp_musllinux_aarch64` builds',
-        project_url='https://github.com/lexiforest/curl-impersonate',
-    ),
-    Dependency(
-        name='cffi',
-        license='MIT-0',  # Technically does not need to be included
-        license_url='https://raw.githubusercontent.com/python-cffi/cffi/refs/heads/main/LICENSE',
-        project_url='https://cffi.readthedocs.io/',
-    ),
-    # Dependecy of cffi
-    Dependency(
-        name='pycparser',
-        license='BSD-3-Clause',
-        license_url='https://raw.githubusercontent.com/eliben/pycparser/refs/heads/main/LICENSE',
-        project_url='https://github.com/eliben/pycparser',
-    ),
-    Dependency(
-        name='mutagen',
-        license='GPL-2.0-or-later',
-        license_url='https://raw.githubusercontent.com/quodlibet/mutagen/refs/heads/main/COPYING',
-        project_url='https://mutagen.readthedocs.io/',
-    ),
-    Dependency(
-        name='PyCryptodome',
-        license='Public Domain and BSD-2-Clause',
-        license_url='https://raw.githubusercontent.com/Legrandin/pycryptodome/refs/heads/master/LICENSE.rst',
-        project_url='https://www.pycryptodome.org/',
-    ),
-    Dependency(
-        name='certifi',
-        license='MPL-2.0',
-        license_url='https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/LICENSE',
-        project_url='https://github.com/certifi/python-certifi',
-    ),
-    Dependency(
-        name='requests',
-        license='Apache-2.0',
-        license_url='https://raw.githubusercontent.com/psf/requests/refs/heads/main/LICENSE',
-        project_url='https://requests.readthedocs.io/',
-    ),
-    # Dependency of requests
-    Dependency(
-        name='charset-normalizer',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/jawah/charset_normalizer/refs/heads/master/LICENSE',
-        project_url='https://charset-normalizer.readthedocs.io/',
-    ),
-    # Dependency of requests
-    Dependency(
-        name='idna',
-        license='BSD-3-Clause',
-        license_url='https://raw.githubusercontent.com/kjd/idna/refs/heads/master/LICENSE.md',
-        project_url='https://github.com/kjd/idna',
-    ),
-    Dependency(
-        name='urllib3',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/urllib3/urllib3/refs/heads/main/LICENSE.txt',
-        project_url='https://urllib3.readthedocs.io/',
-    ),
-    Dependency(
-        name='SecretStorage',
-        license='BSD-3-Clause',
-        license_url='https://raw.githubusercontent.com/mitya57/secretstorage/refs/heads/master/LICENSE',
-        comment='Only included in Linux builds',
-        project_url='https://secretstorage.readthedocs.io/',
-    ),
-    # Dependency of SecretStorage
-    Dependency(
-        name='cryptography',
-        license='Apache-2.0',  # Also available as BSD-3-Clause
-        license_url='https://raw.githubusercontent.com/pyca/cryptography/refs/heads/main/LICENSE.APACHE',
-        comment='Only included in Linux builds',
-        project_url='https://cryptography.io/',
-    ),
-    # Dependency of SecretStorage
-    Dependency(
-        name='Jeepney',
-        license='MIT',
-        license_url='https://gitlab.com/takluyver/jeepney/-/raw/master/LICENSE',
-        comment='Only included in Linux builds',
-        project_url='https://jeepney.readthedocs.io/',
-    ),
-    Dependency(
-        name='websockets',
-        license='BSD-3-Clause',
-        license_url='https://raw.githubusercontent.com/python-websockets/websockets/refs/heads/main/LICENSE',
-        project_url='https://websockets.readthedocs.io/',
-    ),
-    # Dependencies of yt-dlp-ejs
-    Dependency(
-        name='Meriyah',
-        license='ISC',
-        license_url='https://raw.githubusercontent.com/meriyah/meriyah/refs/heads/main/LICENSE.md',
-        project_url='https://github.com/meriyah/meriyah',
-    ),
-    Dependency(
-        name='Astring',
-        license='MIT',
-        license_url='https://raw.githubusercontent.com/davidbonnet/astring/refs/heads/main/LICENSE',
-        project_url='https://github.com/davidbonnet/astring/',
-    ),
-]
-
-
-def fetch_text(dep: Dependency) -> str:
-    cache_dir = Path(CACHE_LOCATION)
-    cache_dir.mkdir(exist_ok=True)
-    url_hash = hashlib.sha256(dep.license_url.encode('utf-8')).hexdigest()
-    cache_file = cache_dir / f'{url_hash}.txt'
-
-    if cache_file.exists():
-        return cache_file.read_text()
-
-    # UA needed since some domains block requests default UA
-    req = requests.get(dep.license_url, headers={'User-Agent': 'yt-dlp license fetcher'})
-    req.raise_for_status()
-    text = req.text
-    cache_file.write_text(text)
-    return text
-
-
-def build_output() -> str:
-    lines = [HEADER]
-    for d in DEPENDENCIES:
-        lines.append('\n')
-        lines.append('-' * 80)
-        header = f'{d.name}'
-        if d.license:
-            header += f' | {d.license}'
-        if d.comment:
-            header += f'\nNote: {d.comment}'
-        if d.project_url:
-            header += f'\nURL: {d.project_url}'
-        lines.append(header)
-        lines.append('-' * 80)
-
-        text = fetch_text(d)
-        lines.append(text.strip('\n') + '\n')
-    return '\n'.join(lines)
-
-
-if __name__ == '__main__':
-    content = build_output()
-    Path(DEFAULT_OUTPUT).write_text(content)

devscripts/install_deps.py

@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow execution from anywhere
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import argparse
-import re
-import subprocess
-
-from pathlib import Path
-
-from devscripts.tomlparse import parse_toml
-from devscripts.utils import read_file
-
-
-def parse_args():
-    parser = argparse.ArgumentParser(description='Install dependencies for yt-dlp')
-    parser.add_argument(
-        'input', nargs='?', metavar='TOMLFILE', default=Path(__file__).parent.parent / 'pyproject.toml',
-        help='input file (default: %(default)s)')
-    parser.add_argument(
-        '-e', '--exclude-dependency', metavar='DEPENDENCY', action='append',
-        help='exclude a dependency (can be used multiple times)')
-    parser.add_argument(
-        '-i', '--include-group', metavar='GROUP', action='append',
-        help='include an optional dependency group (can be used multiple times)')
-    parser.add_argument(
-        '-c', '--cherry-pick', metavar='DEPENDENCY', action='append',
-        help=(
-            'only include a specific dependency from the resulting dependency list '
-            '(can be used multiple times)'))
-    parser.add_argument(
-        '-o', '--only-optional-groups', action='store_true',
-        help='omit default dependencies unless the "default" group is specified with --include-group')
-    parser.add_argument(
-        '-p', '--print', action='store_true',
-        help='only print requirements to stdout')
-    parser.add_argument(
-        '-u', '--user', action='store_true',
-        help='install with pip as --user')
-    return parser.parse_args()
-
-
-def uniq(arg) -> dict[str, None]:
-    return dict.fromkeys(map(str.lower, arg or ()))
-
-
-def main():
-    args = parse_args()
-    project_table = parse_toml(read_file(args.input))['project']
-    recursive_pattern = re.compile(rf'{project_table["name"]}\[(?P<group_name>[\w-]+)\]')
-    optional_groups = project_table['optional-dependencies']
-
-    excludes = uniq(args.exclude_dependency)
-    only_includes = uniq(args.cherry_pick)
-    include_groups = uniq(args.include_group)
-
-    def yield_deps(group):
-        for dep in group:
-            if mobj := recursive_pattern.fullmatch(dep):
-                yield from optional_groups.get(mobj.group('group_name'), ())
-            else:
-                yield dep
-
-    targets = {}
-    if not args.only_optional_groups:
-        # legacy: 'dependencies' is empty now
-        targets.update(dict.fromkeys(project_table['dependencies']))
-        targets.update(dict.fromkeys(yield_deps(optional_groups['default'])))
-
-    for include in filter(None, map(optional_groups.get, include_groups)):
-        targets.update(dict.fromkeys(yield_deps(include)))
-
-    def target_filter(target):
-        name = re.match(r'[\w-]+', target).group(0).lower()
-        return name not in excludes and (not only_includes or name in only_includes)
-
-    targets = list(filter(target_filter, targets))
-
-    if args.print:
-        for target in targets:
-            print(target)
-        return
-
-    pip_args = [sys.executable, '-m', 'pip', 'install', '-U']
-    if args.user:
-        pip_args.append('--user')
-    pip_args.extend(targets)
-
-    return subprocess.call(pip_args)
-
-
-if __name__ == '__main__':
-    sys.exit(main())

devscripts/lazy_load_template.py

@@ -6,23 +6,19 @@
     age_restricted,
     bug_reports_message,
     classproperty,
-    variadic,
     write_string,
 )
 
 # These bloat the lazy_extractors, so allow them to passthrough silently
-ALLOWED_CLASSMETHODS = {'extract_from_webpage', 'get_testcases', 'get_webpage_testcases'}
-_WARNED = False
+ALLOWED_CLASSMETHODS = {'get_testcases', 'extract_from_webpage'}
 
 
 class LazyLoadMetaClass(type):
     def __getattr__(cls, name):
-        global _WARNED
-        if ('_real_class' not in cls.__dict__
-                and name not in ALLOWED_CLASSMETHODS and not _WARNED):
-            _WARNED = True
-            write_string('WARNING: Falling back to normal extractor since lazy extractor '
-                         f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
+        if '_real_class' not in cls.__dict__ and name not in ALLOWED_CLASSMETHODS:
+            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_changelog.py

@@ -1,508 +0,0 @@
-from __future__ import annotations
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import enum
-import itertools
-import json
-import logging
-import re
-from collections import defaultdict
-from dataclasses import dataclass
-from functools import lru_cache
-from pathlib import Path
-
-from devscripts.utils import read_file, run_process, write_file
-
-BASE_URL = 'https://github.com'
-LOCATION_PATH = Path(__file__).parent
-HASH_LENGTH = 7
-
-logger = logging.getLogger(__name__)
-
-
-class CommitGroup(enum.Enum):
-    PRIORITY = 'Important'
-    CORE = 'Core'
-    EXTRACTOR = 'Extractor'
-    DOWNLOADER = 'Downloader'
-    POSTPROCESSOR = 'Postprocessor'
-    NETWORKING = 'Networking'
-    MISC = 'Misc.'
-
-    @classmethod
-    @lru_cache
-    def subgroup_lookup(cls):
-        return {
-            name: group
-            for group, names in {
-                cls.MISC: {
-                    'build',
-                    'ci',
-                    'cleanup',
-                    'devscripts',
-                    'docs',
-                    'test',
-                },
-                cls.NETWORKING: {
-                    'rh',
-                },
-            }.items()
-            for name in names
-        }
-
-    @classmethod
-    @lru_cache
-    def group_lookup(cls):
-        result = {
-            'fd': cls.DOWNLOADER,
-            'ie': cls.EXTRACTOR,
-            'pp': cls.POSTPROCESSOR,
-            'upstream': cls.CORE,
-        }
-        result.update({item.name.lower(): item for item in iter(cls)})
-        return result
-
-    @classmethod
-    def get(cls, value: str) -> tuple[CommitGroup | None, str | None]:
-        group, _, subgroup = (group.strip().lower() for group in value.partition('/'))
-
-        if result := cls.group_lookup().get(group):
-            return result, subgroup or None
-
-        if subgroup:
-            return None, value
-
-        return cls.subgroup_lookup().get(group), group or None
-
-
-@dataclass
-class Commit:
-    hash: str | None
-    short: str
-    authors: list[str]
-
-    def __str__(self):
-        result = f'{self.short!r}'
-
-        if self.hash:
-            result += f' ({self.hash[:HASH_LENGTH]})'
-
-        if self.authors:
-            authors = ', '.join(self.authors)
-            result += f' by {authors}'
-
-        return result
-
-
-@dataclass
-class CommitInfo:
-    details: str | None
-    sub_details: tuple[str, ...]
-    message: str
-    issues: list[str]
-    commit: Commit
-    fixes: list[Commit]
-
-    def key(self):
-        return ((self.details or '').lower(), self.sub_details, self.message)
-
-
-def unique(items):
-    return sorted({item.strip().lower(): item for item in items if item}.values())
-
-
-class Changelog:
-    MISC_RE = re.compile(r'(?:^|\b)(?:lint(?:ing)?|misc|format(?:ting)?|fixes)(?:\b|$)', re.IGNORECASE)
-    ALWAYS_SHOWN = (CommitGroup.PRIORITY,)
-
-    def __init__(self, groups, repo, collapsible=False):
-        self._groups = groups
-        self._repo = repo
-        self._collapsible = collapsible
-
-    def __str__(self):
-        return '\n'.join(self._format_groups(self._groups)).replace('\t', '    ')
-
-    def _format_groups(self, groups):
-        first = True
-        for item in CommitGroup:
-            if self._collapsible and item not in self.ALWAYS_SHOWN and first:
-                first = False
-                yield '\n<details><summary><h3>Changelog</h3></summary>\n'
-
-            if group := groups[item]:
-                yield self.format_module(item.value, group)
-
-        if self._collapsible:
-            yield '\n</details>'
-
-    def format_module(self, name, group):
-        result = f'\n#### {name} changes\n' if name else '\n'
-        return result + '\n'.join(self._format_group(group))
-
-    def _format_group(self, group):
-        sorted_group = sorted(group, key=CommitInfo.key)
-        detail_groups = itertools.groupby(sorted_group, lambda item: (item.details or '').lower())
-        for _, items in detail_groups:
-            items = list(items)
-            details = items[0].details
-
-            if details == 'cleanup':
-                items = self._prepare_cleanup_misc_items(items)
-
-            prefix = '-'
-            if details:
-                if len(items) == 1:
-                    prefix = f'- **{details}**:'
-                else:
-                    yield f'- **{details}**'
-                    prefix = '\t-'
-
-            sub_detail_groups = itertools.groupby(items, lambda item: tuple(map(str.lower, item.sub_details)))
-            for sub_details, entries in sub_detail_groups:
-                if not sub_details:
-                    for entry in entries:
-                        yield f'{prefix} {self.format_single_change(entry)}'
-                    continue
-
-                entries = list(entries)
-                sub_prefix = f'{prefix} {", ".join(entries[0].sub_details)}'
-                if len(entries) == 1:
-                    yield f'{sub_prefix}: {self.format_single_change(entries[0])}'
-                    continue
-
-                yield sub_prefix
-                for entry in entries:
-                    yield f'\t{prefix} {self.format_single_change(entry)}'
-
-    def _prepare_cleanup_misc_items(self, items):
-        cleanup_misc_items = defaultdict(list)
-        sorted_items = []
-        for item in items:
-            if self.MISC_RE.search(item.message):
-                cleanup_misc_items[tuple(item.commit.authors)].append(item)
-            else:
-                sorted_items.append(item)
-
-        for commit_infos in cleanup_misc_items.values():
-            sorted_items.append(CommitInfo(
-                'cleanup', ('Miscellaneous',), ', '.join(
-                    self._format_message_link(None, info.commit.hash)
-                    for info in sorted(commit_infos, key=lambda item: item.commit.hash or '')),
-                [], Commit(None, '', commit_infos[0].commit.authors), []))
-
-        return sorted_items
-
-    def format_single_change(self, info: CommitInfo):
-        message, sep, rest = info.message.partition('\n')
-        if '[' not in message:
-            # If the message doesn't already contain markdown links, try to add a link to the commit
-            message = self._format_message_link(message, info.commit.hash)
-
-        if info.issues:
-            message = f'{message} ({self._format_issues(info.issues)})'
-
-        if info.commit.authors:
-            message = f'{message} by {self._format_authors(info.commit.authors)}'
-
-        if info.fixes:
-            fix_message = ', '.join(f'{self._format_message_link(None, fix.hash)}' for fix in info.fixes)
-
-            authors = sorted({author for fix in info.fixes for author in fix.authors}, key=str.casefold)
-            if authors != info.commit.authors:
-                fix_message = f'{fix_message} by {self._format_authors(authors)}'
-
-            message = f'{message} (With fixes in {fix_message})'
-
-        return message if not sep else f'{message}{sep}{rest}'
-
-    def _format_message_link(self, message, commit_hash):
-        assert message or commit_hash, 'Improperly defined commit message or override'
-        message = message if message else commit_hash[:HASH_LENGTH]
-        return f'[{message}]({self.repo_url}/commit/{commit_hash})' if commit_hash else message
-
-    def _format_issues(self, issues):
-        return ', '.join(f'[#{issue}]({self.repo_url}/issues/{issue})' for issue in issues)
-
-    @staticmethod
-    def _format_authors(authors):
-        return ', '.join(f'[{author}]({BASE_URL}/{author})' for author in authors)
-
-    @property
-    def repo_url(self):
-        return f'{BASE_URL}/{self._repo}'
-
-
-class CommitRange:
-    COMMAND = 'git'
-    COMMIT_SEPARATOR = '-----'
-
-    AUTHOR_INDICATOR_RE = re.compile(r'Authored by:? ', re.IGNORECASE)
-    MESSAGE_RE = re.compile(r'''
-        (?:\[(?P<prefix>[^\]]+)\]\ )?
-        (?:(?P<sub_details>`?[\w.-]+`?): )?
-        (?P<message>.+?)
-        (?:\ \((?P<issues>\#\d+(?:,\ \#\d+)*)\))?
-        ''', re.VERBOSE | re.DOTALL)
-    EXTRACTOR_INDICATOR_RE = re.compile(r'(?:Fix|Add)\s+Extractors?', re.IGNORECASE)
-    REVERT_RE = re.compile(r'(?:\[[^\]]+\]\s+)?(?i:Revert)\s+([\da-f]{40})')
-    FIXES_RE = re.compile(r'(?i:(?:bug\s*)?fix(?:es)?(?:\s+bugs?)?(?:\s+in|\s+for)?|Improve)\s+([\da-f]{40})')
-    UPSTREAM_MERGE_RE = re.compile(r'Update to ytdl-commit-([\da-f]+)')
-
-    def __init__(self, start, end, default_author=None):
-        self._start, self._end = start, end
-        self._commits, self._fixes = self._get_commits_and_fixes(default_author)
-        self._commits_added = []
-
-    def __iter__(self):
-        return iter(itertools.chain(self._commits.values(), self._commits_added))
-
-    def __len__(self):
-        return len(self._commits) + len(self._commits_added)
-
-    def __contains__(self, commit):
-        if isinstance(commit, Commit):
-            if not commit.hash:
-                return False
-            commit = commit.hash
-
-        return commit in self._commits
-
-    def _get_commits_and_fixes(self, default_author):
-        result = run_process(
-            self.COMMAND, 'log', f'--format=%H%n%s%n%b%n{self.COMMIT_SEPARATOR}',
-            f'{self._start}..{self._end}' if self._start else self._end).stdout
-
-        commits, reverts = {}, {}
-        fixes = defaultdict(list)
-        lines = iter(result.splitlines(False))
-        for i, commit_hash in enumerate(lines):
-            short = next(lines)
-            skip = short.startswith('Release ') or short == '[version] update'
-
-            fix_commitish = None
-            if match := self.FIXES_RE.search(short):
-                fix_commitish = match.group(1)
-
-            authors = [default_author] if default_author else []
-            for line in iter(lambda: next(lines), self.COMMIT_SEPARATOR):
-                if match := self.AUTHOR_INDICATOR_RE.match(line):
-                    authors = sorted(map(str.strip, line[match.end():].split(',')), key=str.casefold)
-                if not fix_commitish and (match := self.FIXES_RE.fullmatch(line)):
-                    fix_commitish = match.group(1)
-
-            commit = Commit(commit_hash, short, authors)
-            if skip and (self._start or not i):
-                logger.debug(f'Skipped commit: {commit}')
-                continue
-            elif skip:
-                logger.debug(f'Reached Release commit, breaking: {commit}')
-                break
-
-            if match := self.REVERT_RE.fullmatch(commit.short):
-                reverts[match.group(1)] = commit
-                continue
-
-            if fix_commitish:
-                fixes[fix_commitish].append(commit)
-
-            commits[commit.hash] = commit
-
-        for commitish, revert_commit in reverts.items():
-            if reverted := commits.pop(commitish, None):
-                logger.debug(f'{commitish} fully reverted {reverted}')
-            else:
-                commits[revert_commit.hash] = revert_commit
-
-        for commitish, fix_commits in fixes.items():
-            if commitish in commits:
-                hashes = ', '.join(commit.hash[:HASH_LENGTH] for commit in fix_commits)
-                logger.info(f'Found fix(es) for {commitish[:HASH_LENGTH]}: {hashes}')
-                for fix_commit in fix_commits:
-                    del commits[fix_commit.hash]
-            else:
-                logger.debug(f'Commit with fixes not in changes: {commitish[:HASH_LENGTH]}')
-
-        return commits, fixes
-
-    def apply_overrides(self, overrides):
-        for override in overrides:
-            when = override.get('when')
-            if when and when not in self and when != self._start:
-                logger.debug(f'Ignored {when!r} override')
-                continue
-
-            override_hash = override.get('hash') or when
-            if override['action'] == 'add':
-                commit = Commit(override.get('hash'), override['short'], override.get('authors') or [])
-                logger.info(f'ADD    {commit}')
-                self._commits_added.append(commit)
-
-            elif override['action'] == 'remove':
-                if override_hash in self._commits:
-                    logger.info(f'REMOVE {self._commits[override_hash]}')
-                    del self._commits[override_hash]
-
-            elif override['action'] == 'change':
-                if override_hash not in self._commits:
-                    continue
-                commit = Commit(override_hash, override['short'], override.get('authors') or [])
-                logger.info(f'CHANGE {self._commits[commit.hash]} -> {commit}')
-                self._commits[commit.hash] = commit
-
-        self._commits = dict(reversed(self._commits.items()))
-
-    def groups(self):
-        group_dict = defaultdict(list)
-        for commit in self:
-            upstream_re = self.UPSTREAM_MERGE_RE.search(commit.short)
-            if upstream_re:
-                commit.short = f'[upstream] Merged with youtube-dl {upstream_re.group(1)}'
-
-            match = self.MESSAGE_RE.fullmatch(commit.short)
-            if not match:
-                logger.error(f'Error parsing short commit message: {commit.short!r}')
-                continue
-
-            prefix, sub_details_alt, message, issues = match.groups()
-            issues = [issue.strip()[1:] for issue in issues.split(',')] if issues else []
-
-            if prefix:
-                groups, details, sub_details = zip(*map(self.details_from_prefix, prefix.split(',')), strict=True)
-                group = next(iter(filter(None, groups)), None)
-                details = ', '.join(unique(details))
-                sub_details = list(itertools.chain.from_iterable(sub_details))
-            else:
-                group = CommitGroup.CORE
-                details = None
-                sub_details = []
-
-            if sub_details_alt:
-                sub_details.append(sub_details_alt)
-            sub_details = tuple(unique(sub_details))
-
-            if not group:
-                if self.EXTRACTOR_INDICATOR_RE.search(commit.short):
-                    group = CommitGroup.EXTRACTOR
-                    logger.error(f'Assuming [ie] group for {commit.short!r}')
-                else:
-                    group = CommitGroup.CORE
-
-            commit_info = CommitInfo(
-                details, sub_details, message.strip(),
-                issues, commit, self._fixes[commit.hash])
-
-            logger.debug(f'Resolved {commit.short!r} to {commit_info!r}')
-            group_dict[group].append(commit_info)
-
-        return group_dict
-
-    @staticmethod
-    def details_from_prefix(prefix):
-        if not prefix:
-            return CommitGroup.CORE, None, ()
-
-        prefix, *sub_details = prefix.split(':')
-
-        group, details = CommitGroup.get(prefix)
-        if group is CommitGroup.PRIORITY and details:
-            details = details.partition('/')[2].strip()
-
-        if details and '/' in details:
-            logger.error(f'Prefix is overnested, using first part: {prefix}')
-            details = details.partition('/')[0].strip()
-
-        if details == 'common':
-            details = None
-        elif group is CommitGroup.NETWORKING and details == 'rh':
-            details = 'Request Handler'
-
-        return group, details, sub_details
-
-
-def get_new_contributors(contributors_path, commits):
-    contributors = set()
-    if contributors_path.exists():
-        for line in read_file(contributors_path).splitlines():
-            author, _, _ = line.strip().partition(' (')
-            authors = author.split('/')
-            contributors.update(map(str.casefold, authors))
-
-    new_contributors = set()
-    for commit in commits:
-        for author in commit.authors:
-            author_folded = author.casefold()
-            if author_folded not in contributors:
-                contributors.add(author_folded)
-                new_contributors.add(author)
-
-    return sorted(new_contributors, key=str.casefold)
-
-
-def create_changelog(args):
-    logging.basicConfig(
-        datefmt='%Y-%m-%d %H-%M-%S', format='{asctime} | {levelname:<8} | {message}',
-        level=logging.WARNING - 10 * args.verbosity, style='{', stream=sys.stderr)
-
-    commits = CommitRange(None, args.commitish, args.default_author)
-
-    if not args.no_override:
-        if args.override_path.exists():
-            overrides = json.loads(read_file(args.override_path))
-            commits.apply_overrides(overrides)
-        else:
-            logger.warning(f'File {args.override_path.as_posix()} does not exist')
-
-    logger.info(f'Loaded {len(commits)} commits')
-
-    if new_contributors := get_new_contributors(args.contributors_path, commits):
-        if args.contributors:
-            write_file(args.contributors_path, '\n'.join(new_contributors) + '\n', mode='a')
-        logger.info(f'New contributors: {", ".join(new_contributors)}')
-
-    return Changelog(commits.groups(), args.repo, args.collapsible)
-
-
-def create_parser():
-    import argparse
-
-    parser = argparse.ArgumentParser(
-        description='Create a changelog markdown from a git commit range')
-    parser.add_argument(
-        'commitish', default='HEAD', nargs='?',
-        help='The commitish to create the range from (default: %(default)s)')
-    parser.add_argument(
-        '-v', '--verbosity', action='count', default=0,
-        help='increase verbosity (can be used twice)')
-    parser.add_argument(
-        '-c', '--contributors', action='store_true',
-        help='update CONTRIBUTORS file (default: %(default)s)')
-    parser.add_argument(
-        '--contributors-path', type=Path, default=LOCATION_PATH.parent / 'CONTRIBUTORS',
-        help='path to the CONTRIBUTORS file')
-    parser.add_argument(
-        '--no-override', action='store_true',
-        help='skip override json in commit generation (default: %(default)s)')
-    parser.add_argument(
-        '--override-path', type=Path, default=LOCATION_PATH / 'changelog_override.json',
-        help='path to the changelog_override.json file')
-    parser.add_argument(
-        '--default-author', default='pukkandan',
-        help='the author to use without a author indicator (default: %(default)s)')
-    parser.add_argument(
-        '--repo', default='yt-dlp/yt-dlp',
-        help='the github repository to use for the operations (default: %(default)s)')
-    parser.add_argument(
-        '--collapsible', action='store_true',
-        help='make changelog collapsible (default: %(default)s)')
-
-    return parser
-
-
-if __name__ == '__main__':
-    print(create_changelog(create_parser().parse_args()))

devscripts/make_contributing.py

@@ -8,7 +8,7 @@ def main():
     return  # This is unused in yt-dlp
 
     parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
-    _, args = parser.parse_args()
+    options, args = parser.parse_args()
     if len(args) != 2:
         parser.error('Expected an input and an output filename')
 

devscripts/make_issue_template.py

@@ -9,20 +9,21 @@
 
 import re
 
-from devscripts.utils import get_filename_args, read_file, write_file
+from devscripts.utils import (
+    get_filename_args,
+    read_file,
+    read_version,
+    write_file,
+)
 
-VERBOSE = '''
+VERBOSE_TMPL = '''
   - type: checkboxes
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -32,19 +33,19 @@
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [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 nightly@... from yt-dlp/yt-dlp-nightly-builds [1a176d874] (win_exe)
-        [debug] Python 3.10.11 (CPython AMD64 64bit) - Windows-10-10.0.20348-SP0 (OpenSSL 1.1.1t  7 Feb 2023)
-        [debug] exe versions: ffmpeg 7.0.2 (setts), ffprobe 7.0.2
-        [debug] Optional libraries: Cryptodome-3.21.0, brotli-1.1.0, certifi-2024.08.30, curl_cffi-0.5.10, mutagen-1.47.0, requests-2.32.3, sqlite3-3.40.1, urllib3-2.2.3, websockets-13.1
+        [debug] yt-dlp version %(version)s [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
+        [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
+        [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] Request Handlers: urllib, requests, websockets, curl_cffi
-        [debug] Loaded 1838 extractors
         [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: nightly@... from yt-dlp/yt-dlp-nightly-builds
-        yt-dlp is up to date (nightly@... from yt-dlp/yt-dlp-nightly-builds)
-        [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
+        Latest version: %(version)s, Current version: %(version)s
+        yt-dlp is up to date (%(version)s)
         <more lines>
       render: shell
     validations:
@@ -52,20 +53,20 @@
 '''.strip()
 
 NO_SKIP = '''
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      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 remove or skip any mandatory\\* field
+          required: true
 '''.strip()
 
 
 def main():
-    fields = {
-        'no_skip': NO_SKIP,
-        'verbose': VERBOSE,
-        'verbose_optional': re.sub(r'(\n\s+validations:)?\n\s+required: true', '', VERBOSE),
-    }
+    fields = {'version': read_version(), 'no_skip': NO_SKIP}
+    fields['verbose'] = VERBOSE_TMPL % fields
+    fields['verbose_optional'] = re.sub(r'(\n\s+validations:)?\n\s+required: true', '', fields['verbose'])
 
     infile, outfile = get_filename_args(has_infile=True)
     write_file(outfile, read_file(infile) % fields)

devscripts/make_lazy_extractors.py

@@ -10,23 +10,11 @@
 from inspect import getsource
 
 from devscripts.utils import get_filename_args, read_file, write_file
-from yt_dlp.extractor import import_extractors
-from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
-from yt_dlp.globals import extractors
 
 NO_ATTR = object()
-STATIC_CLASS_PROPERTIES = [
-    '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)
-]
+STATIC_CLASS_PROPERTIES = ['IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_VALID_URL', '_WORKING', '_NETRC_MACHINE', 'age_limit']
 CLASS_METHODS = [
-    'ie_key', 'suitable', '_match_valid_url',  # Used for URL matching
-    '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_key', 'working', 'description', 'suitable', '_match_valid_url', '_match_id', 'get_temp_id', 'is_suitable'
 ]
 IE_TEMPLATE = '''
 class {name}({bases}):
@@ -36,12 +24,13 @@ class {name}({bases}):
 
 
 def main():
-    os.environ['YTDLP_NO_PLUGINS'] = 'true'
-    os.environ['YTDLP_NO_LAZY_EXTRACTORS'] = 'true'
-
     lazy_extractors_filename = get_filename_args(default_outfile='yt_dlp/extractor/lazy_extractors.py')
+    if os.path.exists(lazy_extractors_filename):
+        os.remove(lazy_extractors_filename)
 
-    import_extractors()
+    _ALL_CLASSES = get_all_ies()  # Must be before import
+
+    from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 
     DummyInfoExtractor = type('InfoExtractor', (InfoExtractor,), {'IE_NAME': NO_ATTR})
     module_src = '\n'.join((
@@ -49,12 +38,25 @@ def main():
         '    _module = None',
         *extra_ie_code(DummyInfoExtractor),
         '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-        *build_ies(list(extractors.value.values()), (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
+        *build_ies(_ALL_CLASSES, (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
     ))
 
     write_file(lazy_extractors_filename, f'{module_src}\n')
 
 
+def get_all_ies():
+    PLUGINS_DIRNAME = 'ytdlp_plugins'
+    BLOCKED_DIRNAME = f'{PLUGINS_DIRNAME}_blocked'
+    if os.path.exists(PLUGINS_DIRNAME):
+        os.rename(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
+    try:
+        from yt_dlp.extractor.extractors import _ALL_CLASSES
+    finally:
+        if os.path.exists(BLOCKED_DIRNAME):
+            os.rename(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
+    return _ALL_CLASSES
+
+
 def extra_ie_code(ie, base=None):
     for var in STATIC_CLASS_PROPERTIES:
         val = getattr(ie, var)
@@ -75,7 +77,7 @@ def build_ies(ies, bases, attr_base):
         if ie in ies:
             names.append(ie.__name__)
 
-    yield '\n_CLASS_LOOKUP = {%s}' % ', '.join(f'{name!r}: {name}' for name in names)
+    yield f'\n_ALL_CLASSES = [{", ".join(names)}]'
 
 
 def sort_ies(ies, ignored_bases):

devscripts/make_readme.py

@@ -45,42 +45,32 @@ def apply_patch(text, patch):
 delim = f'\n{" " * switch_col_width}'
 
 PATCHES = (
-    (   # Standardize `--update` message
+    (   # Standardize update message
         r'(?m)^(    -U, --update\s+).+(\n    \s.+)*$',
         r'\1Update this program to the latest version',
     ),
-    (   # Headings
+    (  # Headings
         r'(?m)^  (\w.+\n)(    (?=\w))?',
-        r'## \1',
+        r'## \1'
     ),
-    (   # Fixup `--date` formatting
-        rf'(?m)(    --date DATE.+({delim}[^\[]+)*)\[.+({delim}.+)*$',
-        (rf'\1[now|today|yesterday][-N[day|week|month|year]].{delim}'
-         f'E.g. "--date today-2weeks" downloads only{delim}'
-         'videos uploaded on the same day two weeks ago'),
-    ),
-    (   # Do not split URLs
+    (  # Do not split URLs
         rf'({delim[:-1]})? (?P<label>\[\S+\] )?(?P<url>https?({delim})?:({delim})?/({delim})?/(({delim})?\S+)+)\s',
-        lambda mobj: ''.join((delim, mobj.group('label') or '', re.sub(r'\s+', '', mobj.group('url')), '\n')),
+        lambda mobj: ''.join((delim, mobj.group('label') or '', re.sub(r'\s+', '', mobj.group('url')), '\n'))
     ),
-    (   # Do not split "words"
+    (  # Do not split "words"
         rf'(?m)({delim}\S+)+$',
-        lambda mobj: ''.join((delim, mobj.group(0).replace(delim, ''))),
+        lambda mobj: ''.join((delim, mobj.group(0).replace(delim, '')))
     ),
-    (   # Allow overshooting last line
+    (  # Allow overshooting last line
         rf'(?m)^(?P<prev>.+)${delim}(?P<current>.+)$(?!{delim})',
         lambda mobj: (mobj.group().replace(delim, ' ')
                       if len(mobj.group()) - len(delim) + 1 <= max_width + ALLOWED_OVERSHOOT
-                      else mobj.group()),
+                      else mobj.group())
     ),
-    (   # Avoid newline when a space is available b/w switch and description
+    (  # Avoid newline when a space is available b/w switch and description
         DISABLE_PATCH,  # This creates issues with prepare_manpage
         r'(?m)^(\s{4}-.{%d})(%s)' % (switch_col_width - 6, delim),
-        r'\1 ',
-    ),
-    (   # Replace brackets with a Markdown link
-        r'SponsorBlock API \((http.+)\)',
-        r'[SponsorBlock API](\1)',
+        r'\1 '
     ),
 )
 

devscripts/make_supportedsites.py

@@ -10,21 +10,10 @@
 from devscripts.utils import get_filename_args, write_file
 from yt_dlp.extractor import list_extractor_classes
 
-TEMPLATE = '''\
-# Supported sites
-
-Below is a list of all extractors that are currently included with yt-dlp.
-If a site is not listed here, it might still be supported by yt-dlp's embed extraction or generic extractor.
-Not all sites listed here are guaranteed to work; websites are constantly changing and sometimes this breaks yt-dlp's support for them.
-The only reliable way to check if a site is supported is to try it.
-
-{ie_list}
-'''
-
 
 def main():
     out = '\n'.join(ie.description() for ie in list_extractor_classes() if ie.IE_DESC is not False)
-    write_file(get_filename_args(), TEMPLATE.format(ie_list=out))
+    write_file(get_filename_args(), f'# Supported sites\n{out}\n')
 
 
 if __name__ == '__main__':

devscripts/prepare_manpage.py

@@ -24,7 +24,7 @@
 
 # NAME
 
-yt\-dlp \- A feature\-rich command\-line audio/video downloader
+yt\-dlp \- A youtube-dl fork with additional features and patches
 
 # SYNOPSIS
 
@@ -43,27 +43,6 @@ def filter_excluded_sections(readme):
         '', readme)
 
 
-def _convert_code_blocks(readme):
-    current_code_block = None
-
-    for line in readme.splitlines(True):
-        if current_code_block:
-            if line == current_code_block:
-                current_code_block = None
-                yield '\n'
-            else:
-                yield f'    {line}'
-        elif line.startswith('```'):
-            current_code_block = line.count('`') * '`' + '\n'
-            yield '\n'
-        else:
-            yield line
-
-
-def convert_code_blocks(readme):
-    return ''.join(_convert_code_blocks(readme))
-
-
 def move_sections(readme):
     MOVE_TAG_TEMPLATE = '<!-- MANPAGE: MOVE "%s" SECTION HERE -->'
     sections = re.findall(r'(?m)^%s$' % (
@@ -86,10 +65,8 @@ def move_sections(readme):
 
 def filter_options(readme):
     section = re.search(r'(?sm)^# USAGE AND OPTIONS\n.+?(?=^# )', readme).group(0)
-    section_new = section.replace('*', R'\*')
-
     options = '# OPTIONS\n'
-    for line in section_new.split('\n')[1:]:
+    for line in section.split('\n')[1:]:
         mobj = re.fullmatch(r'''(?x)
                 \s{4}(?P<opt>-(?:,\s|[^\s])+)
                 (?:\s(?P<meta>(?:[^\s]|\s(?!\s))+))?
@@ -109,7 +86,7 @@ def filter_options(readme):
     return readme.replace(section, options, 1)
 
 
-TRANSFORM = compose_functions(filter_excluded_sections, convert_code_blocks, move_sections, filter_options)
+TRANSFORM = compose_functions(filter_excluded_sections, move_sections, filter_options)
 
 
 def main():

devscripts/run_tests.bat

@@ -0,0 +1,17 @@
+@setlocal
+@echo off
+cd /d %~dp0..
+
+if ["%~1"]==[""] (
+    set "test_set="test""
+) else if ["%~1"]==["core"] (
+    set "test_set="-m not download""
+) else if ["%~1"]==["download"] (
+    set "test_set="-m "download""
+) else (
+    echo.Invalid test type "%~1". Use "core" ^| "download"
+    exit /b 1
+)
+
+set PYTHONWARNINGS=error
+pytest %test_set%

devscripts/run_tests.py

@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import functools
-import os
-import re
-import shlex
-import subprocess
-import sys
-from pathlib import Path
-
-
-fix_test_name = functools.partial(re.compile(r'IE(_all|_\d+)?$').sub, r'\1')
-
-
-def parse_args():
-    parser = argparse.ArgumentParser(description='Run selected yt-dlp tests')
-    parser.add_argument(
-        'test', help='an extractor test, test path, or one of "core" or "download"', nargs='*')
-    parser.add_argument(
-        '--flaky',
-        action='store_true',
-        default=None,
-        help='Allow running flaky tests. (default: run, unless in CI)',
-    )
-    parser.add_argument(
-        '--no-flaky',
-        action='store_false',
-        dest='flaky',
-        help=argparse.SUPPRESS,
-    )
-    parser.add_argument(
-        '-k', help='run a test matching EXPRESSION. Same as "pytest -k"', metavar='EXPRESSION')
-    parser.add_argument(
-        '--pytest-args', help='arguments to passthrough to pytest')
-    return parser.parse_args()
-
-
-def run_tests(*tests, pattern=None, ci=False, flaky: bool | None = None):
-    # XXX: hatch uses `tests` if no arguments are passed
-    run_core = 'core' in tests or 'tests' in tests or (not pattern and not tests)
-    run_download = 'download' in tests
-    run_flaky = flaky or (flaky is None and not ci)
-
-    pytest_args = args.pytest_args or os.getenv('HATCH_TEST_ARGS', '')
-    arguments = ['pytest', '-Werror', '--tb=short', *shlex.split(pytest_args)]
-    if ci:
-        arguments.append('--color=yes')
-    if pattern:
-        arguments.extend(['-k', pattern])
-    if run_core:
-        arguments.extend(['-m', 'not download'])
-    elif run_download:
-        arguments.extend(['-m', 'download'])
-    else:
-        arguments.extend(
-            test if '/' in test
-            else f'test/test_download.py::TestDownload::test_{fix_test_name(test)}'
-            for test in tests)
-    if not run_flaky:
-        arguments.append('--disallow-flaky')
-
-    print(f'Running {arguments}', flush=True)
-    try:
-        return subprocess.call(arguments)
-    except FileNotFoundError:
-        pass
-
-    arguments = [sys.executable, '-Werror', '-m', 'unittest']
-    if pattern:
-        arguments.extend(['-k', pattern])
-    if run_core:
-        print('"pytest" needs to be installed to run core tests', file=sys.stderr, flush=True)
-        return 1
-    elif run_download:
-        arguments.append('test.test_download')
-    else:
-        arguments.extend(
-            f'test.test_download.TestDownload.test_{test}' for test in tests)
-
-    print(f'Running {arguments}', flush=True)
-    return subprocess.call(arguments)
-
-
-if __name__ == '__main__':
-    try:
-        args = parse_args()
-
-        os.chdir(Path(__file__).parent.parent)
-        sys.exit(run_tests(
-            *args.test,
-            pattern=args.k,
-            ci=bool(os.getenv('CI')),
-            flaky=args.flaky,
-        ))
-    except KeyboardInterrupt:
-        pass

devscripts/run_tests.sh

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

devscripts/set-variant.py

@@ -30,7 +30,7 @@ def property_setter(name, value):
 opts = parse_options()
 transform = compose_functions(
     property_setter('VARIANT', opts.variant),
-    property_setter('UPDATE_HINT', opts.update_message),
+    property_setter('UPDATE_HINT', opts.update_message)
 )
 
 write_file(VERSION_FILE, transform(read_file(VERSION_FILE)))

devscripts/setup_variables.py

@@ -1,157 +0,0 @@
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import datetime as dt
-import json
-
-from devscripts.utils import calculate_version
-
-
-STABLE_REPOSITORY = 'yt-dlp/yt-dlp'
-
-
-def setup_variables(environment):
-    """
-    `environment` must contain these keys:
-        REPOSITORY, INPUTS, PROCESSED,
-        PUSH_VERSION_COMMIT, PYPI_PROJECT,
-        SOURCE_PYPI_PROJECT, SOURCE_PYPI_SUFFIX,
-        TARGET_PYPI_PROJECT, TARGET_PYPI_SUFFIX,
-        SOURCE_ARCHIVE_REPO, TARGET_ARCHIVE_REPO,
-        HAS_SOURCE_ARCHIVE_REPO_TOKEN,
-        HAS_TARGET_ARCHIVE_REPO_TOKEN,
-        HAS_ARCHIVE_REPO_TOKEN
-
-    `INPUTS` must contain these keys:
-        prerelease
-
-    `PROCESSED` must contain these keys:
-        source_repo, source_tag,
-        target_repo, target_tag
-    """
-    REPOSITORY = environment['REPOSITORY']
-    INPUTS = json.loads(environment['INPUTS'])
-    PROCESSED = json.loads(environment['PROCESSED'])
-
-    source_channel = None
-    does_not_have_needed_token = False
-    target_repo_token = None
-    pypi_project = None
-    pypi_suffix = None
-
-    source_repo = PROCESSED['source_repo']
-    source_tag = PROCESSED['source_tag']
-    if source_repo == 'stable':
-        source_repo = STABLE_REPOSITORY
-    if not source_repo:
-        source_repo = REPOSITORY
-    elif environment['SOURCE_ARCHIVE_REPO']:
-        source_channel = environment['SOURCE_ARCHIVE_REPO']
-    elif not source_tag and '/' not in source_repo:
-        source_tag = source_repo
-        source_repo = REPOSITORY
-
-    resolved_source = source_repo
-    if source_tag:
-        resolved_source = f'{resolved_source}@{source_tag}'
-    elif source_repo == STABLE_REPOSITORY:
-        resolved_source = 'stable'
-
-    revision = None
-    if INPUTS['prerelease'] or not environment['PUSH_VERSION_COMMIT']:
-        revision = dt.datetime.now(tz=dt.timezone.utc).strftime('%H%M%S')
-
-    version = calculate_version(INPUTS.get('version') or revision)
-
-    target_repo = PROCESSED['target_repo']
-    target_tag = PROCESSED['target_tag']
-    if target_repo:
-        if target_repo == 'stable':
-            target_repo = STABLE_REPOSITORY
-        if not target_tag:
-            if target_repo == STABLE_REPOSITORY:
-                target_tag = version
-            elif environment['TARGET_ARCHIVE_REPO']:
-                target_tag = source_tag or version
-            else:
-                target_tag = target_repo
-                target_repo = REPOSITORY
-        if target_repo != REPOSITORY:
-            target_repo = environment['TARGET_ARCHIVE_REPO']
-            target_repo_token = f'{PROCESSED["target_repo"].upper()}_ARCHIVE_REPO_TOKEN'
-            if not json.loads(environment['HAS_TARGET_ARCHIVE_REPO_TOKEN']):
-                does_not_have_needed_token = True
-            pypi_project = environment['TARGET_PYPI_PROJECT'] or None
-            pypi_suffix = environment['TARGET_PYPI_SUFFIX'] or None
-    else:
-        target_tag = source_tag or version
-        if source_channel:
-            target_repo = source_channel
-            target_repo_token = f'{PROCESSED["source_repo"].upper()}_ARCHIVE_REPO_TOKEN'
-            if not json.loads(environment['HAS_SOURCE_ARCHIVE_REPO_TOKEN']):
-                does_not_have_needed_token = True
-            pypi_project = environment['SOURCE_PYPI_PROJECT'] or None
-            pypi_suffix = environment['SOURCE_PYPI_SUFFIX'] or None
-        else:
-            target_repo = REPOSITORY
-
-    if does_not_have_needed_token:
-        if not json.loads(environment['HAS_ARCHIVE_REPO_TOKEN']):
-            print(f'::error::Repository access secret {target_repo_token} not found')
-            return None
-        target_repo_token = 'ARCHIVE_REPO_TOKEN'
-
-    if target_repo == REPOSITORY and not INPUTS['prerelease']:
-        pypi_project = environment['PYPI_PROJECT'] or None
-
-    return {
-        'channel': resolved_source,
-        'version': version,
-        'target_repo': target_repo,
-        'target_repo_token': target_repo_token,
-        'target_tag': target_tag,
-        'pypi_project': pypi_project,
-        'pypi_suffix': pypi_suffix,
-    }
-
-
-def process_inputs(inputs):
-    outputs = {}
-    for key in ('source', 'target'):
-        repo, _, tag = inputs.get(key, '').partition('@')
-        outputs[f'{key}_repo'] = repo
-        outputs[f'{key}_tag'] = tag
-    return outputs
-
-
-if __name__ == '__main__':
-    if not os.getenv('GITHUB_OUTPUT'):
-        print('This script is only intended for use with GitHub Actions', file=sys.stderr)
-        sys.exit(1)
-
-    if 'process_inputs' in sys.argv:
-        inputs = json.loads(os.environ['INPUTS'])
-        print('::group::Inputs')
-        print(json.dumps(inputs, indent=2))
-        print('::endgroup::')
-        outputs = process_inputs(inputs)
-        print('::group::Processed')
-        print(json.dumps(outputs, indent=2))
-        print('::endgroup::')
-        with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-            f.write('\n'.join(f'{key}={value}' for key, value in outputs.items()))
-        sys.exit(0)
-
-    outputs = setup_variables(dict(os.environ))
-    if not outputs:
-        sys.exit(1)
-
-    print('::group::Output variables')
-    print(json.dumps(outputs, indent=2))
-    print('::endgroup::')
-
-    with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-        f.write('\n'.join(f'{key}={value or ""}' for key, value in outputs.items()))

devscripts/setup_variables_tests.py

@@ -1,324 +0,0 @@
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import datetime as dt
-import json
-
-from devscripts.setup_variables import STABLE_REPOSITORY, process_inputs, setup_variables
-from devscripts.utils import calculate_version
-
-
-def _test(github_repository, note, repo_vars, repo_secrets, inputs, expected=None, ignore_revision=False):
-    inp = inputs.copy()
-    inp.setdefault('linux_armv7l', True)
-    inp.setdefault('prerelease', False)
-    processed = process_inputs(inp)
-    source_repo = processed['source_repo'].upper()
-    target_repo = processed['target_repo'].upper()
-    variables = {k.upper(): v for k, v in repo_vars.items()}
-    secrets = {k.upper(): v for k, v in repo_secrets.items()}
-
-    env = {
-        # Keep this in sync with prepare.setup_variables in release.yml
-        'INPUTS': json.dumps(inp),
-        'PROCESSED': json.dumps(processed),
-        'REPOSITORY': github_repository,
-        'PUSH_VERSION_COMMIT': variables.get('PUSH_VERSION_COMMIT') or '',
-        'PYPI_PROJECT': variables.get('PYPI_PROJECT') or '',
-        'SOURCE_PYPI_PROJECT': variables.get(f'{source_repo}_PYPI_PROJECT') or '',
-        'SOURCE_PYPI_SUFFIX': variables.get(f'{source_repo}_PYPI_SUFFIX') or '',
-        'TARGET_PYPI_PROJECT': variables.get(f'{target_repo}_PYPI_PROJECT') or '',
-        'TARGET_PYPI_SUFFIX': variables.get(f'{target_repo}_PYPI_SUFFIX') or '',
-        'SOURCE_ARCHIVE_REPO': variables.get(f'{source_repo}_ARCHIVE_REPO') or '',
-        'TARGET_ARCHIVE_REPO': variables.get(f'{target_repo}_ARCHIVE_REPO') or '',
-        'HAS_SOURCE_ARCHIVE_REPO_TOKEN': json.dumps(bool(secrets.get(f'{source_repo}_ARCHIVE_REPO_TOKEN'))),
-        'HAS_TARGET_ARCHIVE_REPO_TOKEN': json.dumps(bool(secrets.get(f'{target_repo}_ARCHIVE_REPO_TOKEN'))),
-        'HAS_ARCHIVE_REPO_TOKEN': json.dumps(bool(secrets.get('ARCHIVE_REPO_TOKEN'))),
-    }
-
-    result = setup_variables(env)
-    if not expected:
-        print('        {\n' + '\n'.join(f'            {k!r}: {v!r},' for k, v in result.items()) + '\n        }')
-        return
-
-    exp = expected.copy()
-    if ignore_revision:
-        assert len(result['version']) == len(exp['version']), f'revision missing: {github_repository} {note}'
-        version_is_tag = result['version'] == result['target_tag']
-        for dct in (result, exp):
-            dct['version'] = '.'.join(dct['version'].split('.')[:3])
-            if version_is_tag:
-                dct['target_tag'] = dct['version']
-    assert result == exp, f'unexpected result: {github_repository} {note}'
-
-
-def test_setup_variables():
-    DEFAULT_VERSION_WITH_REVISION = dt.datetime.now(tz=dt.timezone.utc).strftime('%Y.%m.%d.%H%M%S')
-    DEFAULT_VERSION = calculate_version()
-    BASE_REPO_VARS = {
-        'MASTER_ARCHIVE_REPO': 'yt-dlp/yt-dlp-master-builds',
-        'NIGHTLY_ARCHIVE_REPO': 'yt-dlp/yt-dlp-nightly-builds',
-        'NIGHTLY_PYPI_PROJECT': 'yt-dlp',
-        'NIGHTLY_PYPI_SUFFIX': 'dev',
-        'PUSH_VERSION_COMMIT': '1',
-        'PYPI_PROJECT': 'yt-dlp',
-    }
-    BASE_REPO_SECRETS = {
-        'ARCHIVE_REPO_TOKEN': '1',
-    }
-    FORK_REPOSITORY = 'fork/yt-dlp'
-    FORK_ORG = FORK_REPOSITORY.partition('/')[0]
-
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, stable',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {}, {
-            'channel': 'stable',
-            'version': DEFAULT_VERSION,
-            'target_repo': STABLE_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': DEFAULT_VERSION,
-            'pypi_project': 'yt-dlp',
-            'pypi_suffix': None,
-        })
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, nightly (w/o target)',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {
-            'source': 'nightly',
-            'prerelease': True,
-        }, {
-            'channel': 'nightly',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': 'yt-dlp/yt-dlp-nightly-builds',
-            'target_repo_token': 'ARCHIVE_REPO_TOKEN',
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': 'yt-dlp',
-            'pypi_suffix': 'dev',
-        }, ignore_revision=True)
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, nightly',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {
-            'source': 'nightly',
-            'target': 'nightly',
-            'prerelease': True,
-        }, {
-            'channel': 'nightly',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': 'yt-dlp/yt-dlp-nightly-builds',
-            'target_repo_token': 'ARCHIVE_REPO_TOKEN',
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': 'yt-dlp',
-            'pypi_suffix': 'dev',
-        }, ignore_revision=True)
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, master (w/o target)',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {
-            'source': 'master',
-            'prerelease': True,
-        }, {
-            'channel': 'master',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': 'yt-dlp/yt-dlp-master-builds',
-            'target_repo_token': 'ARCHIVE_REPO_TOKEN',
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, master',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {
-            'source': 'master',
-            'target': 'master',
-            'prerelease': True,
-        }, {
-            'channel': 'master',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': 'yt-dlp/yt-dlp-master-builds',
-            'target_repo_token': 'ARCHIVE_REPO_TOKEN',
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, special tag, updates to stable',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {
-            'target': f'{STABLE_REPOSITORY}@experimental',
-            'prerelease': True,
-        }, {
-            'channel': 'stable',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': STABLE_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': 'experimental',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        STABLE_REPOSITORY, 'official vars/secrets, special tag, "stable" as target repo',
-        BASE_REPO_VARS, BASE_REPO_SECRETS, {
-            'target': 'stable@experimental',
-            'prerelease': True,
-        }, {
-            'channel': 'stable',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': STABLE_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': 'experimental',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-
-    _test(
-        FORK_REPOSITORY, 'fork w/o vars/secrets, stable',
-        {}, {}, {}, {
-            'channel': FORK_REPOSITORY,
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        FORK_REPOSITORY, 'fork w/o vars/secrets, prerelease',
-        {}, {}, {'prerelease': True}, {
-            'channel': FORK_REPOSITORY,
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        FORK_REPOSITORY, 'fork w/o vars/secrets, nightly',
-        {}, {}, {
-            'prerelease': True,
-            'source': 'nightly',
-            'target': 'nightly',
-        }, {
-            'channel': f'{FORK_REPOSITORY}@nightly',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': 'nightly',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        FORK_REPOSITORY, 'fork w/o vars/secrets, master',
-        {}, {}, {
-            'prerelease': True,
-            'source': 'master',
-            'target': 'master',
-        }, {
-            'channel': f'{FORK_REPOSITORY}@master',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': 'master',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        FORK_REPOSITORY, 'fork w/o vars/secrets, revision',
-        {}, {}, {'version': '123'}, {
-            'channel': FORK_REPOSITORY,
-            'version': f'{DEFAULT_VERSION[:10]}.123',
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': f'{DEFAULT_VERSION[:10]}.123',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        })
-
-    _test(
-        FORK_REPOSITORY, 'fork w/ PUSH_VERSION_COMMIT, stable',
-        {'PUSH_VERSION_COMMIT': '1'}, {}, {}, {
-            'channel': FORK_REPOSITORY,
-            'version': DEFAULT_VERSION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': DEFAULT_VERSION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        })
-    _test(
-        FORK_REPOSITORY, 'fork w/ PUSH_VERSION_COMMIT, prerelease',
-        {'PUSH_VERSION_COMMIT': '1'}, {}, {'prerelease': True}, {
-            'channel': FORK_REPOSITORY,
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-
-    _test(
-        FORK_REPOSITORY, 'fork w/NIGHTLY_ARCHIVE_REPO_TOKEN, nightly', {
-            'NIGHTLY_ARCHIVE_REPO': f'{FORK_ORG}/yt-dlp-nightly-builds',
-            'PYPI_PROJECT': 'yt-dlp-test',
-        }, {
-            'NIGHTLY_ARCHIVE_REPO_TOKEN': '1',
-        }, {
-            'source': f'{FORK_ORG}/yt-dlp-nightly-builds',
-            'target': 'nightly',
-            'prerelease': True,
-        }, {
-            'channel': f'{FORK_ORG}/yt-dlp-nightly-builds',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': f'{FORK_ORG}/yt-dlp-nightly-builds',
-            'target_repo_token': 'NIGHTLY_ARCHIVE_REPO_TOKEN',
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        FORK_REPOSITORY, 'fork w/MASTER_ARCHIVE_REPO_TOKEN, master', {
-            'MASTER_ARCHIVE_REPO': f'{FORK_ORG}/yt-dlp-master-builds',
-            'MASTER_PYPI_PROJECT': 'yt-dlp-test',
-            'MASTER_PYPI_SUFFIX': 'dev',
-        }, {
-            'MASTER_ARCHIVE_REPO_TOKEN': '1',
-        }, {
-            'source': f'{FORK_ORG}/yt-dlp-master-builds',
-            'target': 'master',
-            'prerelease': True,
-        }, {
-            'channel': f'{FORK_ORG}/yt-dlp-master-builds',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': f'{FORK_ORG}/yt-dlp-master-builds',
-            'target_repo_token': 'MASTER_ARCHIVE_REPO_TOKEN',
-            'target_tag': DEFAULT_VERSION_WITH_REVISION,
-            'pypi_project': 'yt-dlp-test',
-            'pypi_suffix': 'dev',
-        }, ignore_revision=True)
-
-    _test(
-        FORK_REPOSITORY, 'fork, non-numeric tag',
-        {}, {}, {'source': 'experimental'}, {
-            'channel': f'{FORK_REPOSITORY}@experimental',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': 'experimental',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)
-    _test(
-        FORK_REPOSITORY, 'fork, non-numeric tag, updates to stable',
-        {}, {}, {
-            'prerelease': True,
-            'source': 'stable',
-            'target': 'experimental',
-        }, {
-            'channel': 'stable',
-            'version': DEFAULT_VERSION_WITH_REVISION,
-            'target_repo': FORK_REPOSITORY,
-            'target_repo_token': None,
-            'target_tag': 'experimental',
-            'pypi_project': None,
-            'pypi_suffix': None,
-        }, ignore_revision=True)

devscripts/tomlparse.py

@@ -1,189 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Simple parser for spec compliant toml files
-
-A simple toml parser for files that comply with the spec.
-Should only be used to parse `pyproject.toml` for `install_deps.py`.
-
-IMPORTANT: INVALID FILES OR MULTILINE STRINGS ARE NOT SUPPORTED!
-"""
-
-from __future__ import annotations
-
-import datetime as dt
-import json
-import re
-
-WS = r'(?:[\ \t]*)'
-STRING_RE = re.compile(r'"(?:\\.|[^\\"\n])*"|\'[^\'\n]*\'')
-SINGLE_KEY_RE = re.compile(rf'{STRING_RE.pattern}|[A-Za-z0-9_-]+')
-KEY_RE = re.compile(rf'{WS}(?:{SINGLE_KEY_RE.pattern}){WS}(?:\.{WS}(?:{SINGLE_KEY_RE.pattern}){WS})*')
-EQUALS_RE = re.compile(rf'={WS}')
-WS_RE = re.compile(WS)
-
-_SUBTABLE = rf'(?P<subtable>^\[(?P<is_list>\[)?(?P<path>{KEY_RE.pattern})\]\]?)'
-EXPRESSION_RE = re.compile(rf'^(?:{_SUBTABLE}|{KEY_RE.pattern}=)', re.MULTILINE)
-
-LIST_WS_RE = re.compile(rf'{WS}((#[^\n]*)?\n{WS})*')
-LEFTOVER_VALUE_RE = re.compile(r'[^,}\]\t\n#]+')
-
-
-def parse_key(value: str):
-    for match in SINGLE_KEY_RE.finditer(value):
-        if match[0][0] == '"':
-            yield json.loads(match[0])
-        elif match[0][0] == '\'':
-            yield match[0][1:-1]
-        else:
-            yield match[0]
-
-
-def get_target(root: dict, paths: list[str], is_list=False):
-    target = root
-
-    for index, key in enumerate(paths, 1):
-        use_list = is_list and index == len(paths)
-        result = target.get(key)
-        if result is None:
-            result = [] if use_list else {}
-            target[key] = result
-
-        if isinstance(result, dict):
-            target = result
-        elif use_list:
-            target = {}
-            result.append(target)
-        else:
-            target = result[-1]
-
-    assert isinstance(target, dict)
-    return target
-
-
-def parse_enclosed(data: str, index: int, end: str, ws_re: re.Pattern):
-    index += 1
-
-    if match := ws_re.match(data, index):
-        index = match.end()
-
-    while data[index] != end:
-        index = yield True, index
-
-        if match := ws_re.match(data, index):
-            index = match.end()
-
-        if data[index] == ',':
-            index += 1
-
-        if match := ws_re.match(data, index):
-            index = match.end()
-
-    assert data[index] == end
-    yield False, index + 1
-
-
-def parse_value(data: str, index: int):
-    if data[index] == '[':
-        result = []
-
-        indices = parse_enclosed(data, index, ']', LIST_WS_RE)
-        valid, index = next(indices)
-        while valid:
-            index, value = parse_value(data, index)
-            result.append(value)
-            valid, index = indices.send(index)
-
-        return index, result
-
-    if data[index] == '{':
-        result = {}
-
-        indices = parse_enclosed(data, index, '}', WS_RE)
-        valid, index = next(indices)
-        while valid:
-            valid, index = indices.send(parse_kv_pair(data, index, result))
-
-        return index, result
-
-    if match := STRING_RE.match(data, index):
-        return match.end(), json.loads(match[0]) if match[0][0] == '"' else match[0][1:-1]
-
-    match = LEFTOVER_VALUE_RE.match(data, index)
-    assert match
-    value = match[0].strip()
-    for func in [
-        int,
-        float,
-        dt.time.fromisoformat,
-        dt.date.fromisoformat,
-        dt.datetime.fromisoformat,
-        {'true': True, 'false': False}.get,
-    ]:
-        try:
-            value = func(value)
-            break
-        except Exception:
-            pass
-
-    return match.end(), value
-
-
-def parse_kv_pair(data: str, index: int, target: dict):
-    match = KEY_RE.match(data, index)
-    if not match:
-        return None
-
-    *keys, key = parse_key(match[0])
-
-    match = EQUALS_RE.match(data, match.end())
-    assert match
-    index = match.end()
-
-    index, value = parse_value(data, index)
-    get_target(target, keys)[key] = value
-    return index
-
-
-def parse_toml(data: str):
-    root = {}
-    target = root
-
-    index = 0
-    while True:
-        match = EXPRESSION_RE.search(data, index)
-        if not match:
-            break
-
-        if match.group('subtable'):
-            index = match.end()
-            path, is_list = match.group('path', 'is_list')
-            target = get_target(root, list(parse_key(path)), bool(is_list))
-            continue
-
-        index = parse_kv_pair(data, match.start(), target)
-        assert index is not None
-
-    return root
-
-
-def main():
-    import argparse
-    from pathlib import Path
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument('infile', type=Path, help='The TOML file to read as input')
-    args = parser.parse_args()
-
-    with args.infile.open('r', encoding='utf-8') as file:
-        data = file.read()
-
-    def default(obj):
-        if isinstance(obj, (dt.date, dt.time, dt.datetime)):
-            return obj.isoformat()
-
-    print(json.dumps(parse_toml(data), default=default))
-
-
-if __name__ == '__main__':
-    main()

devscripts/update-formulae.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+"""
+Usage: python3 ./devscripts/update-formulae.py <path-to-formulae-rb> <version>
+version can be either 0-aligned (yt-dlp version) or normalized (PyPi version)
+"""
+
+# Allow direct execution
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+import json
+import re
+import urllib.request
+
+from devscripts.utils import read_file, write_file
+
+filename, version = sys.argv[1:]
+
+normalized_version = '.'.join(str(int(x)) for x in version.split('.'))
+
+pypi_release = json.loads(urllib.request.urlopen(
+    'https://pypi.org/pypi/yt-dlp/%s/json' % normalized_version
+).read().decode())
+
+tarball_file = next(x for x in pypi_release['urls'] if x['filename'].endswith('.tar.gz'))
+
+sha256sum = tarball_file['digests']['sha256']
+url = tarball_file['url']
+
+formulae_text = read_file(filename)
+
+formulae_text = re.sub(r'sha256 "[0-9a-f]*?"', 'sha256 "%s"' % sha256sum, formulae_text, count=1)
+formulae_text = re.sub(r'url "[^"]*?"', 'url "%s"' % url, formulae_text, count=1)
+
+write_file(filename, formulae_text)

devscripts/update-version.py

@@ -7,59 +7,49 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-import argparse
 import contextlib
+import subprocess
 import sys
+from datetime import datetime
 
-from devscripts.utils import calculate_version, run_process, write_file
+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:
+        assert revision.isdigit(), 'Revision must be a number'
+    else:
+        old_version = read_version().split('.')
+        if version.split('.') == old_version[:3]:
+            revision = str(int((old_version + [0])[3]) + 1)
+
+    return f'{version}.{revision}' if revision else version
 
 
 def get_git_head():
     with contextlib.suppress(Exception):
-        return run_process('git', 'rev-parse', 'HEAD').stdout.strip()
+        sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
+        return sp.communicate()[0].decode().strip() or None
 
 
-VERSION_TEMPLATE = '''\
+VERSION = get_new_version((sys.argv + [''])[1])
+GIT_HEAD = get_git_head()
+
+VERSION_FILE = f'''\
 # Autogenerated by devscripts/update-version.py
 
-__version__ = {version!r}
+__version__ = {VERSION!r}
 
-RELEASE_GIT_HEAD = {git_head!r}
+RELEASE_GIT_HEAD = {GIT_HEAD!r}
 
 VARIANT = None
 
 UPDATE_HINT = None
-
-CHANNEL = {channel!r}
-
-ORIGIN = {origin!r}
-
-_pkg_version = {package_version!r}
 '''
 
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Update the version.py file')
-    parser.add_argument(
-        '-c', '--channel', default='stable',
-        help='Select update channel (default: %(default)s)')
-    parser.add_argument(
-        '-r', '--origin', default='local',
-        help='Select origin/repository (default: %(default)s)')
-    parser.add_argument(
-        '-s', '--suffix', default='',
-        help='Add an alphanumeric suffix to the package version, e.g. "dev"')
-    parser.add_argument(
-        '-o', '--output', default='yt_dlp/version.py',
-        help='The output file to write to (default: %(default)s)')
-    parser.add_argument(
-        'version', nargs='?', default=None,
-        help='A version or revision to use instead of generating one')
-    args = parser.parse_args()
-
-    git_head = get_git_head()
-    version = calculate_version(args.version)
-    write_file(args.output, VERSION_TEMPLATE.format(
-        version=version, git_head=git_head, channel=args.channel, origin=args.origin,
-        package_version=f'{version}{args.suffix}'))
-
-    print(f'version={version} ({args.channel}), head={git_head}')
+write_file('yt_dlp/version.py', VERSION_FILE)
+print(f'::set-output name=ytdlp_version::{VERSION}')
+print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')

devscripts/update_changelog.py

@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from pathlib import Path
-
-from devscripts.make_changelog import create_changelog, create_parser
-from devscripts.utils import read_file, read_version, write_file
-
-# Always run after devscripts/update-version.py, and run before `make doc|pypi-files|tar|all`
-
-if __name__ == '__main__':
-    parser = create_parser()
-    parser.description = 'Update an existing changelog file with an entry for a new release'
-    parser.add_argument(
-        '--changelog-path', type=Path, default=Path(__file__).parent.parent / 'Changelog.md',
-        help='path to the Changelog file')
-    args = parser.parse_args()
-
-    header, sep, changelog = read_file(args.changelog_path).partition('\n### ')
-    current_version = read_version()
-    if current_version != changelog.splitlines()[0]:
-        new_entry = create_changelog(args)
-        write_file(args.changelog_path, f'{header}{sep}{current_version}\n{new_entry}\n{sep}{changelog}')

devscripts/update_ejs.py

@@ -1,166 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-import contextlib
-import io
-import json
-import hashlib
-import pathlib
-import urllib.request
-import zipfile
-
-
-TEMPLATE = '''\
-# This file is generated by devscripts/update_ejs.py. DO NOT MODIFY!
-
-VERSION = {version!r}
-HASHES = {{
-{hash_mapping}
-}}
-'''
-PREFIX = '    "yt-dlp-ejs=='
-BASE_PATH = pathlib.Path(__file__).parent.parent
-PYPROJECT_PATH = BASE_PATH / 'pyproject.toml'
-PACKAGE_PATH = BASE_PATH / 'yt_dlp/extractor/youtube/jsc/_builtin/vendor'
-RELEASE_URL = 'https://api.github.com/repos/yt-dlp/ejs/releases/latest'
-ASSETS = {
-    'yt.solver.lib.js': False,
-    'yt.solver.lib.min.js': False,
-    'yt.solver.deno.lib.js': True,
-    'yt.solver.bun.lib.js': True,
-    'yt.solver.core.min.js': False,
-    'yt.solver.core.js': True,
-}
-MAKEFILE_PATH = BASE_PATH / 'Makefile'
-
-
-def request(url: str):
-    return contextlib.closing(urllib.request.urlopen(url))
-
-
-def makefile_variables(
-        version: str | None = None,
-        name: str | None = None,
-        digest: str | None = None,
-        data: bytes | None = None,
-        keys_only: bool = False,
-) -> dict[str, str | None]:
-    assert keys_only or all(arg is not None for arg in (version, name, digest, data))
-
-    return {
-        'EJS_VERSION': None if keys_only else version,
-        'EJS_WHEEL_NAME': None if keys_only else name,
-        'EJS_WHEEL_HASH': None if keys_only else digest,
-        'EJS_PY_FOLDERS': None if keys_only else list_wheel_contents(data, 'py', files=False),
-        'EJS_PY_FILES': None if keys_only else list_wheel_contents(data, 'py', folders=False),
-        'EJS_JS_FOLDERS': None if keys_only else list_wheel_contents(data, 'js', files=False),
-        'EJS_JS_FILES': None if keys_only else list_wheel_contents(data, 'js', folders=False),
-    }
-
-
-def list_wheel_contents(
-        wheel_data: bytes,
-        suffix: str | None = None,
-        folders: bool = True,
-        files: bool = True,
-) -> str:
-    assert folders or files, 'at least one of "folders" or "files" must be True'
-
-    with zipfile.ZipFile(io.BytesIO(wheel_data)) as zipf:
-        path_gen = (zinfo.filename for zinfo in zipf.infolist())
-
-    filtered = filter(lambda path: path.startswith('yt_dlp_ejs/'), path_gen)
-    if suffix:
-        filtered = filter(lambda path: path.endswith(f'.{suffix}'), filtered)
-
-    files_list = list(filtered)
-    if not folders:
-        return ' '.join(files_list)
-
-    folders_list = list(dict.fromkeys(path.rpartition('/')[0] for path in files_list))
-    if not files:
-        return ' '.join(folders_list)
-
-    return ' '.join(folders_list + files_list)
-
-
-def main():
-    current_version = None
-    with PYPROJECT_PATH.open() as file:
-        for line in file:
-            if not line.startswith(PREFIX):
-                continue
-            current_version, _, _ = line.removeprefix(PREFIX).partition('"')
-
-    if not current_version:
-        print('yt-dlp-ejs dependency line could not be found')
-        return
-
-    makefile_info = makefile_variables(keys_only=True)
-    prefixes = tuple(f'{key} = ' for key in makefile_info)
-    with MAKEFILE_PATH.open() as file:
-        for line in file:
-            if not line.startswith(prefixes):
-                continue
-            key, _, val = line.partition(' = ')
-            makefile_info[key] = val.rstrip()
-
-    with request(RELEASE_URL) as resp:
-        info = json.load(resp)
-
-    version = info['tag_name']
-    if version == current_version:
-        print(f'yt-dlp-ejs is up to date! ({version})')
-        return
-
-    print(f'Updating yt-dlp-ejs from {current_version} to {version}')
-    hashes = []
-    wheel_info = {}
-    for asset in info['assets']:
-        name = asset['name']
-        is_wheel = name.startswith('yt_dlp_ejs-') and name.endswith('.whl')
-        if not is_wheel and name not in ASSETS:
-            continue
-        with request(asset['browser_download_url']) as resp:
-            data = resp.read()
-
-        # verify digest from github
-        digest = asset['digest']
-        algo, _, expected = digest.partition(':')
-        hexdigest = hashlib.new(algo, data).hexdigest()
-        assert hexdigest == expected, f'downloaded attest mismatch ({hexdigest!r} != {expected!r})'
-
-        if is_wheel:
-            wheel_info = makefile_variables(version, name, digest, data)
-            continue
-
-        # calculate sha3-512 digest
-        asset_hash = hashlib.sha3_512(data).hexdigest()
-        hashes.append(f'    {name!r}: {asset_hash!r},')
-
-        if ASSETS[name]:
-            (PACKAGE_PATH / name).write_bytes(data)
-
-    hash_mapping = '\n'.join(hashes)
-    for asset_name in ASSETS:
-        assert asset_name in hash_mapping, f'{asset_name} not found in release'
-
-    assert all(wheel_info.get(key) for key in makefile_info), 'wheel info not found in release'
-
-    (PACKAGE_PATH / '_info.py').write_text(TEMPLATE.format(
-        version=version,
-        hash_mapping=hash_mapping,
-    ))
-
-    content = PYPROJECT_PATH.read_text()
-    updated = content.replace(PREFIX + current_version, PREFIX + version)
-    PYPROJECT_PATH.write_text(updated)
-
-    makefile = MAKEFILE_PATH.read_text()
-    for key in wheel_info:
-        makefile = makefile.replace(f'{key} = {makefile_info[key]}', f'{key} = {wheel_info[key]}')
-    MAKEFILE_PATH.write_text(makefile)
-
-
-if __name__ == '__main__':
-    main()

devscripts/utils.py

@@ -1,8 +1,5 @@
 import argparse
-import datetime as dt
 import functools
-import re
-import subprocess
 
 
 def read_file(fname):
@@ -10,33 +7,15 @@ def read_file(fname):
         return f.read()
 
 
-def write_file(fname, content, mode='w'):
-    with open(fname, mode, encoding='utf-8') as f:
+def write_file(fname, content):
+    with open(fname, 'w', encoding='utf-8') as f:
         return f.write(content)
 
 
-def read_version(fname='yt_dlp/version.py', varname='__version__'):
-    """Get the version without importing the package"""
-    items = {}
-    exec(compile(read_file(fname), fname, 'exec'), items)
-    return items[varname]
-
-
-def calculate_version(version=None, fname='yt_dlp/version.py'):
-    if version and '.' in version:
-        return version
-
-    revision = version
-    version = dt.datetime.now(dt.timezone.utc).strftime('%Y.%m.%d')
-
-    if revision:
-        assert re.fullmatch(r'[0-9]+', revision), 'Revision must be numeric'
-    else:
-        old_version = read_version(fname=fname).split('.')
-        if version.split('.') == old_version[:3]:
-            revision = str(int(([*old_version, 0])[3]) + 1)
-
-    return f'{version}.{revision}' if revision else version
+# Get the version without importing the package
+def read_version(fname='yt_dlp/version.py'):
+    exec(compile(read_file(fname), fname, 'exec'))
+    return locals()['__version__']
 
 
 def get_filename_args(has_infile=False, default_outfile=None):
@@ -54,13 +33,3 @@ def get_filename_args(has_infile=False, default_outfile=None):
 
 def compose_functions(*functions):
     return lambda x: functools.reduce(lambda y, f: f(y), functions, x)
-
-
-def run_process(*args, **kwargs):
-    kwargs.setdefault('text', True)
-    kwargs.setdefault('check', True)
-    kwargs.setdefault('capture_output', True)
-    if kwargs['text']:
-        kwargs.setdefault('encoding', 'utf-8')
-        kwargs.setdefault('errors', 'replace')
-    return subprocess.run(args, **kwargs)

devscripts/zsh-completion.py

@@ -9,16 +9,15 @@
 
 import yt_dlp
 
-ZSH_COMPLETION_FILE = 'completions/zsh/_yt-dlp'
-ZSH_COMPLETION_TEMPLATE = 'devscripts/zsh-completion.in'
+ZSH_COMPLETION_FILE = "completions/zsh/_yt-dlp"
+ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
 def build_completion(opt_parser):
     opts = [opt for group in opt_parser.option_groups
             for opt in group.option_list]
-    opts_file = [opt for opt in opts if opt.metavar == 'FILE']
-    opts_dir = [opt for opt in opts if opt.metavar == 'DIR']
-    opts_path = [opt for opt in opts if opt.metavar == 'PATH']
+    opts_file = [opt for opt in opts if opt.metavar == "FILE"]
+    opts_dir = [opt for opt in opts if opt.metavar == "DIR"]
 
     fileopts = []
     for opt in opts_file:
@@ -27,12 +26,6 @@ def build_completion(opt_parser):
         if opt._long_opts:
             fileopts.extend(opt._long_opts)
 
-    for opt in opts_path:
-        if opt._short_opts:
-            fileopts.extend(opt._short_opts)
-        if opt._long_opts:
-            fileopts.extend(opt._long_opts)
-
     diropts = []
     for opt in opts_dir:
         if opt._short_opts:
@@ -45,11 +38,11 @@ def build_completion(opt_parser):
     with open(ZSH_COMPLETION_TEMPLATE) as f:
         template = f.read()
 
-    template = template.replace('{{fileopts}}', '|'.join(fileopts))
-    template = template.replace('{{diropts}}', '|'.join(diropts))
-    template = template.replace('{{flags}}', ' '.join(flags))
+    template = template.replace("{{fileopts}}", "|".join(fileopts))
+    template = template.replace("{{diropts}}", "|".join(diropts))
+    template = template.replace("{{flags}}", " ".join(flags))
 
-    with open(ZSH_COMPLETION_FILE, 'w') as f:
+    with open(ZSH_COMPLETION_FILE, "w") as f:
         f.write(template)
 
 

public.key

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGP78C4BEAD0rF9zjGPAt0thlt5C1ebzccAVX7Nb1v+eqQjk+WEZdTETVCg3
-WAM5ngArlHdm/fZqzUgO+pAYrB60GKeg7ffUDf+S0XFKEZdeRLYeAaqqKhSibVal
-DjvOBOztu3W607HLETQAqA7wTPuIt2WqmpL60NIcyr27LxqmgdN3mNvZ2iLO+bP0
-nKR/C+PgE9H4ytywDa12zMx6PmZCnVOOOu6XZEFmdUxxdQ9fFDqd9LcBKY2LDOcS
-Yo1saY0YWiZWHtzVoZu1kOzjnS5Fjq/yBHJLImDH7pNxHm7s/PnaurpmQFtDFruk
-t+2lhDnpKUmGr/I/3IHqH/X+9nPoS4uiqQ5HpblB8BK+4WfpaiEg75LnvuOPfZIP
-KYyXa/0A7QojMwgOrD88ozT+VCkKkkJ+ijXZ7gHNjmcBaUdKK7fDIEOYI63Lyc6Q
-WkGQTigFffSUXWHDCO9aXNhP3ejqFWgGMtCUsrbkcJkWuWY7q5ARy/05HbSM3K4D
-U9eqtnxmiV1WQ8nXuI9JgJQRvh5PTkny5LtxqzcmqvWO9TjHBbrs14BPEO9fcXxK
-L/CFBbzXDSvvAgArdqqlMoncQ/yicTlfL6qzJ8EKFiqW14QMTdAn6SuuZTodXCTi
-InwoT7WjjuFPKKdvfH1GP4bnqdzTnzLxCSDIEtfyfPsIX+9GI7Jkk/zZjQARAQAB
-tDdTaW1vbiBTYXdpY2tpICh5dC1kbHAgc2lnbmluZyBrZXkpIDxjb250YWN0QGdy
-dWI0ay54eXo+iQJOBBMBCgA4FiEErAy75oSNaoc0ZK9OV89lkztadYEFAmP78C4C
-GwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQV89lkztadYEVqQ//cW7TxhXg
-7Xbh2EZQzXml0egn6j8QaV9KzGragMiShrlvTO2zXfLXqyizrFP4AspgjSn/4NrI
-8mluom+Yi+qr7DXT4BjQqIM9y3AjwZPdywe912Lxcw52NNoPZCm24I9T7ySc8lmR
-FQvZC0w4H/VTNj/2lgJ1dwMflpwvNRiWa5YzcFGlCUeDIPskLx9++AJE+xwU3LYm
-jQQsPBqpHHiTBEJzMLl+rfd9Fg4N+QNzpFkTDW3EPerLuvJniSBBwZthqxeAtw4M
-UiAXh6JvCc2hJkKCoygRfM281MeolvmsGNyQm+axlB0vyldiPP6BnaRgZlx+l6MU
-cPqgHblb7RW5j9lfr6OYL7SceBIHNv0CFrt1OnkGo/tVMwcs8LH3Ae4a7UJlIceL
-V54aRxSsZU7w4iX+PB79BWkEsQzwKrUuJVOeL4UDwWajp75OFaUqbS/slDDVXvK5
-OIeuth3mA/adjdvgjPxhRQjA3l69rRWIJDrqBSHldmRsnX6cvXTDy8wSXZgy51lP
-m4IVLHnCy9m4SaGGoAsfTZS0cC9FgjUIyTyrq9M67wOMpUxnuB0aRZgJE1DsI23E
-qdvcSNVlO+39xM/KPWUEh6b83wMn88QeW+DCVGWACQq5N3YdPnAJa50617fGbY6I
-gXIoRHXkDqe23PZ/jURYCv0sjVtjPoVC+bg=
-=bJkn
------END PGP PUBLIC KEY BLOCK-----

pyinst.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
 import platform
 
@@ -12,10 +12,9 @@
 
 from devscripts.utils import read_version
 
-OS_NAME, MACHINE, ARCH = sys.platform, platform.machine().lower(), platform.architecture()[0][:2]
-if OS_NAME == 'linux' and platform.libc_ver()[0] != 'glibc':
-    OS_NAME = 'musllinux'
-if MACHINE in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
+OS_NAME, MACHINE, ARCH = sys.platform, platform.machine(), platform.architecture()[0][:2]
+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 ''
 
 
@@ -38,11 +37,8 @@ def main():
         f'--name={name}',
         '--icon=devscripts/logo.ico',
         '--upx-exclude=vcruntime140.dll',
-        # Ref: https://github.com/yt-dlp/yt-dlp/issues/13311
-        #      https://github.com/pyinstaller/pyinstaller/issues/9149
-        '--exclude-module=pkg_resources',
         '--noconfirm',
-        '--additional-hooks-dir=yt_dlp/__pyinstaller',
+        *dependency_options(),
         *opts,
         'yt_dlp/__main__.py',
     ]
@@ -64,22 +60,16 @@ def parse_options():
 
 def exe(onedir):
     """@returns (name, path)"""
-    platform_name, machine, extension = {
-        'win32': (None, MACHINE, '.exe'),
-        'darwin': ('macos', None, None),
-    }.get(OS_NAME, (OS_NAME, MACHINE, None))
-
     name = '_'.join(filter(None, (
         'yt-dlp',
-        platform_name,
-        machine,
+        {'win32': '', 'darwin': 'macos'}.get(OS_NAME, OS_NAME),
+        MACHINE
     )))
-
     return name, ''.join(filter(None, (
         'dist/',
         onedir and f'{name}/',
         name,
-        extension,
+        OS_NAME == 'win32' and '.exe'
     )))
 
 
@@ -88,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)
@@ -96,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,
@@ -104,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(
@@ -124,17 +134,18 @@ def windows_set_version(exe, version):
         ),
         kids=[
             StringFileInfo([StringTable('040904B0', [
-                StringStruct('Comments', f'yt-dlp{suffix} Command Line Interface'),
+                StringStruct('Comments', 'yt-dlp%s Command Line Interface' % suffix),
                 StringStruct('CompanyName', 'https://github.com/yt-dlp'),
                 StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),
                 StringStruct('FileVersion', version),
                 StringStruct('InternalName', f'yt-dlp{suffix}'),
+                StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),
                 StringStruct('OriginalFilename', f'yt-dlp{suffix}.exe'),
                 StringStruct('ProductName', f'yt-dlp{suffix}'),
                 StringStruct(
                     'ProductVersion', f'{version}{suffix} on Python {platform.python_version()}'),
-            ])]), VarFileInfo([VarStruct('Translation', [0, 1200])]),
-        ],
+            ])]), VarFileInfo([VarStruct('Translation', [0, 1200])])
+        ]
     ))
 
 

pyproject.toml

@@ -1,407 +0,0 @@
-[build-system]
-requires = ["hatchling>=1.27.0"]
-build-backend = "hatchling.build"
-
-[project]
-name = "yt-dlp"
-authors = [
-    {name = "pukkandan", email = "pukkandan.ytdlp@gmail.com"},
-]
-maintainers = [
-    {email = "maintainers@yt-dlp.org"},
-    {name = "Grub4K", email = "contact@grub4k.xyz"},
-    {name = "bashonly", email = "bashonly@protonmail.com"},
-    {name = "coletdjnz", email = "coletdjnz@protonmail.com"},
-    {name = "sepro", email = "sepro@sepr0.com"},
-]
-description = "A feature-rich command-line audio/video downloader"
-readme = "README.md"
-requires-python = ">=3.10"
-keywords = [
-    "cli",
-    "downloader",
-    "youtube-dl",
-    "youtube-downloader",
-    "sponsorblock",
-    "yt-dlp",
-]
-license = "Unlicense"
-license-files = ["LICENSE"]
-classifiers = [
-    "Topic :: Multimedia :: Video",
-    "Development Status :: 5 - Production/Stable",
-    "Environment :: Console",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
-    "Programming Language :: Python :: Implementation",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: Implementation :: PyPy",
-    "Operating System :: OS Independent",
-]
-dynamic = ["version"]
-dependencies = []
-
-[project.optional-dependencies]
-default = [
-    "brotli; implementation_name=='cpython'",
-    "brotlicffi; implementation_name!='cpython'",
-    "certifi",
-    "mutagen",
-    "pycryptodomex",
-    "requests>=2.32.2,<3",
-    "urllib3>=2.0.2,<3",
-    "websockets>=13.0",
-    "yt-dlp-ejs==0.3.1",
-]
-curl-cffi = [
-    "curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.14; implementation_name=='cpython'",
-]
-secretstorage = [
-    "cffi",
-    "secretstorage",
-]
-build = [
-    "build",
-    "hatchling>=1.27.0",
-    "pip",
-    "setuptools>=71.0.2,<81",  # See https://github.com/pyinstaller/pyinstaller/issues/9149
-    "wheel",
-]
-dev = [
-    "pre-commit",
-    "yt-dlp[static-analysis]",
-    "yt-dlp[test]",
-]
-static-analysis = [
-    "autopep8~=2.0",
-    "ruff~=0.14.0",
-]
-test = [
-    "pytest~=8.1",
-    "pytest-rerunfailures~=14.0",
-]
-pyinstaller = [
-    "pyinstaller>=6.13.0",  # Windows temp cleanup fixed in 6.13.0
-]
-
-[project.urls]
-Documentation = "https://github.com/yt-dlp/yt-dlp#readme"
-Repository = "https://github.com/yt-dlp/yt-dlp"
-Tracker = "https://github.com/yt-dlp/yt-dlp/issues"
-Funding = "https://github.com/yt-dlp/yt-dlp/blob/master/Maintainers.md#maintainers"
-
-[project.scripts]
-yt-dlp = "yt_dlp:main"
-
-[project.entry-points.pyinstaller40]
-hook-dirs = "yt_dlp.__pyinstaller:get_hook_dirs"
-
-[tool.hatch.build.targets.sdist]
-include = [
-    "/yt_dlp",
-    "/devscripts",
-    "/test",
-    "/.gitignore",  # included by default, needed for auto-excludes
-    "/Changelog.md",
-    "/LICENSE",  # included as license
-    "/pyproject.toml",  # included by default
-    "/README.md",  # included as readme
-    "/supportedsites.md",
-]
-artifacts = [
-    "/yt_dlp/extractor/lazy_extractors.py",
-    "/completions",
-    "/AUTHORS",  # included by default
-    "/README.txt",
-    "/yt-dlp.1",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = ["yt_dlp"]
-artifacts = [
-    "/yt_dlp/extractor/lazy_extractors.py",
-]
-exclude = [
-    "/yt_dlp/**/*.md",
-]
-
-[tool.hatch.build.targets.wheel.shared-data]
-"completions/bash/yt-dlp" = "share/bash-completion/completions/yt-dlp"
-"completions/zsh/_yt-dlp" = "share/zsh/site-functions/_yt-dlp"
-"completions/fish/yt-dlp.fish" = "share/fish/vendor_completions.d/yt-dlp.fish"
-"README.txt" = "share/doc/yt_dlp/README.txt"
-"yt-dlp.1" = "share/man/man1/yt-dlp.1"
-
-[tool.hatch.version]
-path = "yt_dlp/version.py"
-pattern = "_pkg_version = '(?P<version>[^']+)'"
-
-[tool.hatch.envs.default]
-features = ["curl-cffi", "default"]
-dependencies = ["pre-commit"]
-path = ".venv"
-installer = "uv"
-
-[tool.hatch.envs.default.scripts]
-setup = "pre-commit install --config .pre-commit-hatch.yaml"
-yt-dlp = "python -Werror -Xdev -m yt_dlp {args}"
-
-[tool.hatch.envs.hatch-static-analysis]
-detached = true
-features = ["static-analysis"]
-dependencies = []  # override hatch ruff version
-config-path = "pyproject.toml"
-
-[tool.hatch.envs.hatch-static-analysis.scripts]
-format-check = "autopep8 --diff {args:.}"
-format-fix = "autopep8 --in-place {args:.}"
-lint-check = "ruff check {args:.}"
-lint-fix = "ruff check --fix {args:.}"
-
-[tool.hatch.envs.hatch-test]
-features = ["test"]
-dependencies = [
-    "pytest-randomly~=3.15",
-    "pytest-xdist[psutil]~=3.5",
-]
-
-[tool.hatch.envs.hatch-test.scripts]
-run = "python -m devscripts.run_tests {args}"
-run-cov = "echo Code coverage not implemented && exit 1"
-
-[[tool.hatch.envs.hatch-test.matrix]]
-python = [
-    "3.10",
-    "3.11",
-    "3.12",
-    "3.13",
-    "3.14",
-    "pypy3.11",
-]
-
-[tool.ruff]
-line-length = 120
-
-[tool.ruff.lint]
-ignore = [
-    "E402",    # module-import-not-at-top-of-file
-    "E501",    # line-too-long
-    "E731",    # lambda-assignment
-    "E741",    # ambiguous-variable-name
-    "UP031",   # printf-string-formatting
-    "UP036",   # outdated-version-block
-    "B006",    # mutable-argument-default
-    "B008",    # function-call-in-default-argument
-    "B011",    # assert-false
-    "B017",    # assert-raises-exception
-    "B023",    # function-uses-loop-variable (false positives)
-    "B028",    # no-explicit-stacklevel
-    "B904",    # raise-without-from-inside-except
-    "A005",    # stdlib-module-shadowing
-    "C401",    # unnecessary-generator-set
-    "C402",    # unnecessary-generator-dict
-    "PIE790",  # unnecessary-placeholder
-    "SIM102",  # collapsible-if
-    "SIM108",  # if-else-block-instead-of-if-exp
-    "SIM112",  # uncapitalized-environment-variables
-    "SIM113",  # enumerate-for-loop
-    "SIM114",  # if-with-same-arms
-    "SIM115",  # open-file-with-context-handler
-    "SIM117",  # multiple-with-statements
-    "SIM223",  # expr-and-false
-    "SIM300",  # yoda-conditions
-    "TD001",   # invalid-todo-tag
-    "TD002",   # missing-todo-author
-    "TD003",   # missing-todo-link
-    "PLC0415", # import-outside-top-level
-    "PLE0604", # invalid-all-object (false positives)
-    "PLE0643", # potential-index-error (false positives)
-    "PLW0603", # global-statement
-    "PLW1510", # subprocess-run-without-check
-    "PLW1641", # eq-without-hash
-    "PLW2901", # redefined-loop-name
-    "RUF001",  # ambiguous-unicode-character-string
-    "RUF012",  # mutable-class-default
-    "RUF100",  # unused-noqa (flake8 has slightly different behavior)
-]
-select = [
-    "E",      # pycodestyle Error
-    "W",      # pycodestyle Warning
-    "F",      # Pyflakes
-    "I",      # isort
-    "Q",      # flake8-quotes
-    "N803",   # invalid-argument-name
-    "N804",   # invalid-first-argument-name-for-class-method
-    "UP",     # pyupgrade
-    "B",      # flake8-bugbear
-    "A",      # flake8-builtins
-    "COM",    # flake8-commas
-    "C4",     # flake8-comprehensions
-    "FA",     # flake8-future-annotations
-    "ISC",    # flake8-implicit-str-concat
-    "ICN003", # banned-import-from
-    "PIE",    # flake8-pie
-    "T20",    # flake8-print
-    "RSE",    # flake8-raise
-    "RET504", # unnecessary-assign
-    "SIM",    # flake8-simplify
-    "TID251", # banned-api
-    "TD",     # flake8-todos
-    "PLC",    # Pylint Convention
-    "PLE",    # Pylint Error
-    "PLW",    # Pylint Warning
-    "RUF",    # Ruff-specific rules
-]
-
-[tool.ruff.lint.per-file-ignores]
-"devscripts/lazy_load_template.py" = [
-    "F401",   # unused-import
-]
-"!yt_dlp/extractor/**.py" = [
-    "I",      # isort
-    "ICN003", # banned-import-from
-    "T20",    # flake8-print
-    "A002",   # builtin-argument-shadowing
-    "C408",   # unnecessary-collection-call
-]
-
-[tool.ruff.lint.isort]
-known-first-party = [
-    "bundle",
-    "devscripts",
-    "test",
-]
-relative-imports-order = "closest-to-furthest"
-
-[tool.ruff.lint.flake8-quotes]
-docstring-quotes = "double"
-multiline-quotes = "single"
-inline-quotes = "single"
-avoid-escape = false
-
-[tool.ruff.lint.pep8-naming]
-classmethod-decorators = [
-    "yt_dlp.utils.classproperty",
-]
-
-[tool.ruff.lint.flake8-import-conventions]
-banned-from = [
-    "base64",
-    "datetime",
-    "functools",
-    "glob",
-    "hashlib",
-    "itertools",
-    "json",
-    "math",
-    "os",
-    "pathlib",
-    "random",
-    "re",
-    "string",
-    "sys",
-    "time",
-    "urllib.parse",
-    "uuid",
-    "xml",
-]
-
-[tool.ruff.lint.flake8-tidy-imports.banned-api]
-"yt_dlp.compat.compat_str".msg = "Use `str` instead."
-"yt_dlp.compat.compat_b64decode".msg = "Use `base64.b64decode` instead."
-"yt_dlp.compat.compat_urlparse".msg = "Use `urllib.parse` instead."
-"yt_dlp.compat.compat_parse_qs".msg = "Use `urllib.parse.parse_qs` instead."
-"yt_dlp.compat.compat_urllib_parse_unquote".msg = "Use `urllib.parse.unquote` instead."
-"yt_dlp.compat.compat_urllib_parse_urlencode".msg = "Use `urllib.parse.urlencode` instead."
-"yt_dlp.compat.compat_urllib_parse_urlparse".msg = "Use `urllib.parse.urlparse` instead."
-"yt_dlp.compat.compat_shlex_quote".msg = "Use `yt_dlp.utils.shell_quote` instead."
-"yt_dlp.utils.error_to_compat_str".msg = "Use `str` instead."
-"yt_dlp.utils.bytes_to_intlist".msg = "Use `list` instead."
-"yt_dlp.utils.intlist_to_bytes".msg = "Use `bytes` instead."
-"yt_dlp.utils.jwt_encode_hs256".msg = "Use `yt_dlp.utils.jwt_encode` instead."
-"yt_dlp.utils.decodeArgument".msg = "Do not use"
-"yt_dlp.utils.decodeFilename".msg = "Do not use"
-"yt_dlp.utils.encodeFilename".msg = "Do not use"
-"yt_dlp.compat.compat_os_name".msg = "Use `os.name` instead."
-"yt_dlp.compat.compat_realpath".msg = "Use `os.path.realpath` instead."
-"yt_dlp.compat.functools".msg = "Use `functools` instead."
-"yt_dlp.utils.decodeOption".msg = "Do not use"
-"yt_dlp.utils.compiled_regex_type".msg = "Use `re.Pattern` instead."
-
-[tool.autopep8]
-max_line_length = 120
-recursive = true
-exit-code = true
-jobs = 0
-select = [
-    "E101",
-    "E112",
-    "E113",
-    "E115",
-    "E116",
-    "E117",
-    "E121",
-    "E122",
-    "E123",
-    "E124",
-    "E125",
-    "E126",
-    "E127",
-    "E128",
-    "E129",
-    "E131",
-    "E201",
-    "E202",
-    "E203",
-    "E211",
-    "E221",
-    "E222",
-    "E223",
-    "E224",
-    "E225",
-    "E226",
-    "E227",
-    "E228",
-    "E231",
-    "E241",
-    "E242",
-    "E251",
-    "E252",
-    "E261",
-    "E262",
-    "E265",
-    "E266",
-    "E271",
-    "E272",
-    "E273",
-    "E274",
-    "E275",
-    "E301",
-    "E302",
-    "E303",
-    "E304",
-    "E305",
-    "E306",
-    "E502",
-    "E701",
-    "E702",
-    "E704",
-    "W391",
-    "W504",
-]
-exclude = "*/extractor/lazy_extractors.py,*venv*,*/test/testdata/sigs/player-*.js,.idea,.vscode"
-
-[tool.pytest.ini_options]
-addopts = [
-    "-ra",  # summary: all except passed
-    "--verbose",
-    "--strict-markers",
-]
-markers = [
-    "download",
-]

requirements.txt

@@ -0,0 +1,6 @@
+mutagen
+pycryptodomex
+websockets
+brotli; platform_python_implementation=='CPython'
+brotlicffi; platform_python_implementation!='CPython'
+certifi

setup.cfg

@@ -0,0 +1,41 @@
+[wheel]
+universal = true
+
+
+[flake8]
+exclude = build,venv,.tox,.git,.pytest_cache
+ignore = E402,E501,E731,E741,W503
+max_line_length = 120
+per_file_ignores =
+    devscripts/lazy_load_template.py: F401
+
+
+[tool:pytest]
+addopts = -ra -v --strict-markers
+markers =
+    download
+
+
+[tox:tox]
+skipsdist = true
+envlist = py{36,37,38,39,310},pypy{36,37,38,39}
+skip_missing_interpreters = true
+
+[testenv]  # tox
+deps =
+   pytest
+commands = pytest {posargs:"-m not download"}
+passenv = HOME  # For test_compat_expanduser
+setenv =
+    # PYTHONWARNINGS = error  # Catches PIP's warnings too
+
+
+[isort]
+py_version = 37
+multi_line_output = VERTICAL_HANGING_INDENT
+line_length = 80
+reverse_relative = true
+ensure_newline_before_comments = true
+include_trailing_comma = true
+known_first_party =
+    test

setup.py

@@ -0,0 +1,155 @@
+#!/usr/bin/env python3
+
+import os.path
+import subprocess
+import sys
+import warnings
+
+try:
+    from setuptools import Command, find_packages, setup
+    setuptools_available = True
+except ImportError:
+    from distutils.core import Command, setup
+    setuptools_available = False
+
+from devscripts.utils import read_file, read_version
+
+VERSION = read_version()
+
+DESCRIPTION = 'A youtube-dl fork with additional features and patches'
+
+LONG_DESCRIPTION = '\n\n'.join((
+    'Official repository: <https://github.com/yt-dlp/yt-dlp>',
+    '**PS**: Some links in this document will not work since this is a copy of the README.md from Github',
+    read_file('README.md')))
+
+REQUIREMENTS = read_file('requirements.txt').splitlines()
+
+
+def packages():
+    if setuptools_available:
+        return find_packages(exclude=('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts'))
+
+    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. '
+        'The recommended way is to use "pyinst.py" to build using pyinstaller')
+
+    return {
+        'console': [{
+            'script': './yt_dlp/__main__.py',
+            'dest_base': 'yt-dlp',
+            'version': VERSION,
+            'description': DESCRIPTION,
+            'comments': LONG_DESCRIPTION.split('\n')[0],
+            'product_name': 'yt-dlp',
+            'product_version': VERSION,
+            'icon_resources': [(1, 'devscripts/logo.ico')],
+        }],
+        'options': {
+            'py2exe': {
+                'bundle_files': 0,
+                'compressed': 1,
+                'optimize': 2,
+                'dist_dir': './dist',
+                'excludes': ['Crypto', 'Cryptodome'],  # py2exe cannot import Crypto
+                'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
+                # Modules that are only imported dynamically must be added here
+                'includes': ['yt_dlp.compat._legacy'],
+            }
+        },
+        'zipfile': None
+    }
+
+
+def build_params():
+    files_spec = [
+        ('share/bash-completion/completions', ['completions/bash/yt-dlp']),
+        ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
+        ('share/fish/vendor_completions.d', ['completions/fish/yt-dlp.fish']),
+        ('share/doc/yt_dlp', ['README.txt']),
+        ('share/man/man1', ['yt-dlp.1'])
+    ]
+    data_files = []
+    for dirname, files in files_spec:
+        resfiles = []
+        for fn in files:
+            if not os.path.exists(fn):
+                warnings.warn(f'Skipping file {fn} since it is not present. Try running " make pypi-files " first')
+            else:
+                resfiles.append(fn)
+        data_files.append((dirname, resfiles))
+
+    params = {'data_files': data_files}
+
+    if setuptools_available:
+        params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']}
+    else:
+        params['scripts'] = ['yt-dlp']
+    return params
+
+
+class build_lazy_extractors(Command):
+    description = 'Build the extractor lazy loading module'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        if self.dry_run:
+            print('Skipping build of lazy extractors in dry run mode')
+            return
+        subprocess.run([sys.executable, 'devscripts/make_lazy_extractors.py'])
+
+
+params = py2exe_params() if sys.argv[1:2] == ['py2exe'] else build_params()
+setup(
+    name='yt-dlp',
+    version=VERSION,
+    maintainer='pukkandan',
+    maintainer_email='pukkandan.ytdlp@gmail.com',
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/markdown',
+    url='https://github.com/yt-dlp/yt-dlp',
+    packages=packages(),
+    install_requires=REQUIREMENTS,
+    python_requires='>=3.6',
+    project_urls={
+        'Documentation': 'https://github.com/yt-dlp/yt-dlp#readme',
+        'Source': 'https://github.com/yt-dlp/yt-dlp',
+        'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues',
+        'Funding': 'https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators',
+    },
+    classifiers=[
+        'Topic :: Multimedia :: Video',
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3.6',
+        '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
+)

test/conftest.py

@@ -1,94 +0,0 @@
-import inspect
-
-import pytest
-
-from yt_dlp.networking import RequestHandler
-from yt_dlp.networking.common import _REQUEST_HANDLERS
-from yt_dlp.utils._utils import _YDLLogger as FakeLogger
-
-
-@pytest.fixture
-def handler(request):
-    RH_KEY = getattr(request, 'param', None)
-    if not RH_KEY:
-        return
-    if inspect.isclass(RH_KEY) and issubclass(RH_KEY, RequestHandler):
-        handler = RH_KEY
-    elif RH_KEY in _REQUEST_HANDLERS:
-        handler = _REQUEST_HANDLERS[RH_KEY]
-    else:
-        pytest.skip(f'{RH_KEY} request handler is not available')
-
-    class HandlerWrapper(handler):
-        RH_KEY = handler.RH_KEY
-
-        def __init__(self, **kwargs):
-            super().__init__(logger=FakeLogger, **kwargs)
-
-    return HandlerWrapper
-
-
-@pytest.fixture(autouse=True)
-def skip_handler(request, handler):
-    """usage: pytest.mark.skip_handler('my_handler', 'reason')"""
-    for marker in request.node.iter_markers('skip_handler'):
-        if marker.args[0] == handler.RH_KEY:
-            pytest.skip(marker.args[1] if len(marker.args) > 1 else '')
-
-
-@pytest.fixture(autouse=True)
-def skip_handler_if(request, handler):
-    """usage: pytest.mark.skip_handler_if('my_handler', lambda request: True, 'reason')"""
-    for marker in request.node.iter_markers('skip_handler_if'):
-        if marker.args[0] == handler.RH_KEY and marker.args[1](request):
-            pytest.skip(marker.args[2] if len(marker.args) > 2 else '')
-
-
-@pytest.fixture(autouse=True)
-def skip_handlers_if(request, handler):
-    """usage: pytest.mark.skip_handlers_if(lambda request, handler: True, 'reason')"""
-    for marker in request.node.iter_markers('skip_handlers_if'):
-        if handler and marker.args[0](request, handler):
-            pytest.skip(marker.args[1] if len(marker.args) > 1 else '')
-
-
-@pytest.fixture(autouse=True)
-def handler_flaky(request, handler):
-    """Mark a certain handler as being flaky.
-
-    This will skip the test if pytest does not get run using `--allow-flaky`
-
-    usage:
-        pytest.mark.handler_flaky('my_handler', os.name != 'nt', reason='reason')
-    """
-    for marker in request.node.iter_markers(handler_flaky.__name__):
-        if (
-            marker.args[0] == handler.RH_KEY
-            and (not marker.args[1:] or any(marker.args[1:]))
-            and request.config.getoption('disallow_flaky')
-        ):
-            reason = marker.kwargs.get('reason')
-            pytest.skip(f'flaky: {reason}' if reason else 'flaky')
-
-
-def pytest_addoption(parser, pluginmanager):
-    parser.addoption(
-        '--disallow-flaky',
-        action='store_true',
-        help='disallow flaky tests from running.',
-    )
-
-
-def pytest_configure(config):
-    config.addinivalue_line(
-        'markers', 'skip_handler(handler): skip test for the given handler',
-    )
-    config.addinivalue_line(
-        'markers', 'skip_handler_if(handler): skip test for the given handler if condition is true',
-    )
-    config.addinivalue_line(
-        'markers', 'skip_handlers_if(handler): skip test for handlers when the condition is true',
-    )
-    config.addinivalue_line(
-        'markers', 'handler_flaky(handler): mark handler as flaky if condition is true',
-    )

test/helper.py

@@ -9,14 +9,15 @@
 
 import yt_dlp.extractor
 from yt_dlp import YoutubeDL
-from yt_dlp.utils import preferredencoding, try_call, write_string, find_available_port
+from yt_dlp.compat import compat_os_name
+from yt_dlp.utils import preferredencoding, write_string
 
 if 'pytest' in sys.modules:
     import pytest
     is_download_test = pytest.mark.download
 else:
-    def is_download_test(test_class):
-        return test_class
+    def is_download_test(testClass):
+        return testClass
 
 
 def get_params(override=None):
@@ -44,11 +45,11 @@ def try_rm(filename):
 
 
 def report_warning(message, *args, **kwargs):
-    """
+    '''
     Print the message to stderr, it will be prefixed with 'WARNING:'
     If stderr is a tty file the 'WARNING:' will be colored
-    """
-    if sys.stderr.isatty() and os.name != 'nt':
+    '''
+    if sys.stderr.isatty() and compat_os_name != 'nt':
         _msg_header = '\033[0;33mWARNING:\033[0m'
     else:
         _msg_header = 'WARNING:'
@@ -101,109 +102,88 @@ def getwebpagetestcases():
 md5 = lambda s: hashlib.md5(s.encode()).hexdigest()
 
 
-def _iter_differences(got, expected, field):
-    if isinstance(expected, str):
-        op, _, val = expected.partition(':')
-        if op in ('mincount', 'maxcount', 'count'):
-            if not isinstance(got, (list, dict)):
-                yield field, f'expected either {list.__name__} or {dict.__name__}, got {type(got).__name__}'
-                return
-
-            expected_num = int(val)
-            got_num = len(got)
-            if op == 'mincount':
-                if got_num < expected_num:
-                    yield field, f'expected at least {val} items, got {got_num}'
-                return
-
-            if op == 'maxcount':
-                if got_num > expected_num:
-                    yield field, f'expected at most {val} items, got {got_num}'
-                return
-
-            assert op == 'count'
-            if got_num != expected_num:
-                yield field, f'expected exactly {val} items, got {got_num}'
-            return
-
-        if not isinstance(got, str):
-            yield field, f'expected {str.__name__}, got {type(got).__name__}'
-            return
-
-        if op == 're':
-            if not re.match(val, got):
-                yield field, f'should match {val!r}, got {got!r}'
-            return
-
-        if op == 'startswith':
-            if not got.startswith(val):
-                yield field, f'should start with {val!r}, got {got!r}'
-            return
-
-        if op == 'contains':
-            if not val.startswith(got):
-                yield field, f'should contain {val!r}, got {got!r}'
-            return
-
-        if op == 'md5':
-            hash_val = md5(got)
-            if hash_val != val:
-                yield field, f'expected hash {val}, got {hash_val}'
-            return
-
-        if got != expected:
-            yield field, f'expected {expected!r}, got {got!r}'
-        return
-
-    if isinstance(expected, dict) and isinstance(got, dict):
-        for key, expected_val in expected.items():
-            if key not in got:
-                yield field, f'missing key: {key!r}'
-                continue
-
-            field_name = key if field is None else f'{field}.{key}'
-            yield from _iter_differences(got[key], expected_val, field_name)
-        return
-
-    if isinstance(expected, type):
-        if not isinstance(got, expected):
-            yield field, f'expected {expected.__name__}, got {type(got).__name__}'
-        return
-
-    if isinstance(expected, list) and isinstance(got, list):
-        # TODO: clever diffing algorithm lmao
-        if len(expected) != len(got):
-            yield field, f'expected length of {len(expected)}, got {len(got)}'
-            return
-
-        for index, (got_val, expected_val) in enumerate(zip(got, expected, strict=True)):
-            field_name = str(index) if field is None else f'{field}.{index}'
-            yield from _iter_differences(got_val, expected_val, field_name)
-        return
-
-    if got != expected:
-        yield field, f'expected {expected!r}, got {got!r}'
-
-
-def _expect_value(message, got, expected, field):
-    mismatches = list(_iter_differences(got, expected, field))
-    if not mismatches:
-        return
-
-    fields = [field for field, _ in mismatches if field is not None]
-    return ''.join((
-        message, f' ({", ".join(fields)})' if fields else '',
-        *(f'\n\t{field}: {message}' for field, message in mismatches)))
-
-
 def expect_value(self, got, expected, field):
-    if message := _expect_value('values differ', got, expected, field):
-        self.fail(message)
+    if isinstance(expected, str) and expected.startswith('re:'):
+        match_str = expected[len('re:'):]
+        match_rex = re.compile(match_str)
+
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            match_rex.match(got),
+            f'field {field} (value: {got!r}) should match {match_str!r}')
+    elif isinstance(expected, str) and expected.startswith('startswith:'):
+        start_str = expected[len('startswith:'):]
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            got.startswith(start_str),
+            f'field {field} (value: {got!r}) should start with {start_str!r}')
+    elif isinstance(expected, str) and expected.startswith('contains:'):
+        contains_str = expected[len('contains:'):]
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            contains_str in got,
+            f'field {field} (value: {got!r}) should contain {contains_str!r}')
+    elif isinstance(expected, type):
+        self.assertTrue(
+            isinstance(got, expected),
+            f'Expected type {expected!r} for field {field}, but got value {got!r} of type {type(got)!r}')
+    elif isinstance(expected, dict) and isinstance(got, dict):
+        expect_dict(self, got, expected)
+    elif isinstance(expected, list) and isinstance(got, list):
+        self.assertEqual(
+            len(expected), len(got),
+            'Expect a list of length %d, but got a list of length %d for field %s' % (
+                len(expected), len(got), field))
+        for index, (item_got, item_expected) in enumerate(zip(got, expected)):
+            type_got = type(item_got)
+            type_expected = type(item_expected)
+            self.assertEqual(
+                type_expected, type_got,
+                'Type mismatch for list item at index %d for field %s, expected %r, got %r' % (
+                    index, field, type_expected, type_got))
+            expect_value(self, item_got, item_expected, field)
+    else:
+        if isinstance(expected, str) and expected.startswith('md5:'):
+            self.assertTrue(
+                isinstance(got, str),
+                f'Expected field {field} to be a unicode object, but got value {got!r} of type {type(got)!r}')
+            got = 'md5:' + md5(got)
+        elif isinstance(expected, str) and re.match(r'^(?:min|max)?count:\d+', expected):
+            self.assertTrue(
+                isinstance(got, (list, dict)),
+                f'Expected field {field} to be a list or a dict, but it is of type {type(got).__name__}')
+            op, _, expected_num = expected.partition(':')
+            expected_num = int(expected_num)
+            if op == 'mincount':
+                assert_func = assertGreaterEqual
+                msg_tmpl = 'Expected %d items in field %s, but only got %d'
+            elif op == 'maxcount':
+                assert_func = assertLessEqual
+                msg_tmpl = 'Expected maximum %d items in field %s, but got %d'
+            elif op == 'count':
+                assert_func = assertEqual
+                msg_tmpl = 'Expected exactly %d items in field %s, but got %d'
+            else:
+                assert False
+            assert_func(
+                self, len(got), expected_num,
+                msg_tmpl % (expected_num, field, len(got)))
+            return
+        self.assertEqual(
+            expected, got,
+            f'Invalid value for field {field}, expected {expected!r}, got {got!r}')
 
 
 def expect_dict(self, got_dict, expected_dict):
-    if message := _expect_value('dictionaries differ', got_dict, expected_dict, None):
-        self.fail(message)
+    for info_field, expected in expected_dict.items():
+        got = got_dict.get(info_field)
+        expect_value(self, got, expected, info_field)
 
 
 def sanitize_got_info_dict(got_dict):
@@ -214,8 +194,8 @@ def sanitize_got_info_dict(got_dict):
         'formats', 'thumbnails', 'subtitles', 'automatic_captions', 'comments', 'entries',
 
         # Auto-generated
-        'autonumber', 'playlist', 'format_index', 'video_ext', 'audio_ext', 'duration_string', 'epoch', 'n_entries',
-        'fulltitle', 'extractor', 'extractor_key', 'filename', 'filepath', 'infojson_filename', 'original_url',
+        'autonumber', 'playlist', 'format_index', 'video_ext', 'audio_ext', 'duration_string', 'epoch',
+        'fulltitle', 'extractor', 'extractor_key', 'filepath', 'infojson_filename', 'original_url', 'n_entries',
 
         # Only live_status needs to be checked
         'is_live', 'was_live',
@@ -234,45 +214,18 @@ def sanitize(key, value):
 
     test_info_dict = {
         key: sanitize(key, value) for key, value in got_dict.items()
-        if value is not None and key not in IGNORED_FIELDS and (
-            not any(key.startswith(f'{prefix}_') for prefix in IGNORED_PREFIXES)
-            or key == '_old_archive_ids')
+        if value is not None and key not in IGNORED_FIELDS and not any(
+            key.startswith(f'{prefix}_') for prefix in IGNORED_PREFIXES)
     }
 
     # display_id may be generated from id
     if test_info_dict.get('display_id') == test_info_dict.get('id'):
         test_info_dict.pop('display_id')
 
-    # Remove deprecated fields
-    for old in YoutubeDL._deprecated_multivalue_fields:
-        test_info_dict.pop(old, None)
-
-    # release_year may be generated from release_date
-    if try_call(lambda: test_info_dict['release_year'] == int(test_info_dict['release_date'][:4])):
-        test_info_dict.pop('release_year')
-
-    # 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
 
 
 def expect_info_dict(self, got_dict, expected_dict):
-    ALLOWED_KEYS_SORT_ORDER = (
-        # NB: Keep in sync with the docstring of extractor/common.py
-        'id', 'ext', 'direct', 'display_id', 'title', 'alt_title', 'description', 'media_type',
-        'uploader', 'uploader_id', 'uploader_url', 'channel', 'channel_id', 'channel_url', 'channel_is_verified',
-        'channel_follower_count', 'comment_count', 'view_count', 'concurrent_view_count',
-        'like_count', 'dislike_count', 'repost_count', 'average_rating', 'age_limit', 'duration', 'thumbnail', 'heatmap',
-        'chapters', 'chapter', 'chapter_number', 'chapter_id', 'start_time', 'end_time', 'section_start', 'section_end',
-        'categories', 'tags', 'cast', 'composers', 'artists', 'album_artists', 'creators', 'genres',
-        'track', 'track_number', 'track_id', 'album', 'album_type', 'disc_number',
-        'series', 'series_id', 'season', 'season_number', 'season_id', 'episode', 'episode_number', 'episode_id',
-        'timestamp', 'upload_date', 'release_timestamp', 'release_date', 'release_year', 'modified_timestamp', 'modified_date',
-        'playable_in_embed', 'availability', 'live_status', 'location', 'license', '_old_archive_ids',
-    )
-
     expect_dict(self, got_dict, expected_dict)
     # Check for the presence of mandatory fields
     if got_dict.get('_type') not in ('playlist', 'multi_video'):
@@ -280,42 +233,39 @@ def expect_info_dict(self, got_dict, expected_dict):
         if expected_dict.get('ext'):
             mandatory_fields.extend(('url', 'ext'))
         for key in mandatory_fields:
-            self.assertTrue(got_dict.get(key), f'Missing mandatory field {key}')
+            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']:
-            self.assertTrue(got_dict.get(key), f'Missing field: {key}')
+    for key in ['webpage_url', 'extractor', 'extractor_key']:
+        self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
 
     test_info_dict = sanitize_got_info_dict(got_dict)
 
-    # Check for invalid/misspelled field names being returned by the extractor
-    invalid_keys = sorted(test_info_dict.keys() - ALLOWED_KEYS_SORT_ORDER)
-    self.assertFalse(invalid_keys, f'Invalid fields returned by the extractor: {", ".join(invalid_keys)}')
-
-    missing_keys = sorted(
-        test_info_dict.keys() - expected_dict.keys(),
-        key=lambda x: ALLOWED_KEYS_SORT_ORDER.index(x))
+    missing_keys = set(test_info_dict.keys()) - set(expected_dict.keys())
     if missing_keys:
         def _repr(v):
             if isinstance(v, str):
-                return "'{}'".format(v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n'))
+                return "'%s'" % v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n')
             elif isinstance(v, type):
                 return v.__name__
             else:
                 return repr(v)
-        info_dict_str = ''.join(
-            f'    {_repr(k)}: {_repr(v)},\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 = ''
+        if len(missing_keys) != len(expected_dict):
+            info_dict_str += ''.join(
+                f'    {_repr(k)}: {_repr(v)},\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(info_dict_str.replace('\n', '\n        '), out=sys.stderr)
+        write_string(
+            '\n\'info_dict\': {\n' + info_dict_str + '},\n', out=sys.stderr)
         self.assertFalse(
             missing_keys,
-            'Missing keys in test definition: {}'.format(', '.join(sorted(missing_keys))))
+            'Missing keys in test definition: %s' % (
+                ', '.join(sorted(missing_keys))))
 
 
 def assertRegexpMatches(self, text, regexp, msg=None):
@@ -324,9 +274,9 @@ def assertRegexpMatches(self, text, regexp, msg=None):
     else:
         m = re.match(regexp, text)
         if not m:
-            note = f'Regexp didn\'t match: {regexp!r} not found'
+            note = 'Regexp didn\'t match: %r not found' % (regexp)
             if len(text) < 1000:
-                note += f' in {text!r}'
+                note += ' in %r' % text
             if msg is None:
                 msg = note
             else:
@@ -349,7 +299,7 @@ def assertLessEqual(self, got, expected, msg=None):
 
 
 def assertEqual(self, got, expected, msg=None):
-    if got != expected:
+    if not (got == expected):
         if msg is None:
             msg = f'{got!r} not equal to {expected!r}'
         self.assertTrue(got == expected, msg)
@@ -372,13 +322,3 @@ def http_server_port(httpd):
     else:
         sock = httpd.socket
     return sock.getsockname()[1]
-
-
-def verify_address_availability(address):
-    if find_available_port(address) is None:
-        pytest.skip(f'Unable to bind to source address {address} (address may not exist)')
-
-
-def validate_and_send(rh, req):
-    rh.validate(req)
-    return rh.send(req)

test/parameters.json

@@ -36,6 +36,7 @@
     "verbose": true,
     "writedescription": false,
     "writeinfojson": true,
+    "writeannotations": false,
     "writelink": false,
     "writeurllink": false,
     "writewebloclink": false,
@@ -43,6 +44,5 @@
     "writesubtitles": false,
     "allsubtitles": false,
     "listsubtitles": false,
-    "fixup": "never",
-    "allow_playlist_files": false
+    "fixup": "never"
 }

test/test_InfoExtractor.py

@@ -36,26 +36,12 @@ def do_GET(self):
             self.send_header('Content-Type', 'text/html; charset=utf-8')
             self.end_headers()
             self.wfile.write(TEAPOT_RESPONSE_BODY.encode())
-        elif self.path == '/fake.m3u8':
-            self.send_response(200)
-            self.send_header('Content-Length', '1024')
-            self.end_headers()
-            self.wfile.write(1024 * b'\x00')
-        elif self.path == '/bipbop.m3u8':
-            with open('test/testdata/m3u8/bipbop_16x9.m3u8', 'rb') as f:
-                data = f.read()
-            self.send_response(200)
-            self.send_header('Content-Length', str(len(data)))
-            self.end_headers()
-            self.wfile.write(data)
         else:
             assert False
 
 
 class DummyIE(InfoExtractor):
-    def _sort_formats(self, formats, field_preference=[]):
-        self._downloader.sort_formats(
-            {'formats': formats, '_format_sort_fields': field_preference})
+    pass
 
 
 class TestInfoExtractor(unittest.TestCase):
@@ -65,18 +51,6 @@ def setUp(self):
     def test_ie_key(self):
         self.assertEqual(get_info_extractor(YoutubeIE.ie_key()), YoutubeIE)
 
-    def test_get_netrc_login_info(self):
-        for params in [
-            {'usenetrc': True, 'netrc_location': './test/testdata/netrc/netrc'},
-            {'netrc_cmd': f'{sys.executable} ./test/testdata/netrc/print_netrc.py'},
-        ]:
-            ie = DummyIE(FakeYDL(params))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='normal_use'), ('user', 'pass'))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='empty_user'), ('', 'pass'))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='empty_pass'), ('user', ''))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='both_empty'), ('', ''))
-            self.assertEqual(ie._get_netrc_login_info(netrc_machine='nonexistent'), (None, None))
-
     def test_html_search_regex(self):
         html = '<p id="foo">Watch this <a href="http://www.youtube.com/watch?v=BaW_jenozKc">video</a></p>'
         search = lambda re, *args: self.ie._html_search_regex(re, html, *args)
@@ -93,7 +67,6 @@ def test_opengraph(self):
             <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 ')
@@ -106,7 +79,6 @@ def test_opengraph(self):
         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
@@ -286,19 +258,19 @@ def test_search_json_ld_realworld(self):
                 ''',
                 {
                     'chapters': [
-                        {'title': 'Explosie Turnhout', 'start_time': 70, 'end_time': 440},
-                        {'title': 'Jaarwisseling', 'start_time': 440, 'end_time': 1179},
-                        {'title': 'Natuurbranden Colorado', 'start_time': 1179, 'end_time': 1263},
-                        {'title': 'Klimaatverandering', 'start_time': 1263, 'end_time': 1367},
-                        {'title': 'Zacht weer', 'start_time': 1367, 'end_time': 1383},
-                        {'title': 'Financiële balans', 'start_time': 1383, 'end_time': 1484},
-                        {'title': 'Club Brugge', 'start_time': 1484, 'end_time': 1575},
-                        {'title': 'Mentale gezondheid bij topsporters', 'start_time': 1575, 'end_time': 1728},
-                        {'title': 'Olympische Winterspelen', 'start_time': 1728, 'end_time': 1873},
-                        {'title': 'Sober oudjaar in Nederland', 'start_time': 1873, 'end_time': 2079.23},
+                        {"title": "Explosie Turnhout", "start_time": 70, "end_time": 440},
+                        {"title": "Jaarwisseling", "start_time": 440, "end_time": 1179},
+                        {"title": "Natuurbranden Colorado", "start_time": 1179, "end_time": 1263},
+                        {"title": "Klimaatverandering", "start_time": 1263, "end_time": 1367},
+                        {"title": "Zacht weer", "start_time": 1367, "end_time": 1383},
+                        {"title": "Financiële balans", "start_time": 1383, "end_time": 1484},
+                        {"title": "Club Brugge", "start_time": 1484, "end_time": 1575},
+                        {"title": "Mentale gezondheid bij topsporters", "start_time": 1575, "end_time": 1728},
+                        {"title": "Olympische Winterspelen", "start_time": 1728, "end_time": 1873},
+                        {"title": "Sober oudjaar in Nederland", "start_time": 1873, "end_time": 2079.23}
                     ],
-                    'title': 'Het journaal - Aflevering 365 (Seizoen 2021)',
-                }, {},
+                    'title': 'Het journaal - Aflevering 365 (Seizoen 2021)'
+                }, {}
             ),
             (
                 # test multiple thumbnails in a list
@@ -325,27 +297,13 @@ def test_search_json_ld_realworld(self):
                     'thumbnails': [{'url': 'https://www.rainews.it/cropgd/640x360/dl/img/2021/12/30/1640886376927_GettyImages.jpg'}],
                 },
                 {},
-            ),
-            (
-                # test thumbnail_url key without URL scheme
-                r'''
-<script type="application/ld+json">
-{
-"@context": "https://schema.org",
-"@type": "VideoObject",
-"thumbnail_url": "//www.nobelprize.org/images/12693-landscape-medium-gallery.jpg"
-}</script>''',
-                {
-                    'thumbnails': [{'url': 'https://www.nobelprize.org/images/12693-landscape-medium-gallery.jpg'}],
-                },
-                {},
-            ),
+            )
         ]
         for html, expected_dict, search_json_ld_kwargs in _TESTS:
             expect_dict(
                 self,
                 self.ie._search_json_ld(html, None, **search_json_ld_kwargs),
-                expected_dict,
+                expected_dict
             )
 
     def test_download_json(self):
@@ -404,7 +362,7 @@ def test_parse_html5_media_entries(self):
                     'height': 740,
                     'tbr': 1500,
                 }],
-                'thumbnail': '//pics.r18.com/digital/amateur/mgmr105/mgmr105jp.jpg',
+                'thumbnail': '//pics.r18.com/digital/amateur/mgmr105/mgmr105jp.jpg'
             })
 
         # from https://www.csfd.cz/
@@ -457,9 +415,9 @@ def test_parse_html5_media_entries(self):
                     'height': 1080,
                 }],
                 'subtitles': {
-                    'cs': [{'url': 'https://video.csfd.cz/files/subtitles/163/344/163344115_4c388b.srt'}],
+                    'cs': [{'url': 'https://video.csfd.cz/files/subtitles/163/344/163344115_4c388b.srt'}]
                 },
-                'thumbnail': 'https://img.csfd.cz/files/images/film/video/preview/163/344/163344118_748d20.png?h360',
+                'thumbnail': 'https://img.csfd.cz/files/images/film/video/preview/163/344/163344118_748d20.png?h360'
             })
 
         # from https://tamasha.com/v/Kkdjw
@@ -490,7 +448,7 @@ def test_parse_html5_media_entries(self):
                     'ext': 'mp4',
                     'format_id': '144p',
                     'height': 144,
-                }],
+                }]
             })
 
         # from https://www.directvnow.com
@@ -508,7 +466,7 @@ def test_parse_html5_media_entries(self):
                 'formats': [{
                     'ext': 'mp4',
                     'url': 'https://cdn.directv.com/content/dam/dtv/prod/website_directvnow-international/videos/DTVN_hdr_HBO_v3.mp4',
-                }],
+                }]
             })
 
         # from https://www.directvnow.com
@@ -526,7 +484,7 @@ def test_parse_html5_media_entries(self):
                 'formats': [{
                     'url': 'https://cdn.directv.com/content/dam/dtv/prod/website_directvnow-international/videos/DTVN_hdr_HBO_v3.mp4',
                     'ext': 'mp4',
-                }],
+                }]
             })
 
         # from https://www.klarna.com/uk/
@@ -585,8 +543,8 @@ def test_extract_jwplayer_data_realworld(self):
                 'id': 'XEgvuql4',
                 'formats': [{
                     'url': 'rtmp://192.138.214.154/live/sjclive',
-                    'ext': 'flv',
-                }],
+                    'ext': 'flv'
+                }]
             })
 
         # from https://www.pornoxo.com/videos/7564/striptease-from-sexy-secretary/
@@ -626,8 +584,8 @@ def test_extract_jwplayer_data_realworld(self):
                 'thumbnail': 'https://t03.vipstreamservice.com/thumbs/pxo-full/2009-12/14/a4b2157147afe5efa93ce1978e0265289c193874e02597.flv-full-13.jpg',
                 'formats': [{
                     'url': 'https://cdn.pornoxo.com/key=MF+oEbaxqTKb50P-w9G3nA,end=1489689259,ip=104.199.146.27/ip=104.199.146.27/speed=6573765/buffer=3.0/2009-12/4b2157147afe5efa93ce1978e0265289c193874e02597.flv',
-                    'ext': 'flv',
-                }],
+                    'ext': 'flv'
+                }]
             })
 
         # from http://www.indiedb.com/games/king-machine/videos
@@ -648,12 +606,12 @@ def test_extract_jwplayer_data_realworld(self):
                 'formats': [{
                     'url': 'http://cdn.dbolical.com/cache/videos/games/1/50/49678/encode_mp4/king-machine-trailer.mp4',
                     'height': 360,
-                    'ext': 'mp4',
+                    'ext': 'mp4'
                 }, {
                     'url': 'http://cdn.dbolical.com/cache/videos/games/1/50/49678/encode720p_mp4/king-machine-trailer.mp4',
                     'height': 720,
-                    'ext': 'mp4',
-                }],
+                    'ext': 'mp4'
+                }]
             })
 
     def test_parse_m3u8_formats(self):
@@ -664,7 +622,6 @@ def test_parse_m3u8_formats(self):
                 'img_bipbop_adv_example_fmp4',
                 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                 [{
-                    # 60kbps (bitrate not provided in m3u8); sorted as worst because it's grouped with lowest bitrate video track
                     'format_id': 'aud1-English',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a1/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
@@ -672,19 +629,7 @@ def test_parse_m3u8_formats(self):
                     'ext': 'mp4',
                     'protocol': 'm3u8_native',
                     'audio_ext': 'mp4',
-                    'source_preference': 0,
                 }, {
-                    # 192kbps (bitrate not provided in m3u8)
-                    'format_id': 'aud3-English',
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a3/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
-                    'language': 'en',
-                    'ext': 'mp4',
-                    'protocol': 'm3u8_native',
-                    'audio_ext': 'mp4',
-                    'source_preference': 1,
-                }, {
-                    # 384kbps (bitrate not provided in m3u8); sorted as best because it's grouped with the highest bitrate video track
                     'format_id': 'aud2-English',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
@@ -692,7 +637,14 @@ def test_parse_m3u8_formats(self):
                     'ext': 'mp4',
                     'protocol': 'm3u8_native',
                     'audio_ext': 'mp4',
-                    'source_preference': 2,
+                }, {
+                    'format_id': 'aud3-English',
+                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a3/prog_index.m3u8',
+                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
+                    'language': 'en',
+                    'ext': 'mp4',
+                    'protocol': 'm3u8_native',
+                    'audio_ext': 'mp4',
                 }, {
                     'format_id': '530',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',
@@ -910,7 +862,7 @@ def test_parse_m3u8_formats(self):
                     'height': 1080,
                     'vcodec': 'avc1.64002a',
                 }],
-                {},
+                {}
             ),
             (
                 'bipbop_16x9',
@@ -961,6 +913,8 @@ def test_parse_m3u8_formats(self):
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 263.851,
+                    'abr': 0,
                 }, {
                     'format_id': '577',
                     'format_index': None,
@@ -978,6 +932,8 @@ def test_parse_m3u8_formats(self):
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 577.61,
+                    'abr': 0,
                 }, {
                     'format_id': '915',
                     'format_index': None,
@@ -995,6 +951,8 @@ def test_parse_m3u8_formats(self):
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 915.905,
+                    'abr': 0,
                 }, {
                     'format_id': '1030',
                     'format_index': None,
@@ -1012,6 +970,8 @@ def test_parse_m3u8_formats(self):
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 1030.138,
+                    'abr': 0,
                 }, {
                     'format_id': '1924',
                     'format_index': None,
@@ -1029,50 +989,52 @@ def test_parse_m3u8_formats(self):
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 1924.009,
+                    'abr': 0,
                 }],
                 {
                     'en': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/eng_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
                     'fr': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/fra_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
                     'es': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/spa_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
                     'ja': [{
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }, {
                         'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/subtitles/jpn_forced/prog_index.m3u8',
                         'ext': 'vtt',
-                        'protocol': 'm3u8_native',
+                        'protocol': 'm3u8_native'
                     }],
-                },
+                }
             ),
         ]
 
         for m3u8_file, m3u8_url, expected_formats, expected_subs in _TEST_CASES:
-            with open(f'./test/testdata/m3u8/{m3u8_file}.m3u8', encoding='utf-8') as f:
+            with open('./test/testdata/m3u8/%s.m3u8' % m3u8_file, encoding='utf-8') as f:
                 formats, subs = self.ie._parse_m3u8_formats_and_subtitles(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
@@ -1410,14 +1372,14 @@ def test_parse_mpd_formats(self):
                             'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
                             'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
                             'protocol': 'http_dash_segments',
-                        },
-                    ],
+                        }
+                    ]
                 },
-            ),
+            )
         ]
 
         for mpd_file, mpd_url, mpd_base_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with open(f'./test/testdata/mpd/{mpd_file}.mpd', encoding='utf-8') as f:
+            with open('./test/testdata/mpd/%s.mpd' % mpd_file, encoding='utf-8') as f:
                 formats, subtitles = self.ie._parse_mpd_formats_and_subtitles(
                     compat_etree_fromstring(f.read().encode()),
                     mpd_base_url=mpd_base_url, mpd_url=mpd_url)
@@ -1440,7 +1402,6 @@ def test_parse_ism_formats(self):
                     'vcodec': 'none',
                     'acodec': 'AACL',
                     'protocol': 'ism',
-                    'audio_channels': 2,
                     '_download_params': {
                         'stream_type': 'audio',
                         'duration': 8880746666,
@@ -1452,8 +1413,11 @@ def test_parse_ism_formats(self):
                         'sampling_rate': 48000,
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
+                    'audio_ext': 'isma',
+                    'video_ext': 'none',
+                    'abr': 128,
                 }, {
                     'format_id': 'video-100',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1475,8 +1439,11 @@ def test_parse_ism_formats(self):
                         'codec_private_data': '00000001674D401FDA0544EFFC2D002CBC40000003004000000C03C60CA80000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 100,
                 }, {
                     'format_id': 'video-326',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1498,8 +1465,11 @@ def test_parse_ism_formats(self):
                         'codec_private_data': '00000001674D401FDA0241FE23FFC3BC83BA44000003000400000300C03C60CA800000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 326,
                 }, {
                     'format_id': 'video-698',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1521,8 +1491,11 @@ def test_parse_ism_formats(self):
                         'codec_private_data': '00000001674D401FDA0350BFB97FF06AF06AD1000003000100000300300F1832A00000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 698,
                 }, {
                     'format_id': 'video-1493',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1544,8 +1517,11 @@ def test_parse_ism_formats(self):
                         'codec_private_data': '00000001674D401FDA011C3DE6FFF0D890D871000003000100000300300F1832A00000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 1493,
                 }, {
                     'format_id': 'video-4482',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1567,8 +1543,11 @@ def test_parse_ism_formats(self):
                         'codec_private_data': '00000001674D401FDA01A816F97FFC1ABC1AB440000003004000000C03C60CA80000000168EF32C8',
                         'channels': 2,
                         'bits_per_sample': 16,
-                        'nal_unit_length_field': 4,
+                        'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 4482,
                 }],
                 {
                     'eng': [
@@ -1582,275 +1561,16 @@ def test_parse_ism_formats(self):
                                 'duration': 8880746666,
                                 'timescale': 10000000,
                                 'fourcc': 'TTML',
-                                'codec_private_data': '',
-                            },
-                        },
-                    ],
+                                'codec_private_data': ''
+                            }
+                        }
+                    ]
                 },
             ),
-            (
-                '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-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',
-                    'language': 'deu',
-                    'audio_channels': 2,
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    'audio_channels': 6,
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'vbr': 1253,
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }, {
-                    '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',
-                    'language': 'deu',
-                    '_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,
-                    },
-                }],
-                {},
-            ),
         ]
 
         for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with open(f'./test/testdata/ism/{ism_file}.Manifest', encoding='utf-8') as f:
+            with open('./test/testdata/ism/%s.Manifest' % ism_file, encoding='utf-8') as f:
                 formats, subtitles = self.ie._parse_ism_formats_and_subtitles(
                     compat_etree_fromstring(f.read().encode()), ism_url=ism_url)
                 self.ie._sort_formats(formats)
@@ -1871,12 +1591,12 @@ def test_parse_f4m_formats(self):
                     'tbr': 2148,
                     'width': 1280,
                     'height': 720,
-                }],
+                }]
             ),
         ]
 
         for f4m_file, f4m_url, expected_formats in _TEST_CASES:
-            with open(f'./test/testdata/f4m/{f4m_file}.f4m', encoding='utf-8') as f:
+            with open('./test/testdata/f4m/%s.f4m' % f4m_file, encoding='utf-8') as f:
                 formats = self.ie._parse_f4m_formats(
                     compat_etree_fromstring(f.read().encode()),
                     f4m_url, None)
@@ -1917,13 +1637,13 @@ def test_parse_xspf(self):
                     }, {
                         'manifest_url': 'https://example.org/src/foo_xspf.xspf',
                         'url': 'https://example.com/track3.mp3',
-                    }],
-                }],
+                    }]
+                }]
             ),
         ]
 
         for xspf_file, xspf_url, expected_entries in _TEST_CASES:
-            with open(f'./test/testdata/xspf/{xspf_file}.xspf', encoding='utf-8') as f:
+            with open('./test/testdata/xspf/%s.xspf' % xspf_file, encoding='utf-8') as f:
                 entries = self.ie._parse_xspf(
                     compat_etree_fromstring(f.read().encode()),
                     xspf_file, xspf_url=xspf_url, xspf_base_url=xspf_url)
@@ -1945,222 +1665,11 @@ def test_response_with_expected_status_returns_content(self):
         server_thread.daemon = True
         server_thread.start()
 
-        content, _ = self.ie._download_webpage_handle(
-            f'http://127.0.0.1:{port}/teapot', None,
+        (content, urlh) = self.ie._download_webpage_handle(
+            'http://127.0.0.1:%d/teapot' % port, None,
             expected_status=TEAPOT_RESPONSE_STATUS)
         self.assertEqual(content, TEAPOT_RESPONSE_BODY)
 
-    def test_search_nextjs_data(self):
-        data = '<script id="__NEXT_DATA__" type="application/json">{"props":{}}</script>'
-        self.assertEqual(self.ie._search_nextjs_data(data, None), {'props': {}})
-        self.assertEqual(self.ie._search_nextjs_data('', None, fatal=False), {})
-        self.assertEqual(self.ie._search_nextjs_data('', None, default=None), None)
-        self.assertEqual(self.ie._search_nextjs_data('', None, default={}), {})
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(self.ie._search_nextjs_data('', None, default='{}'), {})
-
-    def test_search_nextjs_v13_data(self):
-        HTML = R'''
-            <script>(self.__next_f=self.__next_f||[]).push([0])</script>
-            <script>self.__next_f.push([2,"0:[\"$\",\"$L0\",null,{\"do_not_add_this\":\"fail\"}]\n"])</script>
-            <script>self.__next_f.push([1,"1:I[46975,[],\"HTTPAccessFallbackBoundary\"]\n2:I[32630,[\"8183\",\"static/chunks/8183-768193f6a9e33cdd.js\"]]\n"])</script>
-            <script nonce="abc123">self.__next_f.push([1,"e:[false,[\"$\",\"div\",null,{\"children\":[\"$\",\"$L18\",null,{\"foo\":\"bar\"}]}],false]\n    "])</script>
-            <script>self.__next_f.push([1,"2a:[[\"$\",\"div\",null,{\"className\":\"flex flex-col\",\"children\":[]}],[\"$\",\"$L16\",null,{\"meta\":{\"dateCreated\":1730489700,\"uuid\":\"40cac41d-8d29-4ef5-aa11-75047b9f0907\"}}]]\n"])</script>
-            <script>self.__next_f.push([1,"df:[\"$undefined\",[\"$\",\"div\",null,{\"children\":[\"$\",\"$L17\",null,{}],\"do_not_include_this_field\":\"fail\"}],[\"$\",\"div\",null,{\"children\":[[\"$\",\"$L19\",null,{\"duplicated_field_name\":{\"x\":1}}],[\"$\",\"$L20\",null,{\"duplicated_field_name\":{\"y\":2}}]]}],\"$undefined\"]\n"])</script>
-            <script>self.__next_f.push([3,"MzM6WyIkIiwiJEwzMiIsbnVsbCx7ImRlY29kZWQiOiJzdWNjZXNzIn1d"])</script>
-            '''
-        EXPECTED = {
-            '18': {
-                'foo': 'bar',
-            },
-            '16': {
-                'meta': {
-                    'dateCreated': 1730489700,
-                    'uuid': '40cac41d-8d29-4ef5-aa11-75047b9f0907',
-                },
-            },
-            '19': {
-                'duplicated_field_name': {'x': 1},
-            },
-            '20': {
-                'duplicated_field_name': {'y': 2},
-            },
-        }
-        self.assertEqual(self.ie._search_nextjs_v13_data(HTML, None), EXPECTED)
-        self.assertEqual(self.ie._search_nextjs_v13_data('', None, fatal=False), {})
-        self.assertEqual(self.ie._search_nextjs_v13_data(None, None, fatal=False), {})
-
-    def test_search_nuxt_json(self):
-        HTML_TMPL = '<script data-ssr="true" id="__NUXT_DATA__" type="application/json">[{}]</script>'
-        VALID_DATA = '''
-            ["ShallowReactive",1],
-            {"data":2,"state":21,"once":25,"_errors":28,"_server_errors":30},
-            ["ShallowReactive",3],
-            {"$abcdef123456":4},
-            {"podcast":5,"activeEpisodeData":7},
-            {"podcast":6,"seasons":14},
-            {"title":10,"id":11},
-            ["Reactive",8],
-            {"episode":9,"creators":18,"empty_list":20},
-            {"title":12,"id":13,"refs":34,"empty_refs":35},
-            "Series Title",
-            "podcast-id-01",
-            "Episode Title",
-            "episode-id-99",
-            [15,16,17],
-            1,
-            2,
-            3,
-            [19],
-            "Podcast Creator",
-            [],
-            {"$ssite-config":22},
-            {"env":23,"name":24,"map":26,"numbers":14},
-            "production",
-            "podcast-website",
-            ["Set"],
-            ["Reactive",27],
-            ["Map"],
-            ["ShallowReactive",29],
-            {},
-            ["NuxtError",31],
-            {"status":32,"message":33},
-            503,
-            "Service Unavailable",
-            [36,37],
-            [38,39],
-            ["Ref",40],
-            ["ShallowRef",41],
-            ["EmptyRef",42],
-            ["EmptyShallowRef",43],
-            "ref",
-            "shallow_ref",
-            "{\\"ref\\":1}",
-            "{\\"shallow_ref\\":2}"
-        '''
-        PAYLOAD = {
-            'data': {
-                '$abcdef123456': {
-                    'podcast': {
-                        'podcast': {
-                            'title': 'Series Title',
-                            'id': 'podcast-id-01',
-                        },
-                        'seasons': [1, 2, 3],
-                    },
-                    'activeEpisodeData': {
-                        'episode': {
-                            'title': 'Episode Title',
-                            'id': 'episode-id-99',
-                            'refs': ['ref', 'shallow_ref'],
-                            'empty_refs': [{'ref': 1}, {'shallow_ref': 2}],
-                        },
-                        'creators': ['Podcast Creator'],
-                        'empty_list': [],
-                    },
-                },
-            },
-            'state': {
-                '$ssite-config': {
-                    'env': 'production',
-                    'name': 'podcast-website',
-                    'map': [],
-                    'numbers': [1, 2, 3],
-                },
-            },
-            'once': [],
-            '_errors': {},
-            '_server_errors': {
-                'status': 503,
-                'message': 'Service Unavailable',
-            },
-        }
-        PARTIALLY_INVALID = [(
-            '''
-            {"data":1},
-            {"invalid_raw_list":2},
-            [15,16,17]
-            ''',
-            {'data': {'invalid_raw_list': [None, None, None]}},
-        ), (
-            '''
-            {"data":1},
-            ["EmptyRef",2],
-            "not valid JSON"
-            ''',
-            {'data': None},
-        ), (
-            '''
-            {"data":1},
-            ["EmptyShallowRef",2],
-            "not valid JSON"
-            ''',
-            {'data': None},
-        )]
-        INVALID = [
-            '''
-                []
-            ''',
-            '''
-                ["unsupported",1],
-                {"data":2},
-                {}
-            ''',
-        ]
-        DEFAULT = object()
-
-        self.assertEqual(self.ie._search_nuxt_json(HTML_TMPL.format(VALID_DATA), None), PAYLOAD)
-        self.assertEqual(self.ie._search_nuxt_json('', None, fatal=False), {})
-        self.assertIs(self.ie._search_nuxt_json('', None, default=DEFAULT), DEFAULT)
-
-        for data, expected in PARTIALLY_INVALID:
-            self.assertEqual(
-                self.ie._search_nuxt_json(HTML_TMPL.format(data), None, fatal=False), expected)
-
-        for data in INVALID:
-            self.assertIs(
-                self.ie._search_nuxt_json(HTML_TMPL.format(data), None, default=DEFAULT), DEFAULT)
-
-
-class TestInfoExtractorNetwork(unittest.TestCase):
-    def setUp(self, /):
-        self.httpd = http.server.HTTPServer(
-            ('127.0.0.1', 0), InfoExtractorTestRequestHandler)
-        self.port = http_server_port(self.httpd)
-
-        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
-        self.server_thread.daemon = True
-        self.server_thread.start()
-
-        self.called = False
-
-        def require_warning(*args, **kwargs):
-            self.called = True
-
-        self.ydl = FakeYDL()
-        self.ydl.report_warning = require_warning
-        self.ie = DummyIE(self.ydl)
-
-    def tearDown(self, /):
-        self.ydl.close()
-        self.httpd.shutdown()
-        self.httpd.server_close()
-        self.server_thread.join(1)
-
-    def test_extract_m3u8_formats(self):
-        formats, subtitles = self.ie._extract_m3u8_formats_and_subtitles(
-            f'http://127.0.0.1:{self.port}/bipbop.m3u8', None, fatal=False)
-        self.assertFalse(self.called)
-        self.assertTrue(formats)
-        self.assertTrue(subtitles)
-
-    def test_extract_m3u8_formats_warning(self):
-        formats, subtitles = self.ie._extract_m3u8_formats_and_subtitles(
-            f'http://127.0.0.1:{self.port}/fake.m3u8', None, fatal=False)
-        self.assertTrue(self.called, 'Warning was not issued for binary m3u8 file')
-        self.assertFalse(formats)
-        self.assertFalse(subtitles)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDL.py

@@ -4,19 +4,18 @@
 import os
 import sys
 import unittest
-from unittest.mock import patch
-
-from yt_dlp.globals import all_plugins_loaded
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-import contextlib
 import copy
 import json
+import urllib.error
 
-from test.helper import FakeYDL, assertRegexpMatches, try_rm
+from test.helper import FakeYDL, assertRegexpMatches
 from yt_dlp import YoutubeDL
+from yt_dlp.compat import compat_os_name
+from yt_dlp.extractor import YoutubeIE
 from yt_dlp.extractor.common import InfoExtractor
 from yt_dlp.postprocessor.common import PostProcessor
 from yt_dlp.utils import (
@@ -26,7 +25,6 @@
     int_or_none,
     match_filter_func,
 )
-from yt_dlp.utils.traversal import traverse_obj
 
 TEST_URL = 'http://localhost/sample.mp4'
 
@@ -70,7 +68,8 @@ def test_prefer_free_formats(self):
             {'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')
@@ -83,7 +82,8 @@ def test_prefer_free_formats(self):
             {'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')
@@ -97,7 +97,8 @@ def test_prefer_free_formats(self):
             {'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')
@@ -109,14 +110,15 @@ def test_prefer_free_formats(self):
             {'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},
@@ -131,8 +133,8 @@ def test(inp, *expected, multi=False):
                 'allow_multiple_audio_streams': multi,
             })
             ydl.process_ie_result(info_dict.copy())
-            downloaded = [x['format_id'] for x in ydl.downloaded_info_dicts]
-            self.assertEqual(downloaded, list(expected))
+            downloaded = map(lambda x: x['format_id'], ydl.downloaded_info_dicts)
+            self.assertEqual(list(downloaded), list(expected))
 
         test('20/47', '47')
         test('20/71/worst', '35')
@@ -142,8 +144,6 @@ def test(inp, *expected, multi=False):
         test('example-with-dashes', 'example-with-dashes')
         test('all', '2', '47', '45', 'example-with-dashes', '35')
         test('mergeall', '2+47+45+example-with-dashes+35', multi=True)
-        # See: https://github.com/yt-dlp/yt-dlp/pulls/8797
-        test('7_a/worst', '35')
 
     def test_format_selection_audio(self):
         formats = [
@@ -185,20 +185,23 @@ def test_format_selection_audio_exts(self):
         ]
 
         info_dict = _make_result(formats)
-        ydl = YDL({'format': 'best', 'format_sort': ['abr', 'ext']})
-        ydl.sort_formats(info_dict)
+        ydl = YDL({'format': 'best'})
+        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, 'format_sort': ['abr', 'ext']})
-        ydl.sort_formats(info_dict)
+        ydl = YDL({'prefer_free_formats': True})
+        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')
@@ -236,35 +239,6 @@ def test_format_selection_video(self):
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'vid-vcodec-dot')
 
-    def test_format_selection_by_vcodec_sort(self):
-        formats = [
-            {'format_id': 'av1-format', 'ext': 'mp4', 'vcodec': 'av1', 'acodec': 'none', 'url': TEST_URL},
-            {'format_id': 'vp9-hdr-format', 'ext': 'mp4', 'vcodec': 'vp09.02.50.10.01.09.18.09.00', 'acodec': 'none', 'url': TEST_URL},
-            {'format_id': 'vp9-sdr-format', 'ext': 'mp4', 'vcodec': 'vp09.00.50.08', 'acodec': 'none', 'url': TEST_URL},
-            {'format_id': 'h265-format', 'ext': 'mp4', 'vcodec': 'h265', 'acodec': 'none', 'url': TEST_URL},
-        ]
-        info_dict = _make_result(formats)
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['vcodec:vp9.2']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-hdr-format')
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['vcodec:vp9']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-sdr-format')
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['+vcodec:vp9.2']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-hdr-format')
-
-        ydl = YDL({'format': 'bestvideo', 'format_sort': ['+vcodec:vp9']})
-        ydl.process_ie_result(info_dict.copy())
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'vp9-sdr-format')
-
     def test_format_selection_string_ops(self):
         formats = [
             {'format_id': 'abc-cba', 'ext': 'mp4', 'url': TEST_URL},
@@ -335,6 +309,107 @@ def test_format_selection_string_ops(self):
         ydl = YDL({'format': '[format_id!*=-]'})
         self.assertRaises(ExtractorError, ydl.process_ie_result, info_dict.copy())
 
+    def test_youtube_format_selection(self):
+        # FIXME: Rewrite in accordance with the new format sorting options
+        return
+
+        order = [
+            '38', '37', '46', '22', '45', '35', '44', '18', '34', '43', '6', '5', '17', '36', '13',
+            # Apple HTTP Live Streaming
+            '96', '95', '94', '93', '92', '132', '151',
+            # 3D
+            '85', '84', '102', '83', '101', '82', '100',
+            # Dash video
+            '137', '248', '136', '247', '135', '246',
+            '245', '244', '134', '243', '133', '242', '160',
+            # Dash audio
+            '141', '172', '140', '171', '139',
+        ]
+
+        def format_info(f_id):
+            info = YoutubeIE._formats[f_id].copy()
+
+            # XXX: In real cases InfoExtractor._parse_mpd_formats() fills up 'acodec'
+            # and 'vcodec', while in tests such information is incomplete since
+            # commit a6c2c24479e5f4827ceb06f64d855329c0a6f593
+            # test_YoutubeDL.test_youtube_format_selection is broken without
+            # this fix
+            if 'acodec' in info and 'vcodec' not in info:
+                info['vcodec'] = 'none'
+            elif 'vcodec' in info and 'acodec' not in info:
+                info['acodec'] = 'none'
+
+            info['format_id'] = f_id
+            info['url'] = 'url:' + f_id
+            return info
+        formats_order = [format_info(f_id) for f_id in order]
+
+        info_dict = _make_result(list(formats_order), extractor='youtube')
+        ydl = YDL({'format': 'bestvideo+bestaudio'})
+        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')
+        self.assertEqual(downloaded['ext'], 'mp4')
+
+        info_dict = _make_result(list(formats_order), extractor='youtube')
+        ydl = YDL({'format': 'bestvideo[height>=999999]+bestaudio/best'})
+        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'})
+        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'})
+        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'})
+        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'})
+        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'])
+
+        for f1, f2 in zip(formats_order, formats_order[1:]):
+            info_dict = _make_result([f1, f2], extractor='youtube')
+            ydl = YDL({'format': 'best/bestvideo'})
+            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'})
+            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'])
+
     def test_audio_only_extractor_format_selection(self):
         # For extractors with incomplete formats (all formats are audio-only or
         # video-only) best and worst should fallback to corresponding best/worst
@@ -394,18 +469,18 @@ def assert_syntax_error(format_spec):
 
     def test_format_filtering(self):
         formats = [
-            {'format_id': 'A', 'filesize': 500, 'width': 1000, 'aspect_ratio': 1.0},
-            {'format_id': 'B', 'filesize': 1000, 'width': 500, 'aspect_ratio': 1.33},
-            {'format_id': 'C', 'filesize': 1000, 'width': 400, 'aspect_ratio': 1.5},
-            {'format_id': 'D', 'filesize': 2000, 'width': 600, 'aspect_ratio': 1.78},
-            {'format_id': 'E', 'filesize': 3000, 'aspect_ratio': 0.56},
+            {'format_id': 'A', 'filesize': 500, 'width': 1000},
+            {'format_id': 'B', 'filesize': 1000, 'width': 500},
+            {'format_id': 'C', 'filesize': 1000, 'width': 400},
+            {'format_id': 'D', 'filesize': 2000, 'width': 600},
+            {'format_id': 'E', 'filesize': 3000},
             {'format_id': 'F'},
             {'format_id': 'G', 'filesize': 1000000},
         ]
         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)
@@ -453,76 +528,27 @@ def test_format_filtering(self):
         self.assertEqual(downloaded_ids, ['D', 'C', 'B'])
 
         ydl = YDL({'format': 'best[height<40]'})
-        with contextlib.suppress(ExtractorError):
+        try:
             ydl.process_ie_result(info_dict)
+        except ExtractorError:
+            pass
         self.assertEqual(ydl.downloaded_info_dicts, [])
 
-        ydl = YDL({'format': 'best[aspect_ratio=1]'})
-        ydl.process_ie_result(info_dict)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'A')
-
-        ydl = YDL({'format': 'all[aspect_ratio > 1.00]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['D', 'C', 'B'])
-
-        ydl = YDL({'format': 'all[aspect_ratio < 1.00]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['E'])
-
-        ydl = YDL({'format': 'best[aspect_ratio=1.5]'})
-        ydl.process_ie_result(info_dict)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'C')
-
-        ydl = YDL({'format': 'all[aspect_ratio!=1]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['E', 'D', 'C', 'B'])
-
-    @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.available', False)
-    def test_default_format_spec_without_ffmpeg(self):
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
-
+    def test_default_format_spec(self):
         ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
+        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
 
         ydl = YDL({})
         self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
 
         ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
+        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'bestvideo*+bestaudio/best')
 
         ydl = YDL({'outtmpl': '-'})
         self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
 
         ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
-
-    @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.available', True)
-    @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.can_merge', lambda _: True)
-    def test_default_format_spec_with_ffmpeg(self):
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
-
-        ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
-
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
-
-        ydl = YDL({'simulate': True})
-        self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
-
-        ydl = YDL({'outtmpl': '-'})
-        self.assertEqual(ydl._default_format_spec({}), 'best/bestvideo+bestaudio')
-
-        ydl = YDL({})
-        self.assertEqual(ydl._default_format_spec({}), 'bestvideo*+bestaudio/best')
+        self.assertEqual(ydl._default_format_spec({}, download=False), 'bestvideo*+bestaudio/best')
         self.assertEqual(ydl._default_format_spec({'is_live': True}), 'best/bestvideo+bestaudio')
 
 
@@ -636,17 +662,13 @@ def test_add_extra_info(self):
         'playlist_autonumber': 2,
         '__last_playlist_index': 100,
         'n_entries': 10,
-        'formats': [
-            {'id': 'id 1', 'height': 1080, 'width': 1920},
-            {'id': 'id 2', 'height': 720},
-            {'id': 'id 3'},
-        ],
+        'formats': [{'id': 'id 1'}, {'id': 'id 2'}, {'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)
 
@@ -655,10 +677,10 @@ def test(tmpl, expected, *, info=None, **params):
 
             if not isinstance(expected, (list, tuple)):
                 expected = (expected, expected)
-            for (name, got), expect in zip((('outtmpl', out), ('filename', fname)), expected, strict=True):
+            for (name, got), expect in zip((('outtmpl', out), ('filename', fname)), expected):
                 if callable(expect):
                     self.assertTrue(expect(got), f'Wrong {name} from {tmpl}')
-                elif expect is not None:
+                else:
                     self.assertEqual(got, expect, f'Wrong {name} from {tmpl}')
 
         # Side-effects
@@ -673,8 +695,7 @@ def test(tmpl, expected, *, info=None, **params):
         test('%(id)s.%(ext)s', '1234.mp4')
         test('%(duration_string)s', ('27:46:40', '27-46-40'))
         test('%(resolution)s', '1080p')
-        test('%(playlist_index|)s', '001')
-        test('%(playlist_index&{}!)s', '1!')
+        test('%(playlist_index)s', '001')
         test('%(playlist_autonumber)s', '02')
         test('%(autonumber)s', '00001')
         test('%(autonumber+2)03d', '005', autonumber_start=3)
@@ -694,13 +715,6 @@ def test(tmpl, expected, *, info=None, **params):
         test('%(width)06d.%%(ext)s', 'NA.%(ext)s')
         test('%%(width)06d.%(ext)s', '%(width)06d.mp4')
 
-        # Sanitization options
-        test('%(title3)s', (None, 'foo⧸bar⧹test'))
-        test('%(title5)s', (None, 'aei_A'), restrictfilenames=True)
-        test('%(title3)s', (None, 'foo_bar_test'), windowsfilenames=False, restrictfilenames=True)
-        if sys.platform != 'win32':
-            test('%(title3)s', (None, 'foo⧸bar\\test'), windowsfilenames=False)
-
         # ID sanitization
         test('%(id)s', '_abcd', info={'id': '_abcd'})
         test('%(some_id)s', '_abcd', info={'some_id': '_abcd'})
@@ -715,7 +729,6 @@ def test(tmpl, expected, *, info=None, **params):
         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):
@@ -724,7 +737,7 @@ def expect_same_infodict(out):
                 self.assertEqual(got_dict.get(info_field), expected, info_field)
             return True
 
-        test('%()j', (expect_same_infodict, None))
+        test('%()j', (expect_same_infodict, str))
 
         # NA placeholder
         NA_TEST_OUTTMPL = '%(uploader_date)s-%(width)d-%(x|def)s-%(id)s.%(ext)s'
@@ -752,23 +765,20 @@ def expect_same_infodict(out):
         test('%(ext)c', 'm')
         test('%(id)d %(id)r', "1234 '1234'")
         test('%(id)r %(height)r', "'1234' 1080")
-        test('%(title5)a %(height)a', (R"'\xe1\xe9\xed \U0001d400' 1080", None))
         test('%(ext)s-%(ext|def)d', 'mp4-def')
-        test('%(width|0)04d', '0')
-        test('a%(width|b)d', 'ab', outtmpl_na_placeholder='none')
+        test('%(width|0)04d', '0000')
+        test('a%(width|)d', 'a', outtmpl_na_placeholder='none')
 
         FORMATS = self.outtmpl_info['formats']
+        sanitize = lambda x: x.replace(':', '：').replace('"', "＂").replace('\n', ' ')
 
         # Custom type casting
         test('%(formats.:.id)l', 'id 1, id 2, id 3')
         test('%(formats.:.id)#l', ('id 1\nid 2\nid 3', 'id 1 id 2 id 3'))
         test('%(ext)l', 'mp4')
         test('%(formats.:.id) 18l', '  id 1, id 2, id 3')
-        test('%(formats)j', (json.dumps(FORMATS), None))
-        test('%(formats)#j', (
-            json.dumps(FORMATS, indent=4),
-            json.dumps(FORMATS, indent=4).replace(':', '：').replace('"', '＂').replace('\n', ' '),
-        ))
+        test('%(formats)j', (json.dumps(FORMATS), sanitize(json.dumps(FORMATS))))
+        test('%(formats)#j', (json.dumps(FORMATS, indent=4), sanitize(json.dumps(FORMATS, indent=4))))
         test('%(title5).3B', 'á')
         test('%(title5)U', 'áéí 𝐀')
         test('%(title5)#U', 'a\u0301e\u0301i\u0301 𝐀')
@@ -778,11 +788,11 @@ def expect_same_infodict(out):
         test('%(filesize)#D', '1Ki')
         test('%(height)5.2D', ' 1.08k')
         test('%(title4)#S', 'foo_bar_test')
-        test('%(title4).10S', ('foo ＂bar＂ ', 'foo ＂bar＂' + ('#' if os.name == 'nt' else ' ')))
-        if os.name == 'nt':
-            test('%(title4)q', ('"foo ""bar"" test"', None))
-            test('%(formats.:.id)#q', ('"id 1" "id 2" "id 3"', None))
-            test('%(formats.0.id)#q', ('"id 1"', None))
+        test('%(title4).10S', ('foo ＂bar＂ ', 'foo ＂bar＂' + ('#' if compat_os_name == 'nt' else ' ')))
+        if compat_os_name == 'nt':
+            test('%(title4)q', ('"foo \\"bar\\" test"', "＂foo ⧹＂bar⧹＂ test＂"))
+            test('%(formats.:.id)#q', ('"id 1" "id 2" "id 3"', '＂id 1＂ ＂id 2＂ ＂id 3＂'))
+            test('%(formats.0.id)#q', ('"id 1"', '＂id 1＂'))
         else:
             test('%(title4)q', ('\'foo "bar" test\'', '\'foo ＂bar＂ test\''))
             test('%(formats.:.id)#q', "'id 1' 'id 2' 'id 3'")
@@ -793,9 +803,8 @@ def expect_same_infodict(out):
         test('%(title|%)s %(title|%%)s', '% %%')
         test('%(id+1-height+3)05d', '00158')
         test('%(width+100)05d', 'NA')
-        test('%(filesize*8)d', '8192')
-        test('%(formats.0) 15s', ('% 15s' % FORMATS[0], None))
-        test('%(formats.0)r', (repr(FORMATS[0]), None))
+        test('%(formats.0) 15s', ('% 15s' % FORMATS[0], '% 15s' % sanitize(str(FORMATS[0]))))
+        test('%(formats.0)r', (repr(FORMATS[0]), sanitize(repr(FORMATS[0]))))
         test('%(height.0)03d', '001')
         test('%(-height.0)04d', '-001')
         test('%(formats.-1.id)s', FORMATS[-1]['id'])
@@ -804,12 +813,6 @@ def expect_same_infodict(out):
         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, None))
-        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')
@@ -823,11 +826,6 @@ def expect_same_infodict(out):
         test('%(title&foo|baz)s.bar', 'baz.bar')
         test('%(x,id&foo|baz)s.bar', 'foo.bar')
         test('%(x,title&foo|baz)s.bar', 'baz.bar')
-        test('%(id&a\nb|)s', ('a\nb', 'a b'))
-        test('%(id&hi {:>10} {}|)s', 'hi       1234 1234')
-        test(R'%(id&{0} {}|)s', 'NA')
-        test(R'%(id&{0.1}|)s', 'NA')
-        test('%(height&{:,d})S', '1,080')
 
         # Laziness
         def gen():
@@ -837,14 +835,14 @@ def gen():
 
         # Empty filename
         test('%(foo|)s-%(bar|)s.%(ext)s', '-.mp4')
-        # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # FIXME: ?
-        # test('%(foo|)s', ('', '_'))  # FIXME: ?
+        # test('%(foo|)s.%(ext)s', ('.mp4', '_.mp4'))  # fixme
+        # test('%(foo|)s', ('', '_'))  # fixme
 
         # Environment variable expansion for prepare_filename
         os.environ['__yt_dlp_var'] = 'expanded'
-        envvar = '%__yt_dlp_var%' if os.name == 'nt' else '$__yt_dlp_var'
+        envvar = '%__yt_dlp_var%' if compat_os_name == 'nt' else '$__yt_dlp_var'
         test(envvar, (envvar, 'expanded'))
-        if os.name == 'nt':
+        if compat_os_name == 'nt':
             test('%s%', ('%s%', '%s%'))
             os.environ['s'] = 'expanded'
             test('%s%', ('%s%', 'expanded'))  # %s% should be expanded before escaping %s
@@ -855,7 +853,7 @@ def gen():
         test('Hello %(title1)s', 'Hello $PATH')
         test('Hello %(title2)s', 'Hello %PATH%')
         test('%(title3)s', ('foo/bar\\test', 'foo⧸bar⧹test'))
-        test('folder/%(title3)s', ('folder/foo/bar\\test', f'folder{os.path.sep}foo⧸bar⧹test'))
+        test('folder/%(title3)s', ('folder/foo/bar\\test', 'folder%sfoo⧸bar⧹test' % os.path.sep))
 
     def test_format_note(self):
         ydl = YoutubeDL()
@@ -873,36 +871,36 @@ def test_postprocessors(self):
 
         class SimplePP(PostProcessor):
             def run(self, info):
-                with open(audiofile, 'w') as f:
+                with open(audiofile, 'wt') as f:
                     f.write('EXAMPLE')
                 return [info['filepath']], info
 
-        def run_pp(params, pp):
-            with open(filename, 'w') as f:
+        def run_pp(params, PP):
+            with open(filename, 'wt') as f:
                 f.write('EXAMPLE')
             ydl = YoutubeDL(params)
-            ydl.add_post_processor(pp())
+            ydl.add_post_processor(PP())
             ydl.post_process(filename, {'filepath': filename})
 
         run_pp({'keepvideo': True}, SimplePP)
-        self.assertTrue(os.path.exists(filename), f'{filename} doesn\'t exist')
-        self.assertTrue(os.path.exists(audiofile), f'{audiofile} doesn\'t exist')
+        self.assertTrue(os.path.exists(filename), '%s doesn\'t exist' % filename)
+        self.assertTrue(os.path.exists(audiofile), '%s doesn\'t exist' % audiofile)
         os.unlink(filename)
         os.unlink(audiofile)
 
         run_pp({'keepvideo': False}, SimplePP)
-        self.assertFalse(os.path.exists(filename), f'{filename} exists')
-        self.assertTrue(os.path.exists(audiofile), f'{audiofile} doesn\'t exist')
+        self.assertFalse(os.path.exists(filename), '%s exists' % filename)
+        self.assertTrue(os.path.exists(audiofile), '%s doesn\'t exist' % audiofile)
         os.unlink(audiofile)
 
         class ModifierPP(PostProcessor):
             def run(self, info):
-                with open(info['filepath'], 'w') as f:
+                with open(info['filepath'], 'wt') as f:
                     f.write('MODIFIED')
                 return [], info
 
         run_pp({'keepvideo': False}, ModifierPP)
-        self.assertTrue(os.path.exists(filename), f'{filename} doesn\'t exist')
+        self.assertTrue(os.path.exists(filename), '%s doesn\'t exist' % filename)
         os.unlink(filename)
 
     def test_match_filter(self):
@@ -914,7 +912,7 @@ def test_match_filter(self):
             'duration': 30,
             'filesize': 10 * 1024,
             'playlist_id': '42',
-            'uploader': '變態妍字幕版 太妍 тест',
+            'uploader': "變態妍字幕版 太妍 тест",
             'creator': "тест ' 123 ' тест--",
             'webpage_url': 'http://example.com/watch?v=shenanigans',
         }
@@ -927,7 +925,7 @@ def test_match_filter(self):
             'description': 'foo',
             'filesize': 5 * 1024,
             'playlist_id': '43',
-            'uploader': 'тест 123',
+            'uploader': "тест 123",
             'webpage_url': 'http://example.com/watch?v=SHENANIGANS',
         }
         videos = [first, second]
@@ -935,7 +933,7 @@ def test_match_filter(self):
         def get_videos(filter_=None):
             ydl = YDL({'match_filter': filter_, 'simulate': True})
             for v in videos:
-                ydl.process_ie_result(v.copy(), download=True)
+                ydl.process_ie_result(v, download=True)
             return [v['id'] for v in ydl.downloaded_info_dicts]
 
         res = get_videos()
@@ -1053,7 +1051,7 @@ def test_selection(params, expected_ids, evaluate_all=False):
                 entries = func(evaluated)
                 results = [(v['playlist_autonumber'] - 1, (int(v['id']), v['playlist_index']))
                            for v in get_downloaded_info_dicts(params, entries)]
-                self.assertEqual(results, list(enumerate(zip(expected_ids, expected_ids, strict=True))), f'Entries of {name} for {params}')
+                self.assertEqual(results, list(enumerate(zip(expected_ids, expected_ids))), f'Entries of {name} for {params}')
                 self.assertEqual(sorted(evaluated), expected_eval, f'Evaluation of {name} for {params}')
 
         test_selection({}, INDICES)
@@ -1099,6 +1097,11 @@ def test_selection(params, expected_ids, evaluate_all=False):
         test_selection({'playlist_items': '-15::2'}, INDICES[1::2], True)
         test_selection({'playlist_items': '-15::15'}, [], True)
 
+    def test_urlopen_no_file_protocol(self):
+        # see https://github.com/ytdl-org/youtube-dl/issues/8227
+        ydl = YDL()
+        self.assertRaises(urllib.error.URLError, ydl.urlopen, 'file:///etc/passwd')
+
     def test_do_not_override_ie_key_in_url_transparent(self):
         ydl = YDL()
 
@@ -1174,7 +1177,7 @@ def _real_extract(self, url):
                     })
                 return {
                     'id': video_id,
-                    'title': f'Video {video_id}',
+                    'title': 'Video %s' % video_id,
                     'formats': formats,
                 }
 
@@ -1188,8 +1191,8 @@ def _entries(self):
                         '_type': 'url_transparent',
                         'ie_key': VideoIE.ie_key(),
                         'id': video_id,
-                        'url': f'video:{video_id}',
-                        'title': f'Video Transparent {video_id}',
+                        'url': 'video:%s' % video_id,
+                        'title': 'Video Transparent %s' % video_id,
                     }
 
             def _real_extract(self, url):
@@ -1212,156 +1215,6 @@ def _real_extract(self, url):
         self.assertEqual(downloaded['extractor'], 'Video')
         self.assertEqual(downloaded['extractor_key'], 'Video')
 
-    def test_header_cookies(self):
-        from http.cookiejar import Cookie
-
-        ydl = FakeYDL()
-        ydl.report_warning = lambda *_, **__: None
-
-        def cookie(name, value, version=None, domain='', path='', secure=False, expires=None):
-            return Cookie(
-                version or 0, name, value, None, False,
-                domain, bool(domain), bool(domain), path, bool(path),
-                secure, expires, False, None, None, rest={})
-
-        _test_url = 'https://yt.dlp/test'
-
-        def test(encoded_cookies, cookies, *, headers=False, round_trip=None, error_re=None):
-            def _test():
-                ydl.cookiejar.clear()
-                ydl._load_cookies(encoded_cookies, autoscope=headers)
-                if headers:
-                    ydl._apply_header_cookies(_test_url)
-                data = {'url': _test_url}
-                ydl._calc_headers(data)
-                self.assertCountEqual(
-                    map(vars, ydl.cookiejar), map(vars, cookies),
-                    'Extracted cookiejar.Cookie is not the same')
-                if not headers:
-                    self.assertEqual(
-                        data.get('cookies'), round_trip or encoded_cookies,
-                        'Cookie is not the same as round trip')
-                ydl.__dict__['_YoutubeDL__header_cookies'] = []
-
-            with self.subTest(msg=encoded_cookies):
-                if not error_re:
-                    _test()
-                    return
-                with self.assertRaisesRegex(Exception, error_re):
-                    _test()
-
-        test('test=value; Domain=.yt.dlp', [cookie('test', 'value', domain='.yt.dlp')])
-        test('test=value', [cookie('test', 'value')], error_re=r'Unscoped cookies are not allowed')
-        test('cookie1=value1; Domain=.yt.dlp; Path=/test; cookie2=value2; Domain=.yt.dlp; Path=/', [
-            cookie('cookie1', 'value1', domain='.yt.dlp', path='/test'),
-            cookie('cookie2', 'value2', domain='.yt.dlp', path='/')])
-        test('test=value; Domain=.yt.dlp; Path=/test; Secure; Expires=9999999999', [
-            cookie('test', 'value', domain='.yt.dlp', path='/test', secure=True, expires=9999999999)])
-        test('test="value; "; path=/test; domain=.yt.dlp', [
-            cookie('test', 'value; ', domain='.yt.dlp', path='/test')],
-            round_trip='test="value\\073 "; Domain=.yt.dlp; Path=/test')
-        test('name=; Domain=.yt.dlp', [cookie('name', '', domain='.yt.dlp')],
-             round_trip='name=""; Domain=.yt.dlp')
-
-        test('test=value', [cookie('test', 'value', domain='.yt.dlp')], headers=True)
-        test('cookie1=value; Domain=.yt.dlp; cookie2=value', [], headers=True, error_re=r'Invalid syntax')
-        ydl.deprecated_feature = ydl.report_error
-        test('test=value', [], headers=True, error_re=r'Passing cookies as a header is a potential security risk')
-
-    def test_infojson_cookies(self):
-        TEST_FILE = 'test_infojson_cookies.info.json'
-        TEST_URL = 'https://example.com/example.mp4'
-        COOKIES = 'a=b; Domain=.example.com; c=d; Domain=.example.com'
-        COOKIE_HEADER = {'Cookie': 'a=b; c=d'}
-
-        ydl = FakeYDL()
-        ydl.process_info = lambda x: ydl._write_info_json('test', x, TEST_FILE)
-
-        def make_info(info_header_cookies=False, fmts_header_cookies=False, cookies_field=False):
-            fmt = {'url': TEST_URL}
-            if fmts_header_cookies:
-                fmt['http_headers'] = COOKIE_HEADER
-            if cookies_field:
-                fmt['cookies'] = COOKIES
-            return _make_result([fmt], http_headers=COOKIE_HEADER if info_header_cookies else None)
-
-        def test(initial_info, note):
-            result = {}
-            result['processed'] = ydl.process_ie_result(initial_info)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=f'No cookies set in cookiejar after initial process when {note}')
-            ydl.cookiejar.clear()
-            with open(TEST_FILE) as infojson:
-                result['loaded'] = ydl.sanitize_info(json.load(infojson), True)
-            result['final'] = ydl.process_ie_result(result['loaded'].copy(), download=False)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=f'No cookies set in cookiejar after final process when {note}')
-            ydl.cookiejar.clear()
-            for key in ('processed', 'loaded', 'final'):
-                info = result[key]
-                self.assertIsNone(
-                    traverse_obj(info, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False),
-                    msg=f'Cookie header not removed in {key} result when {note}')
-                self.assertEqual(
-                    traverse_obj(info, ((None, ('formats', 0)), 'cookies'), get_all=False), COOKIES,
-                    msg=f'No cookies field found in {key} result when {note}')
-
-        test({'url': TEST_URL, 'http_headers': COOKIE_HEADER, 'id': '1', 'title': 'x'}, 'no formats field')
-        test(make_info(info_header_cookies=True), 'info_dict header cokies')
-        test(make_info(fmts_header_cookies=True), 'format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True), 'info_dict and format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True, cookies_field=True), 'all cookies fields')
-        test(make_info(cookies_field=True), 'cookies format field')
-        test({'url': TEST_URL, 'cookies': COOKIES, 'id': '1', 'title': 'x'}, 'info_dict cookies field only')
-
-        try_rm(TEST_FILE)
-
-    def test_add_headers_cookie(self):
-        def check_for_cookie_header(result):
-            return traverse_obj(result, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False)
-
-        ydl = FakeYDL({'http_headers': {'Cookie': 'a=b'}})
-        ydl._apply_header_cookies(_make_result([])['webpage_url'])  # Scope to input webpage URL: .example.com
-
-        fmt = {'url': 'https://example.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies in result info_dict')
-        self.assertEqual(result.get('cookies'), 'a=b; Domain=.example.com', msg='No cookies were set in cookies field')
-        self.assertIn('a=b', ydl.cookiejar.get_cookie_header(fmt['url']), msg='No cookies were set in cookiejar')
-
-        fmt = {'url': 'https://wrong.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies for wrong domain')
-        self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
-        self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
-
-    def test_load_plugins_compat(self):
-        # Should try to reload plugins if they haven't already been loaded
-        all_plugins_loaded.value = False
-        FakeYDL().close()
-        assert all_plugins_loaded.value
-
-    def test_close_hooks(self):
-        # Should call all registered close hooks on close
-        close_hook_called = False
-        close_hook_two_called = False
-
-        def close_hook():
-            nonlocal close_hook_called
-            close_hook_called = True
-
-        def close_hook_two():
-            nonlocal close_hook_two_called
-            close_hook_two_called = True
-
-        ydl = FakeYDL()
-        ydl.add_close_hook(close_hook)
-        ydl.add_close_hook(close_hook_two)
-
-        ydl.close()
-        self.assertTrue(close_hook_called, 'Close hook was not called')
-        self.assertTrue(close_hook_two_called, 'Close hook two was not called')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDLCookieJar.py

@@ -11,16 +11,16 @@
 import re
 import tempfile
 
-from yt_dlp.cookies import YoutubeDLCookieJar
+from yt_dlp.utils import YoutubeDLCookieJar
 
 
 class TestYoutubeDLCookieJar(unittest.TestCase):
     def test_keep_session_cookies(self):
         cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/session_cookies.txt')
-        cookiejar.load()
+        cookiejar.load(ignore_discard=True, ignore_expires=True)
         tf = tempfile.NamedTemporaryFile(delete=False)
         try:
-            cookiejar.save(filename=tf.name)
+            cookiejar.save(filename=tf.name, ignore_discard=True, ignore_expires=True)
             temp = tf.read().decode()
             self.assertTrue(re.search(
                 r'www\.foobar\.foobar\s+FALSE\s+/\s+TRUE\s+0\s+YoutubeDLExpiresEmpty\s+YoutubeDLExpiresEmptyValue', temp))
@@ -32,7 +32,7 @@ def test_keep_session_cookies(self):
 
     def test_strip_httponly_prefix(self):
         cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/httponly_cookies.txt')
-        cookiejar.load()
+        cookiejar.load(ignore_discard=True, ignore_expires=True)
 
         def assert_cookie_has_value(key):
             self.assertEqual(cookiejar._cookies['www.foobar.foobar']['/'][key].value, key + '_VALUE')
@@ -42,25 +42,11 @@ def assert_cookie_has_value(key):
 
     def test_malformed_cookies(self):
         cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/malformed_cookies.txt')
-        cookiejar.load()
+        cookiejar.load(ignore_discard=True, ignore_expires=True)
         # Cookies should be empty since all malformed cookie file entries
         # will be ignored
         self.assertFalse(cookiejar._cookies)
 
-    def test_get_cookie_header(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/httponly_cookies.txt')
-        cookiejar.load()
-        header = cookiejar.get_cookie_header('https://www.foobar.foobar')
-        self.assertIn('HTTPONLY_COOKIE', header)
-
-    def test_get_cookies_for_url(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/session_cookies.txt')
-        cookiejar.load()
-        cookies = cookiejar.get_cookies_for_url('https://www.foobar.foobar/')
-        self.assertEqual(len(cookies), 2)
-        cookies = cookiejar.get_cookies_for_url('https://foobar.foobar/')
-        self.assertFalse(cookies)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_aes.py

@@ -11,6 +11,7 @@
 import base64
 
 from yt_dlp.aes import (
+    BLOCK_SIZE_BYTES,
     aes_cbc_decrypt,
     aes_cbc_decrypt_bytes,
     aes_cbc_encrypt,
@@ -26,7 +27,8 @@
     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'
 
@@ -39,33 +41,33 @@ def setUp(self):
     def test_encrypt(self):
         msg = b'message'
         key = list(range(16))
-        encrypted = aes_encrypt(list(msg), key)
-        decrypted = bytes(aes_decrypt(encrypted, key))
+        encrypted = aes_encrypt(bytes_to_intlist(msg), key)
+        decrypted = intlist_to_bytes(aes_decrypt(encrypted, key))
         self.assertEqual(decrypted, msg)
 
     def test_cbc_decrypt(self):
         data = b'\x97\x92+\xe5\x0b\xc3\x18\x91ky9m&\xb3\xb5@\xe6\x27\xc2\x96.\xc8u\x88\xab9-[\x9e|\xf1\xcd'
-        decrypted = bytes(aes_cbc_decrypt(list(data), self.key, self.iv))
+        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.AES:
-            decrypted = aes_cbc_decrypt_bytes(data, bytes(self.key), bytes(self.iv))
+        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)
 
     def test_cbc_encrypt(self):
-        data = list(self.secret_msg)
-        encrypted = bytes(aes_cbc_encrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(self.secret_msg)
+        encrypted = intlist_to_bytes(aes_cbc_encrypt(data, self.key, self.iv))
         self.assertEqual(
             encrypted,
             b'\x97\x92+\xe5\x0b\xc3\x18\x91ky9m&\xb3\xb5@\xe6\'\xc2\x96.\xc8u\x88\xab9-[\x9e|\xf1\xcd')
 
     def test_ctr_decrypt(self):
-        data = list(b'\x03\xc7\xdd\xd4\x8e\xb3\xbc\x1a*O\xdc1\x12+8Aio\xd1z\xb5#\xaf\x08')
-        decrypted = bytes(aes_ctr_decrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(b'\x03\xc7\xdd\xd4\x8e\xb3\xbc\x1a*O\xdc1\x12+8Aio\xd1z\xb5#\xaf\x08')
+        decrypted = intlist_to_bytes(aes_ctr_decrypt(data, self.key, self.iv))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
     def test_ctr_encrypt(self):
-        data = list(self.secret_msg)
-        encrypted = bytes(aes_ctr_encrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(self.secret_msg)
+        encrypted = intlist_to_bytes(aes_ctr_encrypt(data, self.key, self.iv))
         self.assertEqual(
             encrypted,
             b'\x03\xc7\xdd\xd4\x8e\xb3\xbc\x1a*O\xdc1\x12+8Aio\xd1z\xb5#\xaf\x08')
@@ -74,59 +76,48 @@ def test_gcm_decrypt(self):
         data = b'\x159Y\xcf5eud\x90\x9c\x85&]\x14\x1d\x0f.\x08\xb4T\xe4/\x17\xbd'
         authentication_tag = b'\xe8&I\x80rI\x07\x9d}YWuU@:e'
 
-        decrypted = bytes(aes_gcm_decrypt_and_verify(
-            list(data), self.key, list(authentication_tag), self.iv[:12]))
+        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.AES:
+        if Cryptodome_AES:
             decrypted = aes_gcm_decrypt_and_verify_bytes(
-                data, bytes(self.key), authentication_tag, bytes(self.iv[:12]))
+                data, intlist_to_bytes(self.key), authentication_tag, intlist_to_bytes(self.iv[:12]))
             self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
-    def test_gcm_aligned_decrypt(self):
-        data = b'\x159Y\xcf5eud\x90\x9c\x85&]\x14\x1d\x0f'
-        authentication_tag = b'\x08\xb1\x9d!&\x98\xd0\xeaRq\x90\xe6;\xb5]\xd8'
-
-        decrypted = bytes(aes_gcm_decrypt_and_verify(
-            list(data), self.key, list(authentication_tag), self.iv[:12]))
-        self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg[:16])
-        if Cryptodome.AES:
-            decrypted = aes_gcm_decrypt_and_verify_bytes(
-                data, bytes(self.key), authentication_tag, bytes(self.iv[:12]))
-            self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg[:16])
-
     def test_decrypt_text(self):
-        password = bytes(self.key).decode()
+        password = intlist_to_bytes(self.key).decode()
         encrypted = base64.b64encode(
-            bytes(self.iv[:8])
-            + b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae',
+            intlist_to_bytes(self.iv[:8])
+            + b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae'
         ).decode()
         decrypted = (aes_decrypt_text(encrypted, password, 16))
         self.assertEqual(decrypted, self.secret_msg)
 
-        password = bytes(self.key).decode()
+        password = intlist_to_bytes(self.key).decode()
         encrypted = base64.b64encode(
-            bytes(self.iv[:8])
-            + b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83',
+            intlist_to_bytes(self.iv[:8])
+            + b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83'
         ).decode()
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)
 
     def test_ecb_encrypt(self):
-        data = list(self.secret_msg)
-        encrypted = bytes(aes_ecb_encrypt(data, self.key))
+        data = bytes_to_intlist(self.secret_msg)
+        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:')
 
     def test_ecb_decrypt(self):
-        data = list(b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
-        decrypted = bytes(aes_ecb_decrypt(data, self.key, self.iv))
+        data = bytes_to_intlist(b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
+        decrypted = intlist_to_bytes(aes_ecb_decrypt(data, self.key, self.iv))
         self.assertEqual(decrypted.rstrip(b'\x08'), self.secret_msg)
 
     def test_key_expansion(self):
         key = '4f6bdaa39e2f8cb07f5e722d9edef314'
 
-        self.assertEqual(key_expansion(list(bytearray.fromhex(key))), [
+        self.assertEqual(key_expansion(bytes_to_intlist(bytearray.fromhex(key))), [
             0x4F, 0x6B, 0xDA, 0xA3, 0x9E, 0x2F, 0x8C, 0xB0, 0x7F, 0x5E, 0x72, 0x2D, 0x9E, 0xDE, 0xF3, 0x14,
             0x53, 0x66, 0x20, 0xA8, 0xCD, 0x49, 0xAC, 0x18, 0xB2, 0x17, 0xDE, 0x35, 0x2C, 0xC9, 0x2D, 0x21,
             0x8C, 0xBE, 0xDD, 0xD9, 0x41, 0xF7, 0x71, 0xC1, 0xF3, 0xE0, 0xAF, 0xF4, 0xDF, 0x29, 0x82, 0xD5,
@@ -143,16 +134,16 @@ def test_pad_block(self):
         block = [0x21, 0xA0, 0x43, 0xFF]
 
         self.assertEqual(pad_block(block, 'pkcs7'),
-                         [*block, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C])
+                         block + [0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C])
 
         self.assertEqual(pad_block(block, 'iso7816'),
-                         [*block, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+                         block + [0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
 
         self.assertEqual(pad_block(block, 'whitespace'),
-                         [*block, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20])
+                         block + [0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20])
 
         self.assertEqual(pad_block(block, 'zero'),
-                         [*block, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+                         block + [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
 
         block = list(range(16))
         for mode in ('pkcs7', 'iso7816', 'whitespace', 'zero'):

test/test_age_restriction.py

@@ -10,7 +10,6 @@
 
 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])
-    except DownloadError:
-        pass
-    else:
-        return os.path.exists(json_filename)
-    finally:
-        try_rm(json_filename)
+    ydl.download([url])
+    res = os.path.exists(json_filename)
+    try_rm(json_filename)
+    return res
 
 
 @is_download_test
@@ -43,12 +38,12 @@ def _assert_restricted(self, url, filename, age, old_age=None):
         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/',
-            '16715086.mp4', 2, old_age=25)
+            'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
+            '505835.mp4', 2, old_age=25)
 
 
 if __name__ == '__main__':

test/test_compat.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 # Allow direct execution
-import datetime as dt
 import os
 import sys
 import unittest
@@ -10,22 +9,26 @@
 
 
 import struct
+import urllib.parse
 
 from yt_dlp import compat
-from yt_dlp.compat import urllib  # isort: split
-from yt_dlp.compat import compat_etree_fromstring, compat_expanduser, compat_datetime_from_timestamp
-from yt_dlp.compat.urllib.request import getproxies
+from yt_dlp.compat import (
+    compat_etree_fromstring,
+    compat_expanduser,
+    compat_urllib_parse_unquote,
+    compat_urllib_parse_urlencode,
+)
 
 
 class TestCompat(unittest.TestCase):
     def test_compat_passthrough(self):
         with self.assertWarns(DeprecationWarning):
-            _ = compat.compat_basestring
-
-        self.assertEqual(urllib.request.getproxies, getproxies)
+            compat.compat_basestring
 
         with self.assertWarns(DeprecationWarning):
-            _ = compat.compat_pycrypto_AES  # Must not raise error
+            compat.WINDOWS_VT_MODE
+
+        compat.asyncio.events  # Must not raise error
 
     def test_compat_expanduser(self):
         old_home = os.environ.get('HOME')
@@ -36,6 +39,39 @@ def test_compat_expanduser(self):
         finally:
             os.environ['HOME'] = old_home or ''
 
+    def test_compat_urllib_parse_unquote(self):
+        self.assertEqual(compat_urllib_parse_unquote('abc%20def'), 'abc def')
+        self.assertEqual(compat_urllib_parse_unquote('%7e/abc+def'), '~/abc+def')
+        self.assertEqual(compat_urllib_parse_unquote(''), '')
+        self.assertEqual(compat_urllib_parse_unquote('%'), '%')
+        self.assertEqual(compat_urllib_parse_unquote('%%'), '%%')
+        self.assertEqual(compat_urllib_parse_unquote('%%%'), '%%%')
+        self.assertEqual(compat_urllib_parse_unquote('%2F'), '/')
+        self.assertEqual(compat_urllib_parse_unquote('%2f'), '/')
+        self.assertEqual(compat_urllib_parse_unquote('%E6%B4%A5%E6%B3%A2'), '津波')
+        self.assertEqual(
+            compat_urllib_parse_unquote('''<meta property="og:description" content="%E2%96%81%E2%96%82%E2%96%83%E2%96%84%25%E2%96%85%E2%96%86%E2%96%87%E2%96%88" />
+%<a href="https://ar.wikipedia.org/wiki/%D8%AA%D8%B3%D9%88%D9%86%D8%A7%D9%85%D9%8A">%a'''),
+            '''<meta property="og:description" content="▁▂▃▄%▅▆▇█" />
+%<a href="https://ar.wikipedia.org/wiki/تسونامي">%a''')
+        self.assertEqual(
+            compat_urllib_parse_unquote('''%28%5E%E2%97%A3_%E2%97%A2%5E%29%E3%81%A3%EF%B8%BB%E3%83%87%E2%95%90%E4%B8%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%86%B6%I%Break%25Things%'''),
+            '''(^◣_◢^)っ︻デ═一    ⇀    ⇀    ⇀    ⇀    ⇀    ↶%I%Break%Things%''')
+
+    def test_compat_urllib_parse_unquote_plus(self):
+        self.assertEqual(urllib.parse.unquote_plus('abc%20def'), 'abc def')
+        self.assertEqual(urllib.parse.unquote_plus('%7e/abc+def'), '~/abc def')
+
+    def test_compat_urllib_parse_urlencode(self):
+        self.assertEqual(compat_urllib_parse_urlencode({'abc': 'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode({'abc': b'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode({b'abc': 'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode({b'abc': b'def'}), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([('abc', 'def')]), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([('abc', b'def')]), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([(b'abc', 'def')]), 'abc=def')
+        self.assertEqual(compat_urllib_parse_urlencode([(b'abc', b'def')]), 'abc=def')
+
     def test_compat_etree_fromstring(self):
         xml = '''
             <root foo="bar" spam="中文">
@@ -60,45 +96,6 @@ def test_compat_etree_fromstring_doctype(self):
     def test_struct_unpack(self):
         self.assertEqual(struct.unpack('!B', b'\x00'), (0,))
 
-    def test_compat_datetime_from_timestamp(self):
-        self.assertEqual(
-            compat_datetime_from_timestamp(0),
-            dt.datetime(1970, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc))
-        self.assertEqual(
-            compat_datetime_from_timestamp(1),
-            dt.datetime(1970, 1, 1, 0, 0, 1, tzinfo=dt.timezone.utc))
-        self.assertEqual(
-            compat_datetime_from_timestamp(3600),
-            dt.datetime(1970, 1, 1, 1, 0, 0, tzinfo=dt.timezone.utc))
-
-        self.assertEqual(
-            compat_datetime_from_timestamp(-1),
-            dt.datetime(1969, 12, 31, 23, 59, 59, tzinfo=dt.timezone.utc))
-        self.assertEqual(
-            compat_datetime_from_timestamp(-86400),
-            dt.datetime(1969, 12, 31, 0, 0, 0, tzinfo=dt.timezone.utc))
-
-        self.assertEqual(
-            compat_datetime_from_timestamp(0.5),
-            dt.datetime(1970, 1, 1, 0, 0, 0, 500000, tzinfo=dt.timezone.utc))
-        self.assertEqual(
-            compat_datetime_from_timestamp(1.000001),
-            dt.datetime(1970, 1, 1, 0, 0, 1, 1, tzinfo=dt.timezone.utc))
-        self.assertEqual(
-            compat_datetime_from_timestamp(-1.25),
-            dt.datetime(1969, 12, 31, 23, 59, 58, 750000, tzinfo=dt.timezone.utc))
-
-        self.assertEqual(
-            compat_datetime_from_timestamp(-1577923200),
-            dt.datetime(1920, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc))
-        self.assertEqual(
-            compat_datetime_from_timestamp(4102444800),
-            dt.datetime(2100, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc))
-
-        self.assertEqual(
-            compat_datetime_from_timestamp(173568960000),
-            dt.datetime(7470, 3, 8, 0, 0, 0, tzinfo=dt.timezone.utc))
-
 
 if __name__ == '__main__':
     unittest.main()

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

@@ -1,9 +1,8 @@
-import datetime as dt
 import unittest
+from datetime import datetime, timezone
 
 from yt_dlp import cookies
 from yt_dlp.cookies import (
-    LenientSimpleCookie,
     LinuxChromeCookieDecryptor,
     MacChromeCookieDecryptor,
     WindowsChromeCookieDecryptor,
@@ -49,47 +48,32 @@ def test_get_desktop_environment(self):
         """ based on https://chromium.googlesource.com/chromium/src/+/refs/heads/main/base/nix/xdg_util_unittest.cc """
         test_cases = [
             ({}, _LinuxDesktopEnvironment.OTHER),
-            ({'DESKTOP_SESSION': 'my_custom_de'}, _LinuxDesktopEnvironment.OTHER),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de'}, _LinuxDesktopEnvironment.OTHER),
 
             ({'DESKTOP_SESSION': 'gnome'}, _LinuxDesktopEnvironment.GNOME),
             ({'DESKTOP_SESSION': 'mate'}, _LinuxDesktopEnvironment.GNOME),
-            ({'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
-            ({'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
+            ({'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE),
+            ({'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE),
             ({'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
 
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'gnome'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'mate'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
-
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de', 'DESKTOP_SESSION': 'my_custom_de', 'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
-
             ({'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
-            ({'KDE_FULL_SESSION': 1}, _LinuxDesktopEnvironment.KDE3),
-            ({'KDE_FULL_SESSION': 1, 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
+            ({'KDE_FULL_SESSION': 1}, _LinuxDesktopEnvironment.KDE),
 
             ({'XDG_CURRENT_DESKTOP': 'X-Cinnamon'}, _LinuxDesktopEnvironment.CINNAMON),
-            ({'XDG_CURRENT_DESKTOP': 'Deepin'}, _LinuxDesktopEnvironment.DEEPIN),
             ({'XDG_CURRENT_DESKTOP': 'GNOME'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'GNOME:GNOME-Classic'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'GNOME : GNOME-Classic'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'ubuntu:GNOME'}, _LinuxDesktopEnvironment.GNOME),
 
             ({'XDG_CURRENT_DESKTOP': 'Unity', 'DESKTOP_SESSION': 'gnome-fallback'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '5'}, _LinuxDesktopEnvironment.KDE5),
-            ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '6'}, _LinuxDesktopEnvironment.KDE6),
-            ({'XDG_CURRENT_DESKTOP': 'KDE'}, _LinuxDesktopEnvironment.KDE4),
+            ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '5'}, _LinuxDesktopEnvironment.KDE),
+            ({'XDG_CURRENT_DESKTOP': 'KDE'}, _LinuxDesktopEnvironment.KDE),
             ({'XDG_CURRENT_DESKTOP': 'Pantheon'}, _LinuxDesktopEnvironment.PANTHEON),
-            ({'XDG_CURRENT_DESKTOP': 'UKUI'}, _LinuxDesktopEnvironment.UKUI),
             ({'XDG_CURRENT_DESKTOP': 'Unity'}, _LinuxDesktopEnvironment.UNITY),
             ({'XDG_CURRENT_DESKTOP': 'Unity:Unity7'}, _LinuxDesktopEnvironment.UNITY),
             ({'XDG_CURRENT_DESKTOP': 'Unity:Unity8'}, _LinuxDesktopEnvironment.UNITY),
         ]
 
         for env, expected_desktop_environment in test_cases:
-            self.assertEqual(_get_linux_desktop_environment(env, Logger()), expected_desktop_environment)
+            self.assertEqual(_get_linux_desktop_environment(env), expected_desktop_environment)
 
     def test_chrome_cookie_decryptor_linux_derive_key(self):
         key = LinuxChromeCookieDecryptor.derive_key(b'abc')
@@ -113,31 +97,15 @@ def test_chrome_cookie_decryptor_linux_v11(self):
             decryptor = LinuxChromeCookieDecryptor('Chrome', Logger())
             self.assertEqual(decryptor.decrypt(encrypted_value), value)
 
-    def test_chrome_cookie_decryptor_linux_v10_meta24(self):
-        with MonkeyPatch(cookies, {'_get_linux_keyring_password': lambda *args, **kwargs: b''}):
-            encrypted_value = b'v10\x1f\xe4\x0e[\x83\x0c\xcc*kPi \xce\x8d\x1d\xbb\x80\r\x11\t\xbb\x9e^Hy\x94\xf4\x963\x9f\x82\xba\xfe\xa1\xed\xb9\xf1)\x00710\x92\xc8/<\x96B'
-            value = 'DE'
-            decryptor = LinuxChromeCookieDecryptor('Chrome', Logger(), meta_version=24)
-            self.assertEqual(decryptor.decrypt(encrypted_value), value)
-
     def test_chrome_cookie_decryptor_windows_v10(self):
         with MonkeyPatch(cookies, {
-            '_get_windows_v10_key': lambda *args, **kwargs: b'Y\xef\xad\xad\xeerp\xf0Y\xe6\x9b\x12\xc2<z\x16]\n\xbb\xb8\xcb\xd7\x9bA\xc3\x14e\x99{\xd6\xf4&',
+            '_get_windows_v10_key': lambda *args, **kwargs: b'Y\xef\xad\xad\xeerp\xf0Y\xe6\x9b\x12\xc2<z\x16]\n\xbb\xb8\xcb\xd7\x9bA\xc3\x14e\x99{\xd6\xf4&'
         }):
             encrypted_value = b'v10T\xb8\xf3\xb8\x01\xa7TtcV\xfc\x88\xb8\xb8\xef\x05\xb5\xfd\x18\xc90\x009\xab\xb1\x893\x85)\x87\xe1\xa9-\xa3\xad='
             value = '32101439'
             decryptor = WindowsChromeCookieDecryptor('', Logger())
             self.assertEqual(decryptor.decrypt(encrypted_value), value)
 
-    def test_chrome_cookie_decryptor_windows_v10_meta24(self):
-        with MonkeyPatch(cookies, {
-            '_get_windows_v10_key': lambda *args, **kwargs: b'\xea\x8b\x02\xc3\xc6\xc5\x99\xc3\xa3[ j\xfa\xf6\xfcU\xac\x13u\xdc\x0c\x0e\xf1\x03\x90\xb6\xdf\xbb\x8fL\xb1\xb2',
-        }):
-            encrypted_value = b'v10dN\xe1\xacy\x84^\xe1I\xact\x03r\xfb\xe2\xce{^\x0e<(\xb0y\xeb\x01\xfb@"\x9e\x8c\xa53~\xdb*\x8f\xac\x8b\xe3\xfd3\x06\xe5\x93\x19OyOG\xb2\xfb\x1d$\xc0\xda\x13j\x9e\xfe\xc5\xa3\xa8\xfe\xd9'
-            value = '1234'
-            decryptor = WindowsChromeCookieDecryptor('', Logger(), meta_version=24)
-            self.assertEqual(decryptor.decrypt(encrypted_value), value)
-
     def test_chrome_cookie_decryptor_mac_v10(self):
         with MonkeyPatch(cookies, {'_get_mac_keyring_password': lambda *args, **kwargs: b'6eIDUdtKAacvlHwBVwvg/Q=='}):
             encrypted_value = b'v10\xb3\xbe\xad\xa1[\x9fC\xa1\x98\xe0\x9a\x01\xd9\xcf\xbfc'
@@ -146,186 +114,26 @@ def test_chrome_cookie_decryptor_mac_v10(self):
             self.assertEqual(decryptor.decrypt(encrypted_value), value)
 
     def test_safari_cookie_parsing(self):
-        cookies = (
-            b'cook\x00\x00\x00\x01\x00\x00\x00i\x00\x00\x01\x00\x01\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00Y'
-            b'\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x008\x00\x00\x00B\x00\x00\x00F\x00\x00\x00H'
-            b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x03\xa5>\xc3A\x00\x00\x80\xc3\x07:\xc3A'
-            b'localhost\x00foo\x00/\x00test%20%3Bcookie\x00\x00\x00\x054\x07\x17 \x05\x00\x00\x00Kbplist00\xd1\x01'
-            b'\x02_\x10\x18NSHTTPCookieAcceptPolicy\x10\x02\x08\x0b&\x00\x00\x00\x00\x00\x00\x01\x01\x00\x00\x00'
-            b'\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00(')
+        cookies = \
+            b'cook\x00\x00\x00\x01\x00\x00\x00i\x00\x00\x01\x00\x01\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00Y' \
+            b'\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x00\x00\x00\x008\x00\x00\x00B\x00\x00\x00F\x00\x00\x00H' \
+            b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x03\xa5>\xc3A\x00\x00\x80\xc3\x07:\xc3A' \
+            b'localhost\x00foo\x00/\x00test%20%3Bcookie\x00\x00\x00\x054\x07\x17 \x05\x00\x00\x00Kbplist00\xd1\x01' \
+            b'\x02_\x10\x18NSHTTPCookieAcceptPolicy\x10\x02\x08\x0b&\x00\x00\x00\x00\x00\x00\x01\x01\x00\x00\x00' \
+            b'\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00('
 
         jar = parse_safari_cookies(cookies)
         self.assertEqual(len(jar), 1)
-        cookie = next(iter(jar))
+        cookie = list(jar)[0]
         self.assertEqual(cookie.domain, 'localhost')
         self.assertEqual(cookie.port, None)
         self.assertEqual(cookie.path, '/')
         self.assertEqual(cookie.name, 'foo')
         self.assertEqual(cookie.value, 'test%20%3Bcookie')
         self.assertFalse(cookie.secure)
-        expected_expiration = dt.datetime(2021, 6, 18, 21, 39, 19, tzinfo=dt.timezone.utc)
+        expected_expiration = datetime(2021, 6, 18, 21, 39, 19, tzinfo=timezone.utc)
         self.assertEqual(cookie.expires, int(expected_expiration.timestamp()))
 
     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_devalue.py

@@ -1,235 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import datetime as dt
-import json
-import math
-import re
-import unittest
-
-from yt_dlp.utils.jslib import devalue
-
-
-TEST_CASES_EQUALS = [{
-    'name': 'int',
-    'unparsed': [-42],
-    'parsed': -42,
-}, {
-    'name': 'str',
-    'unparsed': ['woo!!!'],
-    'parsed': 'woo!!!',
-}, {
-    'name': 'Number',
-    'unparsed': [['Object', 42]],
-    'parsed': 42,
-}, {
-    'name': 'String',
-    'unparsed': [['Object', 'yar']],
-    'parsed': 'yar',
-}, {
-    'name': 'Infinity',
-    'unparsed': -4,
-    'parsed': math.inf,
-}, {
-    'name': 'negative Infinity',
-    'unparsed': -5,
-    'parsed': -math.inf,
-}, {
-    'name': 'negative zero',
-    'unparsed': -6,
-    'parsed': -0.0,
-}, {
-    'name': 'RegExp',
-    'unparsed': [['RegExp', 'regexp', 'gim']],  # XXX: flags are ignored
-    'parsed': re.compile('regexp'),
-}, {
-    'name': 'Date',
-    'unparsed': [['Date', '2001-09-09T01:46:40.000Z']],
-    'parsed': dt.datetime.fromtimestamp(1e9, tz=dt.timezone.utc),
-}, {
-    'name': 'Array',
-    'unparsed': [[1, 2, 3], 'a', 'b', 'c'],
-    'parsed': ['a', 'b', 'c'],
-}, {
-    'name': 'Array (empty)',
-    'unparsed': [[]],
-    'parsed': [],
-}, {
-    'name': 'Array (sparse)',
-    'unparsed': [[-2, 1, -2], 'b'],
-    'parsed': [None, 'b', None],
-}, {
-    'name': 'Object',
-    'unparsed': [{'foo': 1, 'x-y': 2}, 'bar', 'z'],
-    'parsed': {'foo': 'bar', 'x-y': 'z'},
-}, {
-    'name': 'Set',
-    'unparsed': [['Set', 1, 2, 3], 1, 2, 3],
-    'parsed': [1, 2, 3],
-}, {
-    'name': 'Map',
-    'unparsed': [['Map', 1, 2], 'a', 'b'],
-    'parsed': [['a', 'b']],
-}, {
-    'name': 'BigInt',
-    'unparsed': [['BigInt', '1']],
-    'parsed': 1,
-}, {
-    'name': 'Uint8Array',
-    'unparsed': [['Uint8Array', 'AQID']],
-    'parsed': [1, 2, 3],
-}, {
-    'name': 'ArrayBuffer',
-    'unparsed': [['ArrayBuffer', 'AQID']],
-    'parsed': [1, 2, 3],
-}, {
-    'name': 'str (repetition)',
-    'unparsed': [[1, 1], 'a string'],
-    'parsed': ['a string', 'a string'],
-}, {
-    'name': 'None (repetition)',
-    'unparsed': [[1, 1], None],
-    'parsed': [None, None],
-}, {
-    'name': 'dict (repetition)',
-    'unparsed': [[1, 1], {}],
-    'parsed': [{}, {}],
-}, {
-    'name': 'Object without prototype',
-    'unparsed': [['null']],
-    'parsed': {},
-}, {
-    'name': 'cross-realm POJO',
-    'unparsed': [{}],
-    'parsed': {},
-}]
-
-TEST_CASES_IS = [{
-    'name': 'bool',
-    'unparsed': [True],
-    'parsed': True,
-}, {
-    'name': 'Boolean',
-    'unparsed': [['Object', False]],
-    'parsed': False,
-}, {
-    'name': 'undefined',
-    'unparsed': -1,
-    'parsed': None,
-}, {
-    'name': 'null',
-    'unparsed': [None],
-    'parsed': None,
-}, {
-    'name': 'NaN',
-    'unparsed': -3,
-    'parsed': math.nan,
-}]
-
-TEST_CASES_INVALID = [{
-    'name': 'empty string',
-    'unparsed': '',
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'hole',
-    'unparsed': -2,
-    'error': ValueError,
-    'pattern': r'invalid integer input',
-}, {
-    'name': 'string',
-    'unparsed': 'hello',
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'number',
-    'unparsed': 42,
-    'error': ValueError,
-    'pattern': r'invalid integer input',
-}, {
-    'name': 'boolean',
-    'unparsed': True,
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'null',
-    'unparsed': None,
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'object',
-    'unparsed': {},
-    'error': ValueError,
-    'pattern': r'expected int or list as input',
-}, {
-    'name': 'empty array',
-    'unparsed': [],
-    'error': ValueError,
-    'pattern': r'expected a non-empty list as input',
-}, {
-    'name': 'Python negative indexing',
-    'unparsed': [[1, 2, 3, 4, 5, 6, 7, -7], 1, 2, 3, 4, 5, 6, 7],
-    'error': IndexError,
-    'pattern': r'invalid index: -7',
-}]
-
-
-class TestDevalue(unittest.TestCase):
-    def test_devalue_parse_equals(self):
-        for tc in TEST_CASES_EQUALS:
-            self.assertEqual(devalue.parse(tc['unparsed']), tc['parsed'], tc['name'])
-
-    def test_devalue_parse_is(self):
-        for tc in TEST_CASES_IS:
-            self.assertIs(devalue.parse(tc['unparsed']), tc['parsed'], tc['name'])
-
-    def test_devalue_parse_invalid(self):
-        for tc in TEST_CASES_INVALID:
-            with self.assertRaisesRegex(tc['error'], tc['pattern'], msg=tc['name']):
-                devalue.parse(tc['unparsed'])
-
-    def test_devalue_parse_cyclical(self):
-        name = 'Map (cyclical)'
-        result = devalue.parse([['Map', 1, 0], 'self'])
-        self.assertEqual(result[0][0], 'self', name)
-        self.assertIs(result, result[0][1], name)
-
-        name = 'Set (cyclical)'
-        result = devalue.parse([['Set', 0, 1], 42])
-        self.assertEqual(result[1], 42, name)
-        self.assertIs(result, result[0], name)
-
-        result = devalue.parse([[0]])
-        self.assertIs(result, result[0], 'Array (cyclical)')
-
-        name = 'Object (cyclical)'
-        result = devalue.parse([{'self': 0}])
-        self.assertIs(result, result['self'], name)
-
-        name = 'Object with null prototype (cyclical)'
-        result = devalue.parse([['null', 'self', 0]])
-        self.assertIs(result, result['self'], name)
-
-        name = 'Objects (cyclical)'
-        result = devalue.parse([[1, 2], {'second': 2}, {'first': 1}])
-        self.assertIs(result[0], result[1]['first'], name)
-        self.assertIs(result[1], result[0]['second'], name)
-
-    def test_devalue_parse_revivers(self):
-        self.assertEqual(
-            devalue.parse([['indirect', 1], {'a': 2}, 'b'], revivers={'indirect': lambda x: x}),
-            {'a': 'b'}, 'revivers (indirect)')
-
-        self.assertEqual(
-            devalue.parse([['parse', 1], '{"a":0}'], revivers={'parse': lambda x: json.loads(x)}),
-            {'a': 0}, 'revivers (parse)')
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_download.py

@@ -10,28 +10,29 @@
 
 import collections
 import hashlib
+import http.client
 import json
+import socket
+import urllib.error
 
 from test.helper import (
     assertGreaterEqual,
-    assertLessEqual,
     expect_info_dict,
     expect_warnings,
     get_params,
     gettestcases,
     getwebpagetestcases,
     is_download_test,
+    report_warning,
     try_rm,
 )
 
 import yt_dlp.YoutubeDL  # isort: split
 from yt_dlp.extractor import get_info_extractor
-from yt_dlp.networking.exceptions import HTTPError, TransportError
 from yt_dlp.utils import (
     DownloadError,
     ExtractorError,
     UnavailableVideoError,
-    YoutubeDLError,
     format_bytes,
     join_nonempty,
 )
@@ -66,6 +67,10 @@ def _file_md5(fn):
 
 @is_download_test
 class TestDownload(unittest.TestCase):
+    # Parallel testing in nosetests. See
+    # http://nose.readthedocs.org/en/latest/doc_tests/test_multiprocess/multiprocess.html
+    _multiprocess_shared_ = True
+
     maxDiff = None
 
     COMPLETED_TESTS = {}
@@ -90,20 +95,18 @@ def test_template(self):
             'playlist', [] if is_playlist else [test_case])
 
         def print_skipping(reason):
-            print('Skipping {}: {}'.format(test_case['name'], reason))
+            print('Skipping %s: %s' % (test_case['name'], reason))
             self.skipTest(reason)
 
         if not ie.working():
             print_skipping('IE marked as not _WORKING')
 
         for tc in test_cases:
-            if tc.get('expected_exception'):
-                continue
             info_dict = tc.get('info_dict', {})
             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')
@@ -113,18 +116,14 @@ def print_skipping(reason):
 
         for other_ie in other_ies:
             if not other_ie.working():
-                print_skipping(f'test depends on {other_ie.ie_key()}IE, marked as not WORKING')
+                print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
 
         params = get_params(test_case.get('params', {}))
         params['outtmpl'] = tname + '_' + params['outtmpl']
         if is_playlist and 'playlist' not in test_case:
-            params.setdefault('playlistend', max(
-                test_case.get('playlist_mincount', -1),
-                test_case.get('playlist_count', -2) + 1,
-                test_case.get('playlist_maxcount', -2) + 1))
+            params.setdefault('extract_flat', 'in_playlist')
+            params.setdefault('playlistend', test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
-            if 'playlist_duration_sum' not in test_case:
-                params.setdefault('extract_flat', 'in_playlist')
 
         ydl = YoutubeDL(params, auto_init=False)
         ydl.add_default_info_extractors()
@@ -141,14 +140,6 @@ def get_tc_filename(tc):
 
         res_dict = None
 
-        def match_exception(err):
-            expected_exception = test_case.get('expected_exception')
-            if not expected_exception:
-                return False
-            if err.__class__.__name__ == expected_exception:
-                return True
-            return any(exc.__class__.__name__ == expected_exception for exc in err.exc_info)
-
         def try_rm_tcs_files(tcs=None):
             if tcs is None:
                 tcs = test_cases
@@ -159,7 +150,6 @@ def try_rm_tcs_files(tcs=None):
                 try_rm(os.path.splitext(tc_filename)[0] + '.info.json')
         try_rm_tcs_files()
         try:
-            test_url = test_case['url']
             try_num = 1
             while True:
                 try:
@@ -167,26 +157,22 @@ def try_rm_tcs_files(tcs=None):
                     # for outside error handling, and returns the exit code
                     # instead of the result dict.
                     res_dict = ydl.extract_info(
-                        test_url,
+                        test_case['url'],
                         force_generic_extractor=params.get('force_generic_extractor', False))
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
-                    if not isinstance(err.exc_info[1], (TransportError, UnavailableVideoError)) or (isinstance(err.exc_info[1], HTTPError) and err.exc_info[1].status == 503):
-                        if match_exception(err):
-                            return
+                    if (err.exc_info[0] not in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine)
+                            or (err.exc_info[0] == urllib.error.HTTPError and err.exc_info[1].code == 503)):
                         err.msg = f'{getattr(err, "msg", err)} ({tname})'
                         raise
 
                     if try_num == RETRIES:
-                        raise
+                        report_warning('%s failed due to network errors, skipping...' % tname)
+                        return
 
                     print(f'Retrying: {try_num} failed tries\n\n##########\n\n')
 
                     try_num += 1
-                except YoutubeDLError as err:
-                    if match_exception(err):
-                        return
-                    raise
                 else:
                     break
 
@@ -195,23 +181,23 @@ def try_rm_tcs_files(tcs=None):
                 self.assertTrue('entries' in res_dict)
                 expect_info_dict(self, res_dict, test_case.get('info_dict', {}))
 
-            num_entries = len(res_dict.get('entries', []))
             if 'playlist_mincount' in test_case:
-                mincount = test_case['playlist_mincount']
                 assertGreaterEqual(
-                    self, num_entries, mincount,
-                    f'Expected at least {mincount} entries in playlist {test_url}, but got only {num_entries}')
+                    self,
+                    len(res_dict['entries']),
+                    test_case['playlist_mincount'],
+                    'Expected at least %d in playlist %s, but got only %d' % (
+                        test_case['playlist_mincount'], test_case['url'],
+                        len(res_dict['entries'])))
             if 'playlist_count' in test_case:
-                count = test_case['playlist_count']
-                got = num_entries if num_entries <= count else 'more'
                 self.assertEqual(
-                    num_entries, count,
-                    f'Expected exactly {count} entries in playlist {test_url}, but got {got}')
-            if 'playlist_maxcount' in test_case:
-                maxcount = test_case['playlist_maxcount']
-                assertLessEqual(
-                    self, num_entries, maxcount,
-                    f'Expected at most {maxcount} entries in playlist {test_url}, but got more')
+                    len(res_dict['entries']),
+                    test_case['playlist_count'],
+                    'Expected %d entries in playlist %s, but got %d.' % (
+                        test_case['playlist_count'],
+                        test_case['url'],
+                        len(res_dict['entries']),
+                    ))
             if 'playlist_duration_sum' in test_case:
                 got_duration = sum(e['duration'] for e in res_dict['entries'])
                 self.assertEqual(
@@ -226,8 +212,6 @@ def try_rm_tcs_files(tcs=None):
                 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):
@@ -240,8 +224,9 @@ def try_rm_tcs_files(tcs=None):
                         got_fsize = os.path.getsize(tc_filename)
                         assertGreaterEqual(
                             self, got_fsize, expected_minsize,
-                            f'Expected {tc_filename} to be at least {format_bytes(expected_minsize)}, '
-                            f'but it\'s only {format_bytes(got_fsize)} ')
+                            'Expected %s to be at least %s, but it\'s only %s ' %
+                            (tc_filename, format_bytes(expected_minsize),
+                                format_bytes(got_fsize)))
                     if 'md5' in tc:
                         md5_for_file = _file_md5(tc_filename)
                         self.assertEqual(tc['md5'], md5_for_file)
@@ -250,7 +235,7 @@ def try_rm_tcs_files(tcs=None):
                 info_json_fn = os.path.splitext(tc_filename)[0] + '.info.json'
                 self.assertTrue(
                     os.path.exists(info_json_fn),
-                    f'Missing info file {info_json_fn}')
+                    'Missing info file %s' % info_json_fn)
                 with open(info_json_fn, encoding='utf-8') as infof:
                     info_dict = json.load(infof)
                 expect_info_dict(self, info_dict, tc.get('info_dict', {}))
@@ -261,7 +246,7 @@ def try_rm_tcs_files(tcs=None):
                 # extractor returns full results even with extract_flat
                 res_tcs = [{'info_dict': e} for e in res_dict['entries']]
                 try_rm_tcs_files(res_tcs)
-            ydl.close()
+
     return test_template
 
 

test/test_downloader_external.py

@@ -1,139 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-import unittest
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import http.cookiejar
-
-from test.helper import FakeYDL
-from yt_dlp.downloader.external import (
-    Aria2cFD,
-    AxelFD,
-    CurlFD,
-    FFmpegFD,
-    HttpieFD,
-    WgetFD,
-)
-
-TEST_COOKIE = {
-    'version': 0,
-    'name': 'test',
-    'value': 'ytdlp',
-    'port': None,
-    'port_specified': False,
-    'domain': '.example.com',
-    'domain_specified': True,
-    'domain_initial_dot': False,
-    'path': '/',
-    'path_specified': True,
-    'secure': False,
-    'expires': None,
-    'discard': False,
-    'comment': None,
-    'comment_url': None,
-    'rest': {},
-}
-
-TEST_INFO = {'url': 'http://www.example.com/'}
-
-
-class TestHttpieFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = HttpieFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test', 'http://www.example.com/', 'Cookie:test=ytdlp'])
-
-
-class TestAxelFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = AxelFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '--', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '-H', 'Cookie: test=ytdlp', '--max-redirect=0', '--', 'http://www.example.com/'])
-
-
-class TestWgetFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = WgetFD(ydl, {})
-            self.assertNotIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE))
-            self.assertIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-
-
-class TestCurlFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = CurlFD(ydl, {})
-            self.assertNotIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE))
-            self.assertIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            self.assertIn('test=ytdlp', downloader._make_cmd('test', TEST_INFO))
-
-
-class TestAria2cFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = Aria2cFD(ydl, {})
-            downloader._make_cmd('test', TEST_INFO)
-            self.assertFalse(hasattr(downloader, '_cookies_tempfile'))
-
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE))
-            cmd = downloader._make_cmd('test', TEST_INFO)
-            self.assertIn(f'--load-cookies={downloader._cookies_tempfile}', cmd)
-
-
-@unittest.skipUnless(FFmpegFD.available(), 'ffmpeg not found')
-class TestFFmpegFD(unittest.TestCase):
-    _args = []
-
-    def _test_cmd(self, args):
-        self._args = args
-
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = FFmpegFD(ydl, {})
-            downloader._debug_cmd = self._test_cmd
-
-            downloader._call_downloader('test', {**TEST_INFO, 'ext': 'mp4'})
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-hide_banner', '-i', 'http://www.example.com/',
-                '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-            # Test cookies arg is added
-            ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE))
-            downloader._call_downloader('test', {**TEST_INFO, 'ext': 'mp4'})
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-hide_banner', '-cookies', 'test=ytdlp; path=/; domain=.example.com;\r\n',
-                '-i', 'http://www.example.com/', '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-            # Test with non-url input (ffmpeg reads from stdin '-' for websockets)
-            downloader._call_downloader('test', {'url': 'x', 'ext': 'mp4'})
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-hide_banner', '-i', 'x', '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-
-if __name__ == '__main__':
-    unittest.main()