[version] update

Created by: pukkandan

:ci skip all

.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[**.py]
-charset = utf-8
-indent_size = 4
-indent_style = space
-trim_trailing_whitespace = true
-insert_final_newline = true

.gitattributes

@@ -2,5 +2,3 @@
 
 Makefile* text whitespace=-tab-in-indent
 *.sh text eol=lf
-*.md diff=markdown
-*.py diff=python

.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,7 @@
-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
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
   - type: checkboxes
     id: checklist
     attributes:
@@ -14,66 +9,54 @@ 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.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+        - label: I've checked that all provided URLs are alive and playable in a browser
           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
     id: region
     attributes:
       label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
+      description: "Enter the region the site is accessible from"
+      placeholder: "India"
   - type: textarea
     id: description
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your issue in an arbitrary form.
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - 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
     id: log
     attributes:
-      label: Complete Verbose Output
+      label: Verbose log
       description: |
-        It should start like this:
+        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
+        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version 2022.03.08 (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [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
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -2,11 +2,6 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
   - type: checkboxes
     id: checklist
     attributes:
@@ -16,23 +11,23 @@ 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.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+        - label: I've checked that all provided URLs are alive and playable in a browser
           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
     id: region
     attributes:
       label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
+      description: "Enter the region the site is accessible from"
+      placeholder: "India"
   - type: textarea
     id: example-urls
     attributes:
@@ -48,44 +43,31 @@ body:
   - type: textarea
     id: description
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide any additional information
+      placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - 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
     id: log
     attributes:
-      label: Complete Verbose Output
+      label: Verbose log
       description: |
-        It should start like this:
+        Provide the complete verbose output **using one of the example URLs provided above**.
+        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version 2022.03.08 (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [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
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -1,12 +1,7 @@
 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
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
   - type: checkboxes
     id: checklist
     attributes:
@@ -14,23 +9,23 @@ 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 requesting a site-specific feature
+        - label: I'm reporting a site feature 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.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+        - label: I've checked that all provided URLs are alive and playable in a browser
           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
     id: region
     attributes:
       label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
+      description: "Enter the region the site is accessible from"
+      placeholder: "India"
   - type: textarea
     id: example-urls
     attributes:
@@ -44,44 +39,33 @@ body:
   - type: textarea
     id: description
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your site feature request in an arbitrary form.
+        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - 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
     id: log
     attributes:
-      label: Complete Verbose Output
+      label: Verbose log
       description: |
-        It should start like this:
+        Provide the complete verbose output of yt-dlp that demonstrates the need for the enhancement.
+        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version 2022.03.08 (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [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
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -1,12 +1,7 @@
-name: Core bug report
+name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
   - type: checkboxes
     id: checklist
     attributes:
@@ -16,53 +11,46 @@ 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.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           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 alive and playable in a browser
           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
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your issue in an arbitrary form.
+        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - 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
     id: log
     attributes:
-      label: Complete Verbose Output
+      label: Verbose log
       description: |
-        It should start like this:
+        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
+        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version 2022.03.08 (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [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
+        yt-dlp is up to date (2022.03.08)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -1,12 +1,7 @@
 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
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
   - type: checkboxes
     id: checklist
     attributes:
@@ -14,54 +9,24 @@ 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 requesting a feature unrelated to a specific site
+        - label: I'm reporting a feature request
           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.03.08**. ([update instructions](https://github.com/yt-dlp/yt-dlp#update))
           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
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your site feature request in an arbitrary form.
+        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  - 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>`)
-        - 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
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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] 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
-        <more lines>
-      render: shell

.github/ISSUE_TEMPLATE/6_question.yml

@@ -1,18 +1,7 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
-  - type: markdown
-    attributes:
-      value: |
-        ### Make sure you are **only** asking a question and not reporting a bug or requesting a feature.
-        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt whether this is the right template, **USE ANOTHER TEMPLATE**!
   - type: checkboxes
     id: checklist
     attributes:
@@ -20,54 +9,45 @@ 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 asking a question and **not** reporting a bug or requesting a feature
+        - label: I'm asking a question and **not** reporting a bug/feature request
           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 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 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
-          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 searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions including closed ones
           required: true
   - type: textarea
     id: question
     attributes:
-      label: Please make sure the question is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information and as much context and examples as possible
+      label: Question
+      description: |
+        Ask your question in an arbitrary form.
+        Please make sure it's worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information and as much context and examples as possible.
+        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
+        If you are in doubt if this is the right template, use another template!
+      placeholder: WRITE QUESTION HERE
     validations:
       required: true
-  - 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>`)
-        - 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
     attributes:
-      label: Complete Verbose Output
+      label: Verbose log
       description: |
-        It should start like this:
+        If your question involes a yt-dlp command, provide the complete verbose output of that command.
+        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version 2021.12.01 (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
         [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
+        yt-dlp is up to date (2021.12.01)
         <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,8 +1,7 @@
-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
   - type: checkboxes
     id: checklist
     attributes:
@@ -10,31 +9,55 @@ 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))
           required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+        - label: I've checked that all provided URLs are alive and playable in a browser
           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
     id: region
     attributes:
       label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
+      description: "Enter the region the site is accessible from"
+      placeholder: "India"
   - type: textarea
     id: description
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your issue in an arbitrary form.
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Verbose log
+      description: |
+        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
+        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
+      placeholder: |
+        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version %(version)s (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
+        [debug] Proxy map: {}
+        yt-dlp is up to date (%(version)s)
+        <more lines>
+      render: shell
     validations:
       required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -2,7 +2,6 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
-  %(no_skip)s
   - type: checkboxes
     id: checklist
     attributes:
@@ -12,23 +11,23 @@ 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))
           required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+        - label: I've checked that all provided URLs are alive and playable in a browser
           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
     id: region
     attributes:
       label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
+      description: "Enter the region the site is accessible from"
+      placeholder: "India"
   - type: textarea
     id: example-urls
     attributes:
@@ -44,9 +43,32 @@ body:
   - type: textarea
     id: description
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide any additional information
+      placeholder: WRITE DESCRIPTION HERE
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Verbose log
+      description: |
+        Provide the complete verbose output **using one of the example URLs provided above**.
+        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
+      placeholder: |
+        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version %(version)s (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
+        [debug] Proxy map: {}
+        yt-dlp is up to date (%(version)s)
+        <more lines>
+      render: shell
     validations:
       required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -1,8 +1,7 @@
 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
   - type: checkboxes
     id: checklist
     attributes:
@@ -10,23 +9,23 @@ 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 requesting a site-specific feature
+        - label: I'm reporting a site feature 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))
           required: true
-        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+        - label: I've checked that all provided URLs are alive and playable in a browser
           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
     id: region
     attributes:
       label: Region
-      description: Enter the country/region that the site is accessible from
-      placeholder: India
+      description: "Enter the region the site is accessible from"
+      placeholder: "India"
   - type: textarea
     id: example-urls
     attributes:
@@ -40,9 +39,34 @@ body:
   - type: textarea
     id: description
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your site feature request in an arbitrary form.
+        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Verbose log
+      description: |
+        Provide the complete verbose output of yt-dlp that demonstrates the need for the enhancement.
+        Add the `-vU` flag to your command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
+      placeholder: |
+        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version %(version)s (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
+        [debug] Proxy map: {}
+        yt-dlp is up to date (%(version)s)
+        <more lines>
+      render: shell
     validations:
       required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -1,8 +1,7 @@
-name: Core bug report
+name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
-  %(no_skip)s
   - type: checkboxes
     id: checklist
     attributes:
@@ -12,18 +11,47 @@ 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))
           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 alive and playable in a browser
           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
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your issue in an arbitrary form.
+        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Verbose log
+      description: |
+        Provide the complete verbose output of yt-dlp **that clearly demonstrates the problem**.
+        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
+      placeholder: |
+        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version %(version)s (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
+        [debug] Proxy map: {}
+        yt-dlp is up to date (%(version)s)
+        <more lines>
+      render: shell
     validations:
       required: true
-  %(verbose)s

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -1,8 +1,7 @@
 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
   - type: checkboxes
     id: checklist
     attributes:
@@ -10,22 +9,24 @@ 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 requesting a feature unrelated to a specific site
+        - label: I'm reporting a feature request
           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))
           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
     attributes:
-      label: Provide a description that is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+      label: Description
+      description: |
+        Provide an explanation of your site feature request in an arbitrary form.
+        Please make sure the description is worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information, any suggested solutions, and as much context and examples as possible
+      placeholder: WRITE DESCRIPTION HERE
     validations:
       required: true
-  %(verbose_optional)s

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -1,14 +1,7 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
-  %(no_skip)s
-  - type: markdown
-    attributes:
-      value: |
-        ### Make sure you are **only** asking a question and not reporting a bug or requesting a feature.
-        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt whether this is the right template, **USE ANOTHER TEMPLATE**!
   - type: checkboxes
     id: checklist
     attributes:
@@ -16,22 +9,45 @@ 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 asking a question and **not** reporting a bug or requesting a feature
+        - label: I'm asking a question and **not** reporting a bug/feature request
           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 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 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
-          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 searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions including closed ones
           required: true
   - type: textarea
     id: question
     attributes:
-      label: Please make sure the question is worded well enough to be understood
-      description: See [is-the-description-of-the-issue-itself-sufficient](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-description-of-the-issue-itself-sufficient)
-      placeholder: Provide any additional information and as much context and examples as possible
+      label: Question
+      description: |
+        Ask your question in an arbitrary form.
+        Please make sure it's worded well enough to be understood, see [is-the-description-of-the-issue-itself-sufficient](https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient).
+        Provide any additional information and as much context and examples as possible.
+        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
+        If you are in doubt if this is the right template, use another template!
+      placeholder: WRITE QUESTION HERE
     validations:
       required: true
-  %(verbose_optional)s
+  - type: textarea
+    id: log
+    attributes:
+      label: Verbose log
+      description: |
+        If your question involes a yt-dlp command, provide the complete verbose output of that command.
+        Add the `-vU` flag to **your** command line you run yt-dlp with (`yt-dlp -vU <your command line>`), copy the WHOLE output and insert it below.
+        It should look similar to this:
+      placeholder: |
+        [debug] Command-line config: ['-vU', 'http://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Portable config file: yt-dlp.conf
+        [debug] Portable config: ['-i']
+        [debug] Encodings: locale cp1252, fs utf-8, stdout utf-8, stderr utf-8, pref cp1252
+        [debug] yt-dlp version 2021.12.01 (exe)
+        [debug] Python version 3.8.8 (CPython 64bit) - Windows-10-10.0.19041-SP0
+        [debug] exe versions: ffmpeg 3.0.1, ffprobe 3.0.1
+        [debug] Optional libraries: Cryptodome, keyring, mutagen, sqlite, websockets
+        [debug] Proxy map: {}
+        yt-dlp is up to date (2021.12.01)
+        <more lines>
+      render: shell

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,44 +1,28 @@
-<!--
-    **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 follow the guide below
 
-    PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.
--->
+- 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 that [x])
+- Use *Preview* tab to see how your *pull request* will actually look like
 
-### Description of your *pull request* and other information
-
-ADD DETAILED DESCRIPTION HERE
-
-Fixes #
-
-
-<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
--->
+---
 
 ### 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)
 
-### 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:
-- [ ] 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))
+### What is the purpose of your *pull request*?
+- [ ] Bug fix
+- [ ] Improvement
+- [ ] New extractor
+- [ ] New feature
 
-</details>
+---
+
+### Description of your *pull request* and other information
+
+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.

.github/actionlint.yml

@@ -1,22 +0,0 @@
-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/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
@@ -37,55 +8,24 @@ jobs:
     strategy:
       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]
+        os: [ubuntu-18.04]
+        # py3.9 is in quick-test
+        python-version: [3.7, 3.8, 3.10-dev, pypy-3.6, pypy-3.7]
+        run-tests-ext: [sh]
         include:
-        # atleast one of each CPython/PyPy tests must be in windows
+        # atleast one of the tests must be in windows
         - os: windows-latest
-          python-version: '3.10'
-        - 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: 3.6
+          run-tests-ext: bat
     steps:
-    - uses: actions/checkout@v5
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v2
       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,48 +1,28 @@
 name: Download Tests
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
-  quick:
-    name: Quick Download Tests
+  tests:
+    name: Download Tests
     if: "contains(github.event.head_commit.message, 'ci run dl')"
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-    - name: Set up Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: '3.10'
-    - name: Install test requirements
-      run: python ./devscripts/install_deps.py --include-group dev
-    - name: Run tests
-      continue-on-error: true
-      run: python ./devscripts/run_tests.py download
-
-  full:
-    name: Full Download Tests
-    if: "contains(github.event.head_commit.message, 'ci run dl all')"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        python-version: ['3.11', '3.12', '3.13', '3.14', pypy-3.11]
+        os: [ubuntu-18.04]
+        python-version: [3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
+        run-tests-ext: [sh]
         include:
-        # atleast one of each CPython/PyPy tests must be in windows
         - os: windows-latest
-          python-version: '3.10'
-        - os: windows-latest
-          python-version: pypy-3.11
+          python-version: 3.6
+          run-tests-ext: bat
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v2
       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@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
       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@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
       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.8"
-  ACTIONLINT_SHA256SUM: be92c2652ab7b6d08425428797ceabeb16e31a781c07bc388456b4e592f3e36a
-  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

@@ -27,13 +27,10 @@ cookies
 *.ass
 *.avi
 *.desktop
-*.f4v
 *.flac
 *.flv
-*.gif
 *.jpeg
 *.jpg
-*.lrc
 *.m4a
 *.m4v
 *.mhtml
@@ -41,17 +38,13 @@ cookies
 *.mov
 *.mp3
 *.mp4
-*.mpg
-*.mpga
-*.oga
 *.ogg
 *.opus
 *.png
 *.sbv
 *.srt
-*.ssa
 *.swf
-*.tt
+*.swp
 *.ttml
 *.url
 *.vtt
@@ -66,7 +59,7 @@ cookies
 # Python
 *.pyc
 *.pyo
-.*_cache
+.pytest_cache
 wine-py2exe/
 py2exe.log
 build/
@@ -74,7 +67,6 @@ dist/
 zip/
 tmp/
 venv/
-.venv/
 completions/
 
 # Misc
@@ -90,9 +82,6 @@ updates_key.pem
 *.egg-info
 .tox
 *.class
-*.isorted
-*.stackdump
-uv.lock
 
 # Generated
 AUTHORS
@@ -105,9 +94,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 +108,11 @@ 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

.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

.readthedocs.yml

@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+    configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF
+formats:
+    - epub
+    - pdf
+    - htmlzip
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+    version: 3
+    install:
+    - requirements: docs/requirements.txt

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,88 @@ ### 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-group 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
+    # coding: utf-8
     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 (for example 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 +215,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).
+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.6 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 +247,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` - Eg: 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 +273,7 @@ #### Example
 ```python
 meta = self._download_json(url, video_id)
 ```
-
+    
 Assume at this point `meta`'s layout is:
 
 ```python
@@ -363,10 +301,14 @@ #### Example
 The latter will break extraction process with `KeyError` if `summary` disappears from `meta` at some later time but with the former approach extraction will just go ahead with `description` set to `None` which is perfectly fine (remember `None` is equivalent to the absence of data).
 
 
-If the data is nested, do not use `.get` chains, but instead make use of `traverse_obj`.
+If the data is nested, do not use `.get` chains, but instead make use of the utility functions `try_get` or `traverse_obj`
 
 Considering the above `meta` again, assume you want to extract `["user"]["name"]` and put it in the resulting info dict as `uploader`
 
+```python
+uploader = try_get(meta, lambda x: x['user']['name'])  # correct
+```
+or
 ```python
 uploader = traverse_obj(meta, ('user', 'name'))  # correct
 ```
@@ -380,10 +322,6 @@ #### Example
 ```python
 uploader = meta.get('user', {}).get('name')  # incorrect
 ```
-or
-```python
-uploader = try_get(meta, lambda x: x['user']['name'])  # old utility
-```
 
 
 Similarly, you should pass `fatal=False` when extracting optional data from a webpage with `_search_regex`, `_html_search_regex` or similar methods, for instance:
@@ -409,42 +347,26 @@ #### Example
 
 Another thing to remember is not to try to iterate over `None`
 
-Say you extracted a list of thumbnails into `thumbnail_data` and want to iterate over them
+Say you extracted a list of thumbnails into `thumbnail_data` using `try_get` and now want to iterate over them
 
 ```python
-thumbnail_data = data.get('thumbnails') or []
+thumbnail_data = try_get(...)
 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 or []]  # correct
 ```
 
 and not like:
 
 ```python
-thumbnail_data = data.get('thumbnails')
+thumbnail_data = try_get(...)
 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.
+In the later 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 `for item in thumbnail_data 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
 
@@ -453,21 +375,21 @@ ### Provide fallbacks
 
 #### Example
 
-Say `meta` from the previous example has a `title` and you are about to extract it like:
+Say `meta` from the previous example has a `title` and you are about to extract it. Since `title` is a mandatory meta field you should end up with something like:
 
 ```python
-title = meta.get('title')
+title = meta['title']
 ```
 
-If `title` disappears from `meta` in future due to some changes on the hoster's side the title extraction would fail.
+If `title` disappears from `meta` in future due to some changes on the hoster's side the extraction would fail since `title` is mandatory. That's expected.
 
-Assume that you have some another source you can extract `title` from, for example `og:title` HTML meta of a `webpage`. In this case you can provide a fallback like:
+Assume that you have some another source you can extract `title` from, for example `og:title` HTML meta of a `webpage`. In this case you can provide a fallback scenario:
 
 ```python
 title = meta.get('title') or self._og_search_title(webpage)
 ```
 
-This code will try to extract from `meta` first and if it fails it will try extracting `og:title` from a `webpage`, making the extractor more robust.
+This code will try to extract from `meta` first and if it fails it will try extracting `og:title` from a `webpage`.
 
 
 ### Regular expressions
@@ -510,7 +432,7 @@ ##### Example
     r'<span[^>]+class="title"[^>]*>([^<]+)', webpage, 'title')
 ```
 
-which tolerates potential changes in the `style` attribute's value. Or even better:
+Or even better:
 
 ```python
 title = self._search_regex(  # correct
@@ -518,7 +440,7 @@ ##### Example
     webpage, 'title', group='title')
 ```
 
-which also handles both single quotes in addition to double quotes.
+Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute: 
 
 The code definitely should not look like:
 
@@ -536,42 +458,7 @@ ##### Example
     webpage, 'title', group='title')
 ```
 
-Here the presence or absence of other attributes including `style` is irrelevant for the data we need, and so the regex must not depend on it
-
-
-#### Keep the regular expressions as simple as possible, but no simpler
-
-Since many extractors deal with unstructured data provided by websites, we will often need to use very complex regular expressions. You should try to use the *simplest* regex that can accomplish what you want. In other words, each part of the regex must have a reason for existing. If you can take out a symbol and the functionality does not change, the symbol should not be there.
-
-##### Example
-
-Correct:
-
-```python
-_VALID_URL = r'https?://(?:www\.)?website\.com/(?:[^/]+/){3,4}(?P<display_id>[^/]+)_(?P<id>\d+)'
-```
-
-Incorrect:
-
-```python
-_VALID_URL = r'https?:\/\/(?:www\.)?website\.com\/[^\/]+/[^\/]+/[^\/]+(?:\/[^\/]+)?\/(?P<display_id>[^\/]+)_(?P<id>\d+)'
-```
-
-#### Do not misuse `.` and use the correct quantifiers (`+*?`)
-
-Avoid creating regexes that over-match because of wrong use of quantifiers. Also try to avoid non-greedy matching (`?`) where possible since they could easily result in [catastrophic backtracking](https://www.regular-expressions.info/catastrophic.html)
-
-Correct:
-
-```python
-title = self._search_regex(r'<span\b[^>]+class="title"[^>]*>([^<]+)', webpage, 'title')
-```
-
-Incorrect:
-
-```python
-title = self._search_regex(r'<span\b.*class="title".*>(.+?)<', webpage, 'title')
-```
+Here the presence or absence of other attributes including `style` is irrelevent for the data we need, and so the regex must not depend on it
 
 
 ### Long lines policy
@@ -580,7 +467,7 @@ ### Long lines policy
 
 For example, you should **never** split long string literals like URLs or some other often copied entities over multiple lines to fit this limit:
 
-Conversely, don't unnecessarily split small lines further. As a rule of thumb, if removing the line split keeps the code under 80 characters, it should be a single line.
+Conversely, don't unecessarily split small lines further. As a rule of thumb, if removing the line split keeps the code under 80 characters, it should be a single line.
 
 ##### Examples
 
@@ -635,35 +522,27 @@ ##### Examples
 
 ### Quotes
 
-Always use single quotes for strings (even if the string has `'`) and double quotes for docstrings. Use `'''` only for multi-line strings. An exception can be made if a string has multiple single quotes in it and escaping makes it *significantly* harder to read. For f-strings, use you can use double quotes on the inside. But avoid f-strings that have too many quotes inside.
+Always use single quotes for strings (even if the string has `'`) and double quotes for docstrings. Use `'''` only for multi-line strings. An exception can be made if a string has multiple single quotes in it and escaping makes it significantly harder to read. For f-strings, use you can use double quotes on the inside. But avoid f-strings that have too many quotes inside.
 
 
 ### Inline values
 
 Extracting variables is acceptable for reducing code duplication and improving readability of complex expressions. However, you should avoid extracting variables used only once and moving them to opposite parts of the extractor file, which makes reading the linear flow difficult.
 
-#### Examples
+#### Example
 
 Correct:
 
 ```python
-return {
-    'title': self._html_search_regex(r'<h1>([^<]+)</h1>', webpage, 'title'),
-    # ...some lines of code...
-}
+title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
 ```
 
 Incorrect:
 
 ```python
-TITLE_RE = r'<h1>([^<]+)</h1>'
+TITLE_RE = r'<title>([^<]+)</title>'
 # ...some lines of code...
 title = self._html_search_regex(TITLE_RE, webpage, 'title')
-# ...some lines of code...
-return {
-    'title': title,
-    # ...some lines of code...
-}
 ```
 
 
@@ -695,32 +574,33 @@ #### Example
 
 ### Trailing parentheses
 
-Always move trailing parentheses used for grouping/functions after the last argument. On the other hand, multi-line literal list/tuple/dict/set should closed be in a new line. Generators and list/dict comprehensions may use either style
+Always move trailing parentheses used for grouping/functions after the last argument. On the other hand, literal list/tuple/dict/set should closed be in a new line. Generators and list/dict comprehensions may use either style
 
 #### Examples
 
 Correct:
 
 ```python
-url = traverse_obj(info, (
-    'context', 'dispatcher', 'stores', 'VideoTitlePageStore', 'data', 'video', 0, 'VideoUrlSet', 'VideoUrl'), list)
+url = try_get(
+    info,
+    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
+    list)
 ```
 Correct:
 
 ```python
-url = traverse_obj(
-    info,
-    ('context', 'dispatcher', 'stores', 'VideoTitlePageStore', 'data', 'video', 0, 'VideoUrlSet', 'VideoUrl'),
-    list)
+url = try_get(info,
+              lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
+              list)
 ```
 
 Incorrect:
 
 ```python
-url = traverse_obj(
+url = try_get(
     info,
-    ('context', 'dispatcher', 'stores', 'VideoTitlePageStore', 'data', 'video', 0, 'VideoUrlSet', 'VideoUrl'),
-    list
+    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
+    list,
 )
 ```
 
@@ -759,31 +639,37 @@ #### 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 `try_get`, `dict_get` and `traverse_obj` 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
+#### More examples
 
+##### Safely extract optional description from parsed JSON
 ```python
 description = traverse_obj(response, ('result', 'video', 'summary'), expected_type=str)
-thumbnails = traverse_obj(response, ('result', 'thumbnails', ..., 'url'), expected_type=url_or_none)
+```
+
+##### Safely extract more optional metadata
+```python
 video = traverse_obj(response, ('result', 'video', 0), default={}, expected_type=dict)
+description = video.get('summary')
 duration = float_or_none(video.get('durationMs'), scale=1000)
 view_count = int_or_none(video.get('views'))
 ```
 
-
-## 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
@@ -216,621 +214,3 @@ pycabbage
 regarten
 Ronnnny
 schn0sch
-s0u1h
-MrRawes
-cffswb
-danielyli
-1-Byte
-mehq
-dzek69
-aaearon
-panatexxa
-kmark
-un-def
-goggle
-Soebb
-Fam0r
-bohwaz
-dodrian
-vvto33
-ca-za
-connercsbn
-diegorodriguezv
-ekangmonyet
-elyse0
-evansp
-GiedriusS
-HE7086
-JordanWeatherby
-m4tu4g
-MarwenDallel
-nevack
-putnam
-rand-net
-vertan
-Wikidepia
-Yipten
-moench-tegeder
-christoph-heinrich
-HobbyistDev
-LunarFang416
-sbor23
-aurelg
-adamanldo
-gamer191
-vkorablin
-Burve
-mnn
-ZhymabekRoman
-mozbugbox
-aejdl
-ping
-sqrtNOT
-bubbleguuum
-darkxex
-miseran
-StefanLobbenmeier
-crazymoose77756
-nomevi
-Brett824
-pingiun
-dosy4ev
-EhtishamSabir
-Ferdi265
-FirefoxMetzger
-ftk
-lamby
-llamasblade
-lockmatrix
-misaelaguayo
-odo2063
-pritam20ps05
-scy
-sheerluck
-AxiosDeminence
-DjesonPV
-eren-kemer
-freezboltz
-Galiley
-haobinliang
-Mehavoid
-winterbird-code
-yashkc2025
-aldoridhoni
-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
-CaramelConnoisseur
-ctengel
-einstein95
-evilpie
-i3p9
-JrM2628
-krystophny
-matyb08
-pha1n0q
-PierceLBrooks
-sepro
-TheQWERTYCodr
-thomasmllt
-w4grfw
-WeidiDeng
-Zer0spectrum

Collaborators.md

@@ -0,0 +1,50 @@
+# 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 downloading YoutubeWebArchive videos
+
+
+
+## [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
+
+
+## [Lesmiscore](https://github.com/Lesmiscore) (nao20010128nao)
+
+**Bitcoin**: bc1qfd02r007cutfdjwjmyy9w23rjvtls6ncve7r3s  
+**Monacoin**: mona1q3tf7dzvshrhfe3md379xtvt2n22duhglv5dskr
+
+* Download live from start to end for YouTube
+* Added support for new websites mildom, PixivSketch, skeb, radiko, voicy, mirrativ, openrec, whowatch, damtomo, 17.live, mixch etc

MANIFEST.in

@@ -0,0 +1,9 @@
+include AUTHORS
+include Changelog.md
+include LICENSE
+include README.md
+include completions/*/*
+include supportedsites.md
+include yt-dlp.1
+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,41 +1,28 @@
 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 .
-pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \
-            completions yt-dlp.1 pyproject.toml devscripts/* test/*
+# make pypi-files && python setup.py sdist
+pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites completions yt-dlp.1 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 *.flac *.flv *.jpeg *.jpg *.m4a *.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" \
-	\) -prune -exec rm -rf {} \;
+	find . \( -name "*.pyc" -o -name "*.class" \) -delete
 
 completion-bash: completions/bash/yt-dlp
 completion-fish: completions/fish/yt-dlp.fish
@@ -43,96 +30,54 @@ 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)
-	install -m755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp
-	mkdir -p $(DESTDIR)$(MANDIR)/man1
-	install -m644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
-	mkdir -p $(DESTDIR)$(SHAREDIR)/bash-completion/completions
-	install -m644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
-	mkdir -p $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-	install -m644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
-	mkdir -p $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d
-	install -m644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
-
-uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/yt-dlp
-	rm -f $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
-	rm -f $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
-	rm -f $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
-	rm -f $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
+	install -Dm755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp
+	install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
+	install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
+	install -Dm644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
+	install -Dm644 completions/fish/yt-dlp.fish $(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)
+yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
 	mkdir -p zip
-	for d in $(PY_CODE_FOLDERS) ; do \
+	for d in yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor ; 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
+	mv zip/yt_dlp/__main__.py zip/
+	cd zip ; zip -q ../yt-dlp 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
-	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --ignore-config --help | $(PYTHON) devscripts/make_readme.py
+README.md: yt_dlp/*.py yt_dlp/*/*.py
+	COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --help | $(PYTHON) devscripts/make_readme.py
 
-CONTRIBUTING.md: README.md devscripts/make_contributing.py
+CONTRIBUTING.md: README.md
 	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
 
 issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml yt_dlp/version.py
@@ -149,95 +94,45 @@ supportedsites:
 README.txt: README.md
 	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-yt-dlp.1: README.md devscripts/prepare_manpage.py
+yt-dlp.1: README.md
 	$(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md
 	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 -iname '*.py' -and -not -iname '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 '.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 tox.ini pytest.ini
 
-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

bundle/pyinstaller.py

@@ -1,142 +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 platform
-
-from PyInstaller.__main__ import run as run_pyinstaller
-
-from devscripts.utils import read_version
-
-OS_NAME, MACHINE, ARCH = sys.platform, platform.machine().lower(), platform.architecture()[0][:2]
-if OS_NAME == 'linux' and platform.libc_ver()[0] != 'glibc':
-    OS_NAME = 'musllinux'
-if MACHINE in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
-    MACHINE = 'x86' if ARCH == '32' else ''
-
-
-def main():
-    opts, version = parse_options(), read_version()
-
-    onedir = '--onedir' in opts or '-D' in opts
-    if not onedir and '-F' not in opts and '--onefile' not in opts:
-        opts.append('--onefile')
-
-    name, final_file = exe(onedir)
-    print(f'Building yt-dlp v{version} for {OS_NAME} {platform.machine()} with options {opts}')
-    print('Remember to update the version using  "devscripts/update-version.py"')
-    if not os.path.isfile('yt_dlp/extractor/lazy_extractors.py'):
-        print('WARNING: Building without lazy_extractors. Run  '
-              '"devscripts/make_lazy_extractors.py"  to build lazy extractors', file=sys.stderr)
-    print(f'Destination: {final_file}\n')
-
-    opts = [
-        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',
-        *opts,
-        'yt_dlp/__main__.py',
-    ]
-
-    print(f'Running PyInstaller with {opts}')
-    run_pyinstaller(opts)
-    set_version_info(final_file, version)
-
-
-def parse_options():
-    # Compatibility with older arguments
-    opts = sys.argv[1:]
-    if opts[0:1] in (['32'], ['64']):
-        if ARCH != opts[0]:
-            raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system')
-        opts = opts[1:]
-    return opts
-
-
-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,
-    )))
-
-    return name, ''.join(filter(None, (
-        'dist/',
-        onedir and f'{name}/',
-        name,
-        extension,
-    )))
-
-
-def version_to_list(version):
-    version_list = version.split('.')
-    return list(map(int, version_list)) + [0] * (4 - len(version_list))
-
-
-def set_version_info(exe, version):
-    if OS_NAME == 'win32':
-        windows_set_version(exe, version)
-
-
-def windows_set_version(exe, version):
-    from PyInstaller.utils.win32.versioninfo import (
-        FixedFileInfo,
-        StringFileInfo,
-        StringStruct,
-        StringTable,
-        VarFileInfo,
-        VarStruct,
-        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(
-        ffi=FixedFileInfo(
-            filevers=version_list,
-            prodvers=version_list,
-            mask=0x3F,
-            flags=0x0,
-            OS=0x4,
-            fileType=0x1,
-            subtype=0x0,
-            date=(0, 0),
-        ),
-        kids=[
-            StringFileInfo([StringTable('040904B0', [
-                StringStruct('Comments', f'yt-dlp{suffix} Command Line Interface'),
-                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('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])]),
-        ],
-    ))
-
-
-if __name__ == '__main__':
-    main()

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

@@ -1,16 +1,15 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
 
-# Allow direct execution
 import os
+from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 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,11 +20,11 @@ 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)
 
 
-parser = yt_dlp.parseOpts(ignore_config_files=True)[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)

devscripts/buildserver.py

@@ -0,0 +1,435 @@
+# UNUSED
+
+#!/usr/bin/python3
+
+import argparse
+import ctypes
+import functools
+import shutil
+import subprocess
+import sys
+import tempfile
+import threading
+import traceback
+import os.path
+
+sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
+from yt_dlp.compat import (
+    compat_input,
+    compat_http_server,
+    compat_str,
+    compat_urlparse,
+)
+
+# These are not used outside of buildserver.py thus not in compat.py
+
+try:
+    import winreg as compat_winreg
+except ImportError:  # Python 2
+    import _winreg as compat_winreg
+
+try:
+    import socketserver as compat_socketserver
+except ImportError:  # Python 2
+    import SocketServer as compat_socketserver
+
+
+class BuildHTTPServer(compat_socketserver.ThreadingMixIn, compat_http_server.HTTPServer):
+    allow_reuse_address = True
+
+
+advapi32 = ctypes.windll.advapi32
+
+SC_MANAGER_ALL_ACCESS = 0xf003f
+SC_MANAGER_CREATE_SERVICE = 0x02
+SERVICE_WIN32_OWN_PROCESS = 0x10
+SERVICE_AUTO_START = 0x2
+SERVICE_ERROR_NORMAL = 0x1
+DELETE = 0x00010000
+SERVICE_STATUS_START_PENDING = 0x00000002
+SERVICE_STATUS_RUNNING = 0x00000004
+SERVICE_ACCEPT_STOP = 0x1
+
+SVCNAME = 'youtubedl_builder'
+
+LPTSTR = ctypes.c_wchar_p
+START_CALLBACK = ctypes.WINFUNCTYPE(None, ctypes.c_int, ctypes.POINTER(LPTSTR))
+
+
+class SERVICE_TABLE_ENTRY(ctypes.Structure):
+    _fields_ = [
+        ('lpServiceName', LPTSTR),
+        ('lpServiceProc', START_CALLBACK)
+    ]
+
+
+HandlerEx = ctypes.WINFUNCTYPE(
+    ctypes.c_int,     # return
+    ctypes.c_int,     # dwControl
+    ctypes.c_int,     # dwEventType
+    ctypes.c_void_p,  # lpEventData,
+    ctypes.c_void_p,  # lpContext,
+)
+
+
+def _ctypes_array(c_type, py_array):
+    ar = (c_type * len(py_array))()
+    ar[:] = py_array
+    return ar
+
+
+def win_OpenSCManager():
+    res = advapi32.OpenSCManagerW(None, None, SC_MANAGER_ALL_ACCESS)
+    if not res:
+        raise Exception('Opening service manager failed - '
+                        'are you running this as administrator?')
+    return res
+
+
+def win_install_service(service_name, cmdline):
+    manager = win_OpenSCManager()
+    try:
+        h = advapi32.CreateServiceW(
+            manager, service_name, None,
+            SC_MANAGER_CREATE_SERVICE, SERVICE_WIN32_OWN_PROCESS,
+            SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
+            cmdline, None, None, None, None, None)
+        if not h:
+            raise OSError('Service creation failed: %s' % ctypes.FormatError())
+
+        advapi32.CloseServiceHandle(h)
+    finally:
+        advapi32.CloseServiceHandle(manager)
+
+
+def win_uninstall_service(service_name):
+    manager = win_OpenSCManager()
+    try:
+        h = advapi32.OpenServiceW(manager, service_name, DELETE)
+        if not h:
+            raise OSError('Could not find service %s: %s' % (
+                service_name, ctypes.FormatError()))
+
+        try:
+            if not advapi32.DeleteService(h):
+                raise OSError('Deletion failed: %s' % ctypes.FormatError())
+        finally:
+            advapi32.CloseServiceHandle(h)
+    finally:
+        advapi32.CloseServiceHandle(manager)
+
+
+def win_service_report_event(service_name, msg, is_error=True):
+    with open('C:/sshkeys/log', 'a', encoding='utf-8') as f:
+        f.write(msg + '\n')
+
+    event_log = advapi32.RegisterEventSourceW(None, service_name)
+    if not event_log:
+        raise OSError('Could not report event: %s' % ctypes.FormatError())
+
+    try:
+        type_id = 0x0001 if is_error else 0x0004
+        event_id = 0xc0000000 if is_error else 0x40000000
+        lines = _ctypes_array(LPTSTR, [msg])
+
+        if not advapi32.ReportEventW(
+                event_log, type_id, 0, event_id, None, len(lines), 0,
+                lines, None):
+            raise OSError('Event reporting failed: %s' % ctypes.FormatError())
+    finally:
+        advapi32.DeregisterEventSource(event_log)
+
+
+def win_service_handler(stop_event, *args):
+    try:
+        raise ValueError('Handler called with args ' + repr(args))
+        TODO
+    except Exception as e:
+        tb = traceback.format_exc()
+        msg = str(e) + '\n' + tb
+        win_service_report_event(service_name, msg, is_error=True)
+        raise
+
+
+def win_service_set_status(handle, status_code):
+    svcStatus = SERVICE_STATUS()
+    svcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS
+    svcStatus.dwCurrentState = status_code
+    svcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP
+
+    svcStatus.dwServiceSpecificExitCode = 0
+
+    if not advapi32.SetServiceStatus(handle, ctypes.byref(svcStatus)):
+        raise OSError('SetServiceStatus failed: %r' % ctypes.FormatError())
+
+
+def win_service_main(service_name, real_main, argc, argv_raw):
+    try:
+        # args = [argv_raw[i].value for i in range(argc)]
+        stop_event = threading.Event()
+        handler = HandlerEx(functools.partial(stop_event, win_service_handler))
+        h = advapi32.RegisterServiceCtrlHandlerExW(service_name, handler, None)
+        if not h:
+            raise OSError('Handler registration failed: %s' %
+                          ctypes.FormatError())
+
+        TODO
+    except Exception as e:
+        tb = traceback.format_exc()
+        msg = str(e) + '\n' + tb
+        win_service_report_event(service_name, msg, is_error=True)
+        raise
+
+
+def win_service_start(service_name, real_main):
+    try:
+        cb = START_CALLBACK(
+            functools.partial(win_service_main, service_name, real_main))
+        dispatch_table = _ctypes_array(SERVICE_TABLE_ENTRY, [
+            SERVICE_TABLE_ENTRY(
+                service_name,
+                cb
+            ),
+            SERVICE_TABLE_ENTRY(None, ctypes.cast(None, START_CALLBACK))
+        ])
+
+        if not advapi32.StartServiceCtrlDispatcherW(dispatch_table):
+            raise OSError('ctypes start failed: %s' % ctypes.FormatError())
+    except Exception as e:
+        tb = traceback.format_exc()
+        msg = str(e) + '\n' + tb
+        win_service_report_event(service_name, msg, is_error=True)
+        raise
+
+
+def main(args=None):
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-i', '--install',
+                        action='store_const', dest='action', const='install',
+                        help='Launch at Windows startup')
+    parser.add_argument('-u', '--uninstall',
+                        action='store_const', dest='action', const='uninstall',
+                        help='Remove Windows service')
+    parser.add_argument('-s', '--service',
+                        action='store_const', dest='action', const='service',
+                        help='Run as a Windows service')
+    parser.add_argument('-b', '--bind', metavar='<host:port>',
+                        action='store', default='0.0.0.0:8142',
+                        help='Bind to host:port (default %default)')
+    options = parser.parse_args(args=args)
+
+    if options.action == 'install':
+        fn = os.path.abspath(__file__).replace('v:', '\\\\vboxsrv\\vbox')
+        cmdline = '%s %s -s -b %s' % (sys.executable, fn, options.bind)
+        win_install_service(SVCNAME, cmdline)
+        return
+
+    if options.action == 'uninstall':
+        win_uninstall_service(SVCNAME)
+        return
+
+    if options.action == 'service':
+        win_service_start(SVCNAME, main)
+        return
+
+    host, port_str = options.bind.split(':')
+    port = int(port_str)
+
+    print('Listening on %s:%d' % (host, port))
+    srv = BuildHTTPServer((host, port), BuildHTTPRequestHandler)
+    thr = threading.Thread(target=srv.serve_forever)
+    thr.start()
+    compat_input('Press ENTER to shut down')
+    srv.shutdown()
+    thr.join()
+
+
+def rmtree(path):
+    for name in os.listdir(path):
+        fname = os.path.join(path, name)
+        if os.path.isdir(fname):
+            rmtree(fname)
+        else:
+            os.chmod(fname, 0o666)
+            os.remove(fname)
+    os.rmdir(path)
+
+
+class BuildError(Exception):
+    def __init__(self, output, code=500):
+        self.output = output
+        self.code = code
+
+    def __str__(self):
+        return self.output
+
+
+class HTTPError(BuildError):
+    pass
+
+
+class PythonBuilder(object):
+    def __init__(self, **kwargs):
+        python_version = kwargs.pop('python', '3.4')
+        python_path = None
+        for node in ('Wow6432Node\\', ''):
+            try:
+                key = compat_winreg.OpenKey(
+                    compat_winreg.HKEY_LOCAL_MACHINE,
+                    r'SOFTWARE\%sPython\PythonCore\%s\InstallPath' % (node, python_version))
+                try:
+                    python_path, _ = compat_winreg.QueryValueEx(key, '')
+                finally:
+                    compat_winreg.CloseKey(key)
+                break
+            except Exception:
+                pass
+
+        if not python_path:
+            raise BuildError('No such Python version: %s' % python_version)
+
+        self.pythonPath = python_path
+
+        super(PythonBuilder, self).__init__(**kwargs)
+
+
+class GITInfoBuilder(object):
+    def __init__(self, **kwargs):
+        try:
+            self.user, self.repoName = kwargs['path'][:2]
+            self.rev = kwargs.pop('rev')
+        except ValueError:
+            raise BuildError('Invalid path')
+        except KeyError as e:
+            raise BuildError('Missing mandatory parameter "%s"' % e.args[0])
+
+        path = os.path.join(os.environ['APPDATA'], 'Build archive', self.repoName, self.user)
+        if not os.path.exists(path):
+            os.makedirs(path)
+        self.basePath = tempfile.mkdtemp(dir=path)
+        self.buildPath = os.path.join(self.basePath, 'build')
+
+        super(GITInfoBuilder, self).__init__(**kwargs)
+
+
+class GITBuilder(GITInfoBuilder):
+    def build(self):
+        try:
+            subprocess.check_output(['git', 'clone', 'git://github.com/%s/%s.git' % (self.user, self.repoName), self.buildPath])
+            subprocess.check_output(['git', 'checkout', self.rev], cwd=self.buildPath)
+        except subprocess.CalledProcessError as e:
+            raise BuildError(e.output)
+
+        super(GITBuilder, self).build()
+
+
+class YoutubeDLBuilder(object):
+    authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org']
+
+    def __init__(self, **kwargs):
+        if self.repoName != 'yt-dlp':
+            raise BuildError('Invalid repository "%s"' % self.repoName)
+        if self.user not in self.authorizedUsers:
+            raise HTTPError('Unauthorized user "%s"' % self.user, 401)
+
+        super(YoutubeDLBuilder, self).__init__(**kwargs)
+
+    def build(self):
+        try:
+            proc = subprocess.Popen([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'], stdin=subprocess.PIPE, cwd=self.buildPath)
+            proc.wait()
+            #subprocess.check_output([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'],
+            #                        cwd=self.buildPath)
+        except subprocess.CalledProcessError as e:
+            raise BuildError(e.output)
+
+        super(YoutubeDLBuilder, self).build()
+
+
+class DownloadBuilder(object):
+    def __init__(self, **kwargs):
+        self.handler = kwargs.pop('handler')
+        self.srcPath = os.path.join(self.buildPath, *tuple(kwargs['path'][2:]))
+        self.srcPath = os.path.abspath(os.path.normpath(self.srcPath))
+        if not self.srcPath.startswith(self.buildPath):
+            raise HTTPError(self.srcPath, 401)
+
+        super(DownloadBuilder, self).__init__(**kwargs)
+
+    def build(self):
+        if not os.path.exists(self.srcPath):
+            raise HTTPError('No such file', 404)
+        if os.path.isdir(self.srcPath):
+            raise HTTPError('Is a directory: %s' % self.srcPath, 401)
+
+        self.handler.send_response(200)
+        self.handler.send_header('Content-Type', 'application/octet-stream')
+        self.handler.send_header('Content-Disposition', 'attachment; filename=%s' % os.path.split(self.srcPath)[-1])
+        self.handler.send_header('Content-Length', str(os.stat(self.srcPath).st_size))
+        self.handler.end_headers()
+
+        with open(self.srcPath, 'rb') as src:
+            shutil.copyfileobj(src, self.handler.wfile)
+
+        super(DownloadBuilder, self).build()
+
+
+class CleanupTempDir(object):
+    def build(self):
+        try:
+            rmtree(self.basePath)
+        except Exception as e:
+            print('WARNING deleting "%s": %s' % (self.basePath, e))
+
+        super(CleanupTempDir, self).build()
+
+
+class Null(object):
+    def __init__(self, **kwargs):
+        pass
+
+    def start(self):
+        pass
+
+    def close(self):
+        pass
+
+    def build(self):
+        pass
+
+
+class Builder(PythonBuilder, GITBuilder, YoutubeDLBuilder, DownloadBuilder, CleanupTempDir, Null):
+    pass
+
+
+class BuildHTTPRequestHandler(compat_http_server.BaseHTTPRequestHandler):
+    actionDict = {'build': Builder, 'download': Builder}  # They're the same, no more caching.
+
+    def do_GET(self):
+        path = compat_urlparse.urlparse(self.path)
+        paramDict = dict([(key, value[0]) for key, value in compat_urlparse.parse_qs(path.query).items()])
+        action, _, path = path.path.strip('/').partition('/')
+        if path:
+            path = path.split('/')
+            if action in self.actionDict:
+                try:
+                    builder = self.actionDict[action](path=path, handler=self, **paramDict)
+                    builder.start()
+                    try:
+                        builder.build()
+                    finally:
+                        builder.close()
+                except BuildError as e:
+                    self.send_response(e.code)
+                    msg = compat_str(e).encode('UTF-8')
+                    self.send_header('Content-Type', 'text/plain; charset=UTF-8')
+                    self.send_header('Content-Length', len(msg))
+                    self.end_headers()
+                    self.wfile.write(msg)
+            else:
+                self.send_response(500, 'Unknown build method "%s"' % action)
+        else:
+            self.send_response(500, 'Malformed URL')
+
+if __name__ == '__main__':
+    main()

devscripts/changelog_override.json

@@ -1,323 +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)"
-    },
-    {
-        "action": "change",
-        "when": "8636a9bac3bed99984c1e297453660468ecf504b",
-        "short": "Fix 6224a3898821965a7d6a2cb9cc2de40a0fd6e6bc",
-        "authors": ["Grub4K"]
-    },
-    {
-        "action": "add",
-        "when": "6224a3898821965a7d6a2cb9cc2de40a0fd6e6bc",
-        "short": "[priority] **An external JavaScript runtime is now required for full YouTube support**\nyt-dlp now requires users to have an external JavaScript runtime (e.g. Deno) installed in order to solve the JavaScript challenges presented by YouTube. [Read more](https://github.com/yt-dlp/yt-dlp/issues/15012)"
-    }
-]

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/check-porn.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
+
 """
 This script employs a VERY basic heuristic ('porn' in webpage.lower()) to check
 if we are not 'age_limit' tagging some porn site
@@ -10,14 +12,11 @@
 # Allow direct execution
 import os
 import sys
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-
-import urllib.parse
-import urllib.request
-
 from test.helper import gettestcases
+from yt_dlp.utils import compat_urllib_parse_urlparse
+from yt_dlp.utils import compat_urllib_request
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'
@@ -28,9 +27,9 @@
 for test in gettestcases():
     if METHOD == 'EURISTIC':
         try:
-            webpage = urllib.request.urlopen(test['url'], timeout=10).read()
+            webpage = compat_urllib_request.urlopen(test['url'], timeout=10).read()
         except Exception:
-            print('\nFail: {}'.format(test['name']))
+            print('\nFail: {0}'.format(test['name']))
             continue
 
         webpage = webpage.decode('utf8', 'replace')
@@ -38,9 +37,9 @@
         RESULT = 'porn' in webpage.lower()
 
     elif METHOD == 'LIST':
-        domain = urllib.parse.urlparse(test['url']).netloc
+        domain = compat_urllib_parse_urlparse(test['url']).netloc
         if not domain:
-            print('\nFail: {}'.format(test['name']))
+            print('\nFail: {0}'.format(test['name']))
             continue
         domain = '.'.join(domain.split('.')[-2:])
 
@@ -48,11 +47,11 @@
 
     if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict']
                    or test['info_dict']['age_limit'] != 18):
-        print('\nPotential missing age_limit check: {}'.format(test['name']))
+        print('\nPotential missing age_limit check: {0}'.format(test['name']))
 
     elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict']
                          and test['info_dict']['age_limit'] == 18):
-        print('\nPotential false negative: {}'.format(test['name']))
+        print('\nPotential false negative: {0}'.format(test['name']))
 
     else:
         sys.stdout.write('.')

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/create-github-release.py

@@ -0,0 +1,112 @@
+# Unused
+
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import io
+import json
+import mimetypes
+import netrc
+import optparse
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from yt_dlp.compat import (
+    compat_basestring,
+    compat_getpass,
+    compat_print,
+    compat_urllib_request,
+)
+from yt_dlp.utils import (
+    make_HTTPS_handler,
+    sanitized_Request,
+)
+
+
+class GitHubReleaser(object):
+    _API_URL = 'https://api.github.com/repos/ytdl-org/youtube-dl/releases'
+    _UPLOADS_URL = 'https://uploads.github.com/repos/ytdl-org/youtube-dl/releases/%s/assets?name=%s'
+    _NETRC_MACHINE = 'github.com'
+
+    def __init__(self, debuglevel=0):
+        self._init_github_account()
+        https_handler = make_HTTPS_handler({}, debuglevel=debuglevel)
+        self._opener = compat_urllib_request.build_opener(https_handler)
+
+    def _init_github_account(self):
+        try:
+            info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+            if info is not None:
+                self._token = info[2]
+                compat_print('Using GitHub credentials found in .netrc...')
+                return
+            else:
+                compat_print('No GitHub credentials found in .netrc')
+        except (IOError, netrc.NetrcParseError):
+            compat_print('Unable to parse .netrc')
+        self._token = compat_getpass(
+            'Type your GitHub PAT (personal access token) and press [Return]: ')
+
+    def _call(self, req):
+        if isinstance(req, compat_basestring):
+            req = sanitized_Request(req)
+        req.add_header('Authorization', 'token %s' % self._token)
+        response = self._opener.open(req).read().decode('utf-8')
+        return json.loads(response)
+
+    def list_releases(self):
+        return self._call(self._API_URL)
+
+    def create_release(self, tag_name, name=None, body='', draft=False, prerelease=False):
+        data = {
+            'tag_name': tag_name,
+            'target_commitish': 'master',
+            'name': name,
+            'body': body,
+            'draft': draft,
+            'prerelease': prerelease,
+        }
+        req = sanitized_Request(self._API_URL, json.dumps(data).encode('utf-8'))
+        return self._call(req)
+
+    def create_asset(self, release_id, asset):
+        asset_name = os.path.basename(asset)
+        url = self._UPLOADS_URL % (release_id, asset_name)
+        # Our files are small enough to be loaded directly into memory.
+        data = open(asset, 'rb').read()
+        req = sanitized_Request(url, data)
+        mime_type, _ = mimetypes.guess_type(asset_name)
+        req.add_header('Content-Type', mime_type or 'application/octet-stream')
+        return self._call(req)
+
+
+def main():
+    parser = optparse.OptionParser(usage='%prog CHANGELOG VERSION BUILDPATH')
+    options, args = parser.parse_args()
+    if len(args) != 3:
+        parser.error('Expected a version and a build directory')
+
+    changelog_file, version, build_path = args
+
+    with io.open(changelog_file, encoding='utf-8') as inf:
+        changelog = inf.read()
+
+    mobj = re.search(r'(?s)version %s\n{2}(.+?)\n{3}' % version, changelog)
+    body = mobj.group(1) if mobj else ''
+
+    releaser = GitHubReleaser()
+
+    new_release = releaser.create_release(
+        version, name='yt-dlp %s' % version, body=body)
+    release_id = new_release['id']
+
+    for asset in os.listdir(build_path):
+        compat_print('Uploading %s...' % asset)
+        releaser.create_asset(release_id, os.path.join(build_path, asset))
+
+
+if __name__ == '__main__':
+    main()

devscripts/fish-completion.py

@@ -1,14 +1,12 @@
 #!/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 __future__ import unicode_literals
 
 import optparse
+import os
+from os.path import dirname as dirn
+import sys
 
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import yt_dlp
 from yt_dlp.utils import shell_quote
 
@@ -48,5 +46,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = yt_dlp.parseOpts(ignore_config_files=True)[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)

devscripts/generate_aes_testdata.py

@@ -1,22 +1,21 @@
 #!/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 __future__ import unicode_literals
 
 import codecs
 import subprocess
 
+import os
+import sys
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from yt_dlp.utils import intlist_to_bytes
 from yt_dlp.aes import aes_encrypt, key_expansion
 
 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/gh-pages.unused/add-version.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import json
+import sys
+import hashlib
+import os.path
+
+
+if len(sys.argv) <= 1:
+    print('Specify the version number as parameter')
+    sys.exit()
+version = sys.argv[1]
+
+with open('update/LATEST_VERSION', 'w') as f:
+    f.write(version)
+
+versions_info = json.load(open('update/versions.json'))
+if 'signature' in versions_info:
+    del versions_info['signature']
+
+new_version = {}
+
+filenames = {
+    'bin': 'yt-dlp',
+    'exe': 'yt-dlp.exe',
+    'tar': 'yt-dlp-%s.tar.gz' % version}
+build_dir = os.path.join('..', '..', 'build', version)
+for key, filename in filenames.items():
+    url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
+    fn = os.path.join(build_dir, filename)
+    with open(fn, 'rb') as f:
+        data = f.read()
+    if not data:
+        raise ValueError('File %s is empty!' % fn)
+    sha256sum = hashlib.sha256(data).hexdigest()
+    new_version[key] = (url, sha256sum)
+
+versions_info['versions'][version] = new_version
+versions_info['latest'] = version
+
+with open('update/versions.json', 'w') as jsonf:
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)

devscripts/gh-pages.unused/generate-download.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import json
+
+versions_info = json.load(open('update/versions.json'))
+version = versions_info['latest']
+version_dict = versions_info['versions'][version]
+
+# Read template page
+with open('download.html.in', 'r', encoding='utf-8') as tmplf:
+    template = tmplf.read()
+
+template = template.replace('@PROGRAM_VERSION@', version)
+template = template.replace('@PROGRAM_URL@', version_dict['bin'][0])
+template = template.replace('@PROGRAM_SHA256SUM@', version_dict['bin'][1])
+template = template.replace('@EXE_URL@', version_dict['exe'][0])
+template = template.replace('@EXE_SHA256SUM@', version_dict['exe'][1])
+template = template.replace('@TAR_URL@', version_dict['tar'][0])
+template = template.replace('@TAR_SHA256SUM@', version_dict['tar'][1])
+with open('download.html', 'w', encoding='utf-8') as dlf:
+    dlf.write(template)

devscripts/gh-pages.unused/sign-versions.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals, with_statement
+
+import rsa
+import json
+from binascii import hexlify
+
+try:
+    input = raw_input
+except NameError:
+    pass
+
+versions_info = json.load(open('update/versions.json'))
+if 'signature' in versions_info:
+    del versions_info['signature']
+
+print('Enter the PKCS1 private key, followed by a blank line:')
+privkey = b''
+while True:
+    try:
+        line = input()
+    except EOFError:
+        break
+    if line == '':
+        break
+    privkey += line.encode('ascii') + b'\n'
+privkey = rsa.PrivateKey.load_pkcs1(privkey)
+
+signature = hexlify(rsa.pkcs1.sign(json.dumps(versions_info, sort_keys=True).encode('utf-8'), privkey, 'SHA-256')).decode()
+print('signature: ' + signature)
+
+versions_info['signature'] = signature
+with open('update/versions.json', 'w') as versionsf:
+    json.dump(versions_info, versionsf, indent=4, sort_keys=True)

devscripts/gh-pages.unused/update-copyright.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+# coding: utf-8
+
+from __future__ import with_statement, unicode_literals
+
+import datetime
+import glob
+import io  # For Python 2 compatibility
+import os
+import re
+
+year = str(datetime.datetime.now().year)
+for fn in glob.glob('*.html*'):
+    with io.open(fn, encoding='utf-8') as f:
+        content = f.read()
+    newc = re.sub(r'(?P<copyright>Copyright © 2011-)(?P<year>[0-9]{4})', 'Copyright © 2011-' + year, content)
+    if content != newc:
+        tmpFn = fn + '.part'
+        with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
+            outf.write(newc)
+        os.rename(tmpFn, fn)

devscripts/gh-pages.unused/update-feed.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import datetime
+import io
+import json
+import textwrap
+
+
+atom_template = textwrap.dedent("""\
+    <?xml version="1.0" encoding="utf-8"?>
+    <feed xmlns="http://www.w3.org/2005/Atom">
+        <link rel="self" href="http://ytdl-org.github.io/youtube-dl/update/releases.atom" />
+        <title>yt-dlp releases</title>
+        <id>https://yt-dl.org/feed/yt-dlp-updates-feed</id>
+        <updated>@TIMESTAMP@</updated>
+        @ENTRIES@
+    </feed>""")
+
+entry_template = textwrap.dedent("""
+    <entry>
+        <id>https://yt-dl.org/feed/yt-dlp-updates-feed/yt-dlp-@VERSION@</id>
+        <title>New version @VERSION@</title>
+        <link href="http://ytdl-org.github.io/yt-dlp" />
+        <content type="xhtml">
+            <div xmlns="http://www.w3.org/1999/xhtml">
+                Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
+            </div>
+        </content>
+        <author>
+            <name>The yt-dlp maintainers</name>
+        </author>
+        <updated>@TIMESTAMP@</updated>
+    </entry>
+    """)
+
+now = datetime.datetime.now()
+now_iso = now.isoformat() + 'Z'
+
+atom_template = atom_template.replace('@TIMESTAMP@', now_iso)
+
+versions_info = json.load(open('update/versions.json'))
+versions = list(versions_info['versions'].keys())
+versions.sort()
+
+entries = []
+for v in versions:
+    fields = v.split('.')
+    year, month, day = map(int, fields[:3])
+    faked = 0
+    patchlevel = 0
+    while True:
+        try:
+            datetime.date(year, month, day)
+        except ValueError:
+            day -= 1
+            faked += 1
+            assert day > 0
+            continue
+        break
+    if len(fields) >= 4:
+        try:
+            patchlevel = int(fields[3])
+        except ValueError:
+            patchlevel = 1
+    timestamp = '%04d-%02d-%02dT00:%02d:%02dZ' % (year, month, day, faked, patchlevel)
+
+    entry = entry_template.replace('@TIMESTAMP@', timestamp)
+    entry = entry.replace('@VERSION@', v)
+    entries.append(entry)
+
+entries_str = textwrap.indent(''.join(entries), '\t')
+atom_template = atom_template.replace('@ENTRIES@', entries_str)
+
+with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file:
+    atom_file.write(atom_template)

devscripts/gh-pages.unused/update-sites.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import sys
+import os
+import textwrap
+
+# We must be able to import yt_dlp
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+
+import yt_dlp
+
+
+def main():
+    with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
+        template = tmplf.read()
+
+    ie_htmls = []
+    for ie in yt_dlp.list_extractors(age_limit=None):
+        ie_html = '<b>{}</b>'.format(ie.IE_NAME)
+        ie_desc = getattr(ie, 'IE_DESC', None)
+        if ie_desc is False:
+            continue
+        elif ie_desc is not None:
+            ie_html += ': {}'.format(ie.IE_DESC)
+        if not ie.working():
+            ie_html += ' (Currently broken)'
+        ie_htmls.append('<li>{}</li>'.format(ie_html))
+
+    template = template.replace('@SITES@', textwrap.indent('\n'.join(ie_htmls), '\t'))
+
+    with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
+        sitesf.write(template)
+
+
+if __name__ == '__main__':
+    main()

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

@@ -1,39 +1,31 @@
-import importlib
-import random
+# coding: utf-8
 import re
 
-from ..utils import (
-    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
+from ..utils import bug_reports_message, write_string
 
 
 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')
-        return getattr(cls.real_class, name)
+        if '_real_class' not in cls.__dict__:
+            write_string(
+                f'WARNING: Falling back to normal extractor since lazy extractor '
+                f'{cls.__name__} does not have attribute {name}{bug_reports_message()}')
+        return getattr(cls._get_real_class(), name)
 
 
 class LazyLoadExtractor(metaclass=LazyLoadMetaClass):
-    @classproperty
-    def real_class(cls):
+    _module = None
+    _WORKING = True
+
+    @classmethod
+    def _get_real_class(cls):
         if '_real_class' not in cls.__dict__:
-            cls._real_class = getattr(importlib.import_module(cls._module), cls.__name__)
+            mod = __import__(cls._module, fromlist=(cls.__name__,))
+            cls._real_class = getattr(mod, cls.__name__)
         return cls._real_class
 
     def __new__(cls, *args, **kwargs):
-        instance = cls.real_class.__new__(cls.real_class)
+        real_cls = cls._get_real_class()
+        instance = real_cls.__new__(real_cls)
         instance.__init__(*args, **kwargs)
         return instance

devscripts/make_changelog.py

@@ -1,515 +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}')
-                if match := self.FIXES_RE.search(commit.short):
-                    fix_commitish = match.group(1)
-                    if fix_commitish in self._commits:
-                        del self._commits[commit.hash]
-                        self._fixes[fix_commitish].append(commit)
-                        logger.info(f'Found fix for {fix_commitish[:HASH_LENGTH]}: {commit.hash[:HASH_LENGTH]}')
-                        continue
-                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

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
 
+import io
 import optparse
 import re
 
@@ -8,13 +10,13 @@ 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')
 
     infile, outfile = args
 
-    with open(infile, encoding='utf-8') as inf:
+    with io.open(infile, encoding='utf-8') as inf:
         readme = inf.read()
 
     bug_text = re.search(
@@ -24,7 +26,7 @@ def main():
 
     out = bug_text + dev_text
 
-    with open(outfile, 'w', encoding='utf-8') as outf:
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
         outf.write(out)
 
 

devscripts/make_issue_template.py

@@ -1,75 +1,29 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
 
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import re
-
-from devscripts.utils import get_filename_args, read_file, write_file
-
-VERBOSE = '''
-  - 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
-    id: log
-    attributes:
-      label: Complete Verbose Output
-      description: |
-        It should start like this:
-      placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
-        [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] 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
-        <more lines>
-      render: shell
-    validations:
-      required: true
-'''.strip()
-
-NO_SKIP = '''
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
-'''.strip()
+import io
+import optparse
 
 
 def main():
-    fields = {
-        'no_skip': NO_SKIP,
-        'verbose': VERBOSE,
-        'verbose_optional': re.sub(r'(\n\s+validations:)?\n\s+required: true', '', VERBOSE),
-    }
+    parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error('Expected an input and an output filename')
 
-    infile, outfile = get_filename_args(has_infile=True)
-    write_file(outfile, read_file(infile) % fields)
+    infile, outfile = args
 
+    with io.open(infile, encoding='utf-8') as inf:
+        issue_template_tmpl = inf.read()
+
+    # Get the version from yt_dlp/version.py without importing the package
+    exec(compile(open('yt_dlp/version.py').read(),
+                 'yt_dlp/version.py', 'exec'))
+
+    out = issue_template_tmpl % {'version': locals()['__version__']}
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 if __name__ == '__main__':
     main()

devscripts/make_lazy_extractors.py

@@ -1,115 +1,105 @@
 #!/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 __future__ import unicode_literals, print_function
 
 from inspect import getsource
+import io
+import os
+from os.path import dirname as dirn
+import sys
 
-from devscripts.utils import get_filename_args, read_file, write_file
-from yt_dlp.extractor import import_extractors
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
+
+lazy_extractors_filename = sys.argv[1] if len(sys.argv) > 1 else 'yt_dlp/extractor/lazy_extractors.py'
+if os.path.exists(lazy_extractors_filename):
+    os.remove(lazy_extractors_filename)
+
+# Block plugins from loading
+plugins_dirname = 'ytdlp_plugins'
+plugins_blocked_dirname = 'ytdlp_plugins_blocked'
+if os.path.exists(plugins_dirname):
+    os.rename(plugins_dirname, plugins_blocked_dirname)
+
+from yt_dlp.extractor import _ALL_CLASSES
 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)
-]
-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_TEMPLATE = '''
+if os.path.exists(plugins_blocked_dirname):
+    os.rename(plugins_blocked_dirname, plugins_dirname)
+
+with open('devscripts/lazy_load_template.py', 'rt') as f:
+    module_template = f.read()
+
+CLASS_PROPERTIES = ['ie_key', 'working', '_match_valid_url', 'suitable', '_match_id', 'get_temp_id']
+module_contents = [
+    module_template,
+    *[getsource(getattr(InfoExtractor, k)) for k in CLASS_PROPERTIES],
+    '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
+
+ie_template = '''
 class {name}({bases}):
-    _module = {module!r}
+    _module = '{module}'
 '''
-MODULE_TEMPLATE = read_file('devscripts/lazy_load_template.py')
 
 
-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')
-
-    import_extractors()
-
-    DummyInfoExtractor = type('InfoExtractor', (InfoExtractor,), {'IE_NAME': NO_ATTR})
-    module_src = '\n'.join((
-        MODULE_TEMPLATE,
-        '    _module = None',
-        *extra_ie_code(DummyInfoExtractor),
-        '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-        *build_ies(list(extractors.value.values()), (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
-    ))
-
-    write_file(lazy_extractors_filename, f'{module_src}\n')
+def get_base_name(base):
+    if base is InfoExtractor:
+        return 'LazyLoadExtractor'
+    elif base is SearchInfoExtractor:
+        return 'LazyLoadSearchExtractor'
+    else:
+        return base.__name__
 
 
-def extra_ie_code(ie, base=None):
-    for var in STATIC_CLASS_PROPERTIES:
-        val = getattr(ie, var)
-        if val != (getattr(base, var) if base else NO_ATTR):
-            yield f'    {var} = {val!r}'
-    yield ''
-
-    for name in CLASS_METHODS:
-        f = getattr(ie, name)
-        if not base or f.__func__ != getattr(base, name).__func__:
-            yield getsource(f)
+def build_lazy_ie(ie, name):
+    s = ie_template.format(
+        name=name,
+        bases=', '.join(map(get_base_name, ie.__bases__)),
+        module=ie.__module__)
+    valid_url = getattr(ie, '_VALID_URL', None)
+    if not valid_url and hasattr(ie, '_make_valid_url'):
+        valid_url = ie._make_valid_url()
+    if valid_url:
+        s += f'    _VALID_URL = {valid_url!r}\n'
+    if not ie._WORKING:
+        s += '    _WORKING = False\n'
+    if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
+        s += f'\n{getsource(ie.suitable)}'
+    return s
 
 
-def build_ies(ies, bases, attr_base):
-    names = []
-    for ie in sort_ies(ies, bases):
-        yield build_lazy_ie(ie, ie.__name__, attr_base)
-        if ie in ies:
-            names.append(ie.__name__)
+# find the correct sorting and add the required base classes so that subclasses
+# can be correctly created
+classes = _ALL_CLASSES[:-1]
+ordered_cls = []
+while classes:
+    for c in classes[:]:
+        bases = set(c.__bases__) - set((object, InfoExtractor, SearchInfoExtractor))
+        stop = False
+        for b in bases:
+            if b not in classes and b not in ordered_cls:
+                if b.__name__ == 'GenericIE':
+                    exit()
+                classes.insert(0, b)
+                stop = True
+        if stop:
+            break
+        if all(b in ordered_cls for b in bases):
+            ordered_cls.append(c)
+            classes.remove(c)
+            break
+ordered_cls.append(_ALL_CLASSES[-1])
 
-    yield '\n_CLASS_LOOKUP = {%s}' % ', '.join(f'{name!r}: {name}' for name in names)
+names = []
+for ie in ordered_cls:
+    name = ie.__name__
+    src = build_lazy_ie(ie, name)
+    module_contents.append(src)
+    if ie in _ALL_CLASSES:
+        names.append(name)
 
+module_contents.append(
+    '\n_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
-def sort_ies(ies, ignored_bases):
-    """find the correct sorting and add the required base classes so that subclasses can be correctly created"""
-    classes, returned_classes = ies[:-1], set()
-    assert ies[-1].__name__ == 'GenericIE', 'Last IE must be GenericIE'
-    while classes:
-        for c in classes[:]:
-            bases = set(c.__bases__) - {object, *ignored_bases}
-            restart = False
-            for b in sorted(bases, key=lambda x: x.__name__):
-                if b not in classes and b not in returned_classes:
-                    assert b.__name__ != 'GenericIE', 'Cannot inherit from GenericIE'
-                    classes.insert(0, b)
-                    restart = True
-            if restart:
-                break
-            if bases <= returned_classes:
-                yield c
-                returned_classes.add(c)
-                classes.remove(c)
-                break
-    yield ies[-1]
+module_src = '\n'.join(module_contents) + '\n'
 
-
-def build_lazy_ie(ie, name, attr_base):
-    bases = ', '.join({
-        'InfoExtractor': 'LazyLoadExtractor',
-        'SearchInfoExtractor': 'LazyLoadSearchExtractor',
-    }.get(base.__name__, base.__name__) for base in ie.__bases__)
-
-    s = IE_TEMPLATE.format(name=name, module=ie.__module__, bases=bases)
-    return s + '\n'.join(extra_ie_code(ie, attr_base))
-
-
-if __name__ == '__main__':
-    main()
+with io.open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
+    f.write(module_src)

devscripts/make_readme.py

@@ -1,93 +1,31 @@
 #!/usr/bin/env python3
 
-"""
-yt-dlp --help | make_readme.py
-This must be run in a console of correct width
-"""
+# yt-dlp --help | make_readme.py
+# This must be run in a console of correct width
 
-# Allow direct execution
-import os
+from __future__ import unicode_literals
+
+import io
 import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import functools
 import re
 
-from devscripts.utils import read_file, write_file
-
 README_FILE = 'README.md'
+helptext = sys.stdin.read()
 
-OPTIONS_START = 'General Options:'
-OPTIONS_END = 'CONFIGURATION'
-EPILOG_START = 'See full documentation'
-ALLOWED_OVERSHOOT = 2
+if isinstance(helptext, bytes):
+    helptext = helptext.decode('utf-8')
 
-DISABLE_PATCH = object()
+with io.open(README_FILE, encoding='utf-8') as f:
+    oldreadme = f.read()
 
+header = oldreadme[:oldreadme.index('## General Options:')]
+footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
 
-def take_section(text, start=None, end=None, *, shift=0):
-    return text[
-        text.index(start) + shift if start else None:
-        text.index(end) + shift if end else None
-    ]
+options = helptext[helptext.index('  General Options:'):]
+options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
+options = options + '\n'
 
-
-def apply_patch(text, patch):
-    return text if patch[0] is DISABLE_PATCH else re.sub(*patch, text)
-
-
-options = take_section(sys.stdin.read(), f'\n  {OPTIONS_START}', f'\n{EPILOG_START}', shift=1)
-
-max_width = max(map(len, options.split('\n')))
-switch_col_width = len(re.search(r'(?m)^\s{5,}', options).group())
-delim = f'\n{" " * switch_col_width}'
-
-PATCHES = (
-    (   # Standardize `--update` message
-        r'(?m)^(    -U, --update\s+).+(\n    \s.+)*$',
-        r'\1Update this program to the latest version',
-    ),
-    (   # Headings
-        r'(?m)^  (\w.+\n)(    (?=\w))?',
-        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
-        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')),
-    ),
-    (   # Do not split "words"
-        rf'(?m)({delim}\S+)+$',
-        lambda mobj: ''.join((delim, mobj.group(0).replace(delim, ''))),
-    ),
-    (   # 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()),
-    ),
-    (   # 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)',
-    ),
-)
-
-readme = read_file(README_FILE)
-
-write_file(README_FILE, ''.join((
-    take_section(readme, end=f'## {OPTIONS_START}'),
-    functools.reduce(apply_patch, PATCHES, options),
-    take_section(readme, f'# {OPTIONS_END}'),
-)))
+with io.open(README_FILE, 'w', encoding='utf-8') as f:
+    f.write(header)
+    f.write(options)
+    f.write(footer)

devscripts/make_supportedsites.py

@@ -1,30 +1,48 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
 
-# Allow direct execution
+import io
+import optparse
 import os
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-
-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}
-'''
+# Import yt_dlp
+ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
+sys.path.insert(0, ROOT_DIR)
+import yt_dlp
 
 
 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))
+    parser = optparse.OptionParser(usage='%prog OUTFILE.md')
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error('Expected an output filename')
+
+    outfile, = args
+
+    def gen_ies_md(ies):
+        for ie in ies:
+            ie_md = '**{0}**'.format(ie.IE_NAME)
+            ie_desc = getattr(ie, 'IE_DESC', None)
+            if ie_desc is False:
+                continue
+            if ie_desc is not None:
+                ie_md += ': {0}'.format(ie.IE_DESC)
+            search_key = getattr(ie, 'SEARCH_KEY', None)
+            if search_key is not None:
+                ie_md += f'; "{ie.SEARCH_KEY}:" prefix'
+            if not ie.working():
+                ie_md += ' (Currently broken)'
+            yield ie_md
+
+    ies = sorted(yt_dlp.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    out = '# Supported sites\n' + ''.join(
+        ' - ' + md + '\n'
+        for md in gen_ies_md(ies))
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':

devscripts/posix-locale.sh

@@ -0,0 +1,6 @@
+
+# source this file in your shell to get a POSIX locale (which will break many programs, but that's kind of the point)
+
+export LC_ALL=POSIX
+export LANG=POSIX
+export LANGUAGE=POSIX

devscripts/prepare_manpage.py

@@ -1,22 +1,11 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
 
-# Allow direct execution
-import os
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
+import io
+import optparse
 import os.path
 import re
 
-from devscripts.utils import (
-    compose_functions,
-    get_filename_args,
-    read_file,
-    write_file,
-)
-
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 
@@ -24,7 +13,7 @@
 
 # NAME
 
-yt\-dlp \- A feature\-rich command\-line audio/video downloader
+yt\-dlp \- A youtube-dl fork with additional features and patches
 
 # SYNOPSIS
 
@@ -35,6 +24,25 @@
 '''
 
 
+def main():
+    parser = optparse.OptionParser(usage='%prog OUTFILE.md')
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error('Expected an output filename')
+
+    outfile, = args
+
+    with io.open(README_FILE, encoding='utf-8') as f:
+        readme = f.read()
+
+    readme = filter_excluded_sections(readme)
+    readme = move_sections(readme)
+    readme = filter_options(readme)
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(PREFIX + readme)
+
+
 def filter_excluded_sections(readme):
     EXCLUDED_SECTION_BEGIN_STRING = re.escape('<!-- MANPAGE: BEGIN EXCLUDED SECTION -->')
     EXCLUDED_SECTION_END_STRING = re.escape('<!-- MANPAGE: END EXCLUDED SECTION -->')
@@ -43,27 +51,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 +73,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,12 +94,5 @@ def filter_options(readme):
     return readme.replace(section, options, 1)
 
 
-TRANSFORM = compose_functions(filter_excluded_sections, convert_code_blocks, move_sections, filter_options)
-
-
-def main():
-    write_file(get_filename_args(), PREFIX + TRANSFORM(read_file(README_FILE)))
-
-
 if __name__ == '__main__':
     main()

devscripts/release.sh

@@ -0,0 +1,143 @@
+# Unused
+
+#!/bin/bash
+
+# IMPORTANT: the following assumptions are made
+# * the GH repo is on the origin remote
+# * the gh-pages branch is named so locally
+# * the git config user.signingkey is properly set
+
+# You will need
+# pip install coverage nose rsa wheel
+
+# TODO
+# release notes
+# make hash on local files
+
+set -e
+
+skip_tests=true
+gpg_sign_commits=""
+buildserver='localhost:8142'
+
+while true
+do
+case "$1" in
+    --run-tests)
+        skip_tests=false
+        shift
+    ;;
+    --gpg-sign-commits|-S)
+        gpg_sign_commits="-S"
+        shift
+    ;;
+    --buildserver)
+        buildserver="$2"
+        shift 2
+    ;;
+    --*)
+        echo "ERROR: unknown option $1"
+        exit 1
+    ;;
+    *)
+        break
+    ;;
+esac
+done
+
+if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi
+version="$1"
+major_version=$(echo "$version" | sed -n 's#^\([0-9]*\.[0-9]*\.[0-9]*\).*#\1#p')
+if test "$major_version" '!=' "$(date '+%Y.%m.%d')"; then
+    echo "$version does not start with today's date!"
+    exit 1
+fi
+
+if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
+if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi
+useless_files=$(find yt_dlp -type f -not -name '*.py')
+if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in yt_dlp: $useless_files"; exit 1; fi
+if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
+if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
+if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi
+if ! python3 -c 'import wheel' 2>/dev/null; then echo 'ERROR: wheel is missing'; exit 1; fi
+
+read -p "Is Changelog up to date? (y/n) " -n 1
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
+
+/bin/echo -e "\n### First of all, testing..."
+make clean
+if $skip_tests ; then
+    echo 'SKIPPING TESTS'
+else
+    nosetests --verbose --with-coverage --cover-package=yt_dlp --cover-html test --stop || exit 1
+fi
+
+/bin/echo -e "\n### Changing version in version.py..."
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" yt_dlp/version.py
+
+/bin/echo -e "\n### Changing version in Changelog..."
+sed -i "s/<unreleased>/$version/" Changelog.md
+
+/bin/echo -e "\n### Committing documentation, templates and yt_dlp/version.py..."
+make README.md CONTRIBUTING.md issuetemplates supportedsites
+git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md yt_dlp/version.py Changelog.md
+git commit $gpg_sign_commits -m "release $version"
+
+/bin/echo -e "\n### Now tagging, signing and pushing..."
+git tag -s -m "Release $version" "$version"
+git show "$version"
+read -p "Is it good, can I push? (y/n) " -n 1
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
+echo
+MASTER=$(git rev-parse --abbrev-ref HEAD)
+git push origin $MASTER:master
+git push origin "$version"
+
+/bin/echo -e "\n### OK, now it is time to build the binaries..."
+REV=$(git rev-parse HEAD)
+make yt-dlp yt-dlp.tar.gz
+read -p "VM running? (y/n) " -n 1
+wget "http://$buildserver/build/ytdl-org/youtube-dl/yt-dlp.exe?rev=$REV" -O yt-dlp.exe
+mkdir -p "build/$version"
+mv yt-dlp yt-dlp.exe "build/$version"
+mv yt-dlp.tar.gz "build/$version/yt-dlp-$version.tar.gz"
+RELEASE_FILES="yt-dlp yt-dlp.exe yt-dlp-$version.tar.gz"
+(cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
+(cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
+(cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)
+(cd build/$version/ && sha512sum $RELEASE_FILES > SHA2-512SUMS)
+
+/bin/echo -e "\n### Signing and uploading the new binaries to GitHub..."
+for f in $RELEASE_FILES; do gpg --passphrase-repeat 5 --detach-sig "build/$version/$f"; done
+
+ROOT=$(pwd)
+python devscripts/create-github-release.py Changelog.md $version "$ROOT/build/$version"
+
+ssh ytdl@yt-dl.org "sh html/update_latest.sh $version"
+
+/bin/echo -e "\n### Now switching to gh-pages..."
+git clone --branch gh-pages --single-branch . build/gh-pages
+(
+    set -e
+    ORIGIN_URL=$(git config --get remote.origin.url)
+    cd build/gh-pages
+    "$ROOT/devscripts/gh-pages/add-version.py" $version
+    "$ROOT/devscripts/gh-pages/update-feed.py"
+    "$ROOT/devscripts/gh-pages/sign-versions.py" < "$ROOT/updates_key.pem"
+    "$ROOT/devscripts/gh-pages/generate-download.py"
+    "$ROOT/devscripts/gh-pages/update-copyright.py"
+    "$ROOT/devscripts/gh-pages/update-sites.py"
+    git add *.html *.html.in update
+    git commit $gpg_sign_commits -m "release $version"
+    git push "$ROOT" gh-pages
+    git push "$ORIGIN_URL" gh-pages
+)
+rm -rf build
+
+make pypi-files
+echo "Uploading to PyPi ..."
+python setup.py sdist bdist_wheel upload
+make clean
+
+/bin/echo -e "\n### DONE!"

devscripts/run_tests.bat

@@ -0,0 +1,16 @@
+@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
+)
+
+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 @@
+#!/bin/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 -m pytest "$test_set"

devscripts/set-variant.py

@@ -1,36 +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 argparse
-import functools
-import re
-
-from devscripts.utils import compose_functions, read_file, write_file
-
-VERSION_FILE = 'yt_dlp/version.py'
-
-
-def parse_options():
-    parser = argparse.ArgumentParser(description='Set the build variant of the package')
-    parser.add_argument('variant', help='Name of the variant')
-    parser.add_argument('-M', '--update-message', default=None, help='Message to show in -U')
-    return parser.parse_args()
-
-
-def property_setter(name, value):
-    return functools.partial(re.sub, rf'(?m)^{name}\s*=\s*.+$', f'{name} = {value!r}')
-
-
-opts = parse_options()
-transform = compose_functions(
-    property_setter('VARIANT', opts.variant),
-    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/show-downloads-statistics.py

@@ -0,0 +1,49 @@
+# Unused
+
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import itertools
+import json
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from yt_dlp.compat import (
+    compat_print,
+    compat_urllib_request,
+)
+from yt_dlp.utils import format_bytes
+
+
+def format_size(bytes):
+    return '%s (%d bytes)' % (format_bytes(bytes), bytes)
+
+
+total_bytes = 0
+
+for page in itertools.count(1):
+    releases = json.loads(compat_urllib_request.urlopen(
+        'https://api.github.com/repos/ytdl-org/youtube-dl/releases?page=%s' % page
+    ).read().decode('utf-8'))
+
+    if not releases:
+        break
+
+    for release in releases:
+        compat_print(release['name'])
+        for asset in release['assets']:
+            asset_name = asset['name']
+            total_bytes += asset['download_count'] * asset['size']
+            if all(not re.match(p, asset_name) for p in (
+                    r'^yt-dlp$',
+                    r'^yt-dlp-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^yt-dlp\.exe$')):
+                continue
+            compat_print(
+                ' %s size: %s downloads: %d'
+                % (asset_name, format_size(asset['size']), asset['download_count']))
+
+compat_print('total downloads traffic: %s' % format_size(total_bytes))

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,37 @@
+#!/usr/bin/env python3
+from __future__ import unicode_literals
+
+import json
+import os
+import re
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from yt_dlp.compat import compat_urllib_request
+
+
+# usage: python3 ./devscripts/update-formulae.py <path-to-formulae-rb> <version>
+# version can be either 0-aligned (yt-dlp version) or normalized (PyPl version)
+
+filename, version = sys.argv[1:]
+
+normalized_version = '.'.join(str(int(x)) for x in version.split('.'))
+
+pypi_release = json.loads(compat_urllib_request.urlopen(
+    'https://pypi.org/pypi/yt-dlp/%s/json' % normalized_version
+).read().decode('utf-8'))
+
+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']
+
+with open(filename, 'r') as r:
+    formulae_text = r.read()
+
+formulae_text = re.sub(r'sha256 "[0-9a-f]*?"', 'sha256 "%s"' % sha256sum, formulae_text)
+formulae_text = re.sub(r'url "[^"]*?"', 'url "%s"' % url, formulae_text)
+
+with open(filename, 'w') as w:
+    w.write(formulae_text)

devscripts/update-version.py

@@ -1,65 +1,42 @@
 #!/usr/bin/env python3
-
-# Allow direct execution
-import os
+from datetime import datetime
 import sys
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+import subprocess
 
 
-import argparse
-import contextlib
-import sys
+with open('yt_dlp/version.py', 'rt') as f:
+    exec(compile(f.read(), 'yt_dlp/version.py', 'exec'))
+old_version = locals()['__version__']
 
-from devscripts.utils import calculate_version, run_process, write_file
+old_version_list = old_version.split('.')
 
+old_ver = '.'.join(old_version_list[:3])
+old_rev = old_version_list[3] if len(old_version_list) > 3 else ''
 
-def get_git_head():
-    with contextlib.suppress(Exception):
-        return run_process('git', 'rev-parse', 'HEAD').stdout.strip()
+ver = datetime.utcnow().strftime("%Y.%m.%d")
 
+rev = (sys.argv[1:] or [''])[0]  # Use first argument, if present as revision number
+if not rev:
+    rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
 
-VERSION_TEMPLATE = '''\
+VERSION = '.'.join((ver, rev)) if rev else ver
+
+try:
+    sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
+    GIT_HEAD = sp.communicate()[0].decode().strip() or None
+except Exception:
+    GIT_HEAD = None
+
+VERSION_FILE = f'''\
 # Autogenerated by devscripts/update-version.py
 
-__version__ = {version!r}
+__version__ = {VERSION!r}
 
-RELEASE_GIT_HEAD = {git_head!r}
-
-VARIANT = None
-
-UPDATE_HINT = None
-
-CHANNEL = {channel!r}
-
-ORIGIN = {origin!r}
-
-_pkg_version = {package_version!r}
+RELEASE_GIT_HEAD = {GIT_HEAD!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()
+with open('yt_dlp/version.py', 'wt') as f:
+    f.write(VERSION_FILE)
 
-    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}')
+print('::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,66 +0,0 @@
-import argparse
-import datetime as dt
-import functools
-import re
-import subprocess
-
-
-def read_file(fname):
-    with open(fname, encoding='utf-8') as f:
-        return f.read()
-
-
-def write_file(fname, content, mode='w'):
-    with open(fname, mode, 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
-
-
-def get_filename_args(has_infile=False, default_outfile=None):
-    parser = argparse.ArgumentParser()
-    if has_infile:
-        parser.add_argument('infile', help='Input file')
-    kwargs = {'nargs': '?', 'default': default_outfile} if default_outfile else {}
-    parser.add_argument('outfile', **kwargs, help='Output file')
-
-    opts = parser.parse_args()
-    if has_infile:
-        return opts.infile, opts.outfile
-    return opts.outfile
-
-
-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/wine-py2exe.sh

@@ -0,0 +1,58 @@
+# UNUSED
+
+#!/bin/bash
+
+# Run with as parameter a setup.py that works in the current directory
+# e.g. no os.chdir()
+# It will run twice, the first time will crash
+
+set -e
+
+SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+
+if [ ! -d wine-py2exe ]; then
+
+    sudo apt-get install wine1.3 axel bsdiff
+
+    mkdir wine-py2exe
+    cd wine-py2exe
+    export WINEPREFIX=`pwd`
+
+    axel -a "http://www.python.org/ftp/python/2.7/python-2.7.msi"
+    axel -a "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"
+    #axel -a "http://winetricks.org/winetricks"
+
+    # http://appdb.winehq.org/objectManager.php?sClass=version&iId=21957
+    echo "Follow python setup on screen"
+    wine msiexec /i python-2.7.msi
+    
+    echo "Follow py2exe setup on screen"
+    wine py2exe-0.6.9.win32-py2.7.exe
+    
+    #echo "Follow Microsoft Visual C++ 2008 Redistributable Package setup on screen"
+    #bash winetricks vcrun2008
+
+    rm py2exe-0.6.9.win32-py2.7.exe
+    rm python-2.7.msi
+    #rm winetricks
+    
+    # http://bugs.winehq.org/show_bug.cgi?id=3591
+    
+    mv drive_c/Python27/Lib/site-packages/py2exe/run.exe drive_c/Python27/Lib/site-packages/py2exe/run.exe.backup
+    bspatch drive_c/Python27/Lib/site-packages/py2exe/run.exe.backup drive_c/Python27/Lib/site-packages/py2exe/run.exe "$SCRIPT_DIR/SizeOfImage.patch"
+    mv drive_c/Python27/Lib/site-packages/py2exe/run_w.exe drive_c/Python27/Lib/site-packages/py2exe/run_w.exe.backup
+    bspatch drive_c/Python27/Lib/site-packages/py2exe/run_w.exe.backup drive_c/Python27/Lib/site-packages/py2exe/run_w.exe "$SCRIPT_DIR/SizeOfImage_w.patch"
+
+    cd -
+    
+else
+
+    export WINEPREFIX="$( cd wine-py2exe && pwd )"
+
+fi
+
+wine "C:\\Python27\\python.exe" "$1" py2exe > "py2exe.log" 2>&1 || true
+echo '# Copying python27.dll' >> "py2exe.log"
+cp "$WINEPREFIX/drive_c/windows/system32/python27.dll" build/bdist.win32/winexe/bundle-2.7/
+wine "C:\\Python27\\python.exe" "$1" py2exe >> "py2exe.log" 2>&1
+

devscripts/zsh-completion.py

@@ -1,24 +1,22 @@
 #!/usr/bin/env python3
+from __future__ import unicode_literals
 
-# Allow direct execution
 import os
+from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 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 +25,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,13 +37,13 @@ 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)
 
 
-parser = yt_dlp.parseOpts(ignore_config_files=True)[0]
+parser = yt_dlp.parseOpts()[0]
 build_completion(parser)

docs/.gitignore

@@ -0,0 +1 @@
+_build/

docs/Changelog.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../Changelog.md
+```

docs/Collaborators.md

@@ -0,0 +1,5 @@
+---
+orphan: true
+---
+```{include} ../Collaborators.md
+```