Release 2022.08.18.36

This reverts commit 6929b41a21.

.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -1,5 +1,5 @@
-name: Broken site support
-description: Report issue with yt-dlp on a supported site
+name: Broken site
+description: Report broken or misfunctioning site
 labels: [triage, site-bug]
 body:
   - type: checkboxes
@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -16,15 +16,15 @@ body:
       description: |
         Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
       options:
-        - label: I'm reporting that yt-dlp is broken on a **supported** site
+        - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -50,8 +50,6 @@ body:
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -61,18 +59,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,13 +18,13 @@ body:
       options:
         - label: I'm reporting a new site support request
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
+        - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -62,8 +62,6 @@ body:
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -73,18 +71,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,11 +18,11 @@ body:
       options:
         - label: I'm requesting a site-specific feature
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -58,8 +58,6 @@ body:
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
           required: true
   - type: textarea
@@ -69,18 +67,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -1,4 +1,4 @@
-name: Core bug report
+name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -18,13 +18,13 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -43,8 +43,6 @@ body:
       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
@@ -54,18 +52,19 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell
     validations:

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: checkboxes
     id: checklist
@@ -20,9 +20,9 @@ body:
           required: true
         - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -40,8 +40,6 @@ body:
       label: Provide verbose output that clearly demonstrates the problem
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
   - type: textarea
     id: log
@@ -50,17 +48,18 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell

.github/ISSUE_TEMPLATE/6_question.yml

@@ -7,7 +7,7 @@ body:
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
           required: true
   - type: markdown
     attributes:
@@ -26,9 +26,9 @@ body:
           required: true
         - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **2022.08.19** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
@@ -46,8 +46,6 @@ body:
       label: Provide verbose output that clearly demonstrates the problem
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
-        - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
-          required: false
         - label: Copy the WHOLE output (starting with `[debug] Command-line config`) and insert it below
   - type: textarea
     id: log
@@ -56,17 +54,18 @@ body:
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version 2022.08.19 [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: 2022.08.19, Current version: 2022.08.19
+        yt-dlp is up to date (2022.08.19)
         <more lines>
       render: shell

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -1,5 +1,5 @@
-name: Broken site support
-description: Report issue with yt-dlp on a supported site
+name: Broken site
+description: Report broken or misfunctioning site
 labels: [triage, site-bug]
 body:
   %(no_skip)s
@@ -10,15 +10,15 @@ body:
       description: |
         Carefully read and work through this check list in order to prevent the most common mistakes and misuse of yt-dlp:
       options:
-        - label: I'm reporting that yt-dlp is broken on a **supported** site
+        - label: I'm reporting a broken site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

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

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -12,11 +12,11 @@ body:
       options:
         - label: I'm requesting a site-specific feature
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -1,4 +1,4 @@
-name: Core bug report
+name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
@@ -12,13 +12,13 @@ body:
       options:
         - label: I'm reporting a bug unrelated to a specific site
           required: true
-        - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
+        - label: I've verified that I'm running yt-dlp version **%(version)s** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
+        - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/ytdl-org/youtube-dl#video-url-contains-an-ampersand-and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
           required: true
         - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

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

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/build.yml

@@ -1,457 +1,324 @@
-name: Build Artifacts
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      channel:
-        required: false
-        default: stable
-        type: string
-      unix:
-        default: true
-        type: boolean
-      linux_arm:
-        default: true
-        type: boolean
-      macos:
-        default: true
-        type: boolean
-      macos_legacy:
-        default: true
-        type: boolean
-      windows:
-        default: true
-        type: boolean
-      windows32:
-        default: true
-        type: boolean
-      meta_files:
-        default: true
-        type: boolean
-      origin:
-        required: false
-        default: ''
-        type: string
-    secrets:
-      GPG_SIGNING_KEY:
-        required: false
-
-  workflow_dispatch:
-    inputs:
-      version:
-        description: |
-          VERSION: yyyy.mm.dd[.rev] or rev
-        required: true
-        type: string
-      channel:
-        description: |
-          SOURCE of this build's updates: stable/nightly/master/<repo>
-        required: true
-        default: stable
-        type: string
-      unix:
-        description: yt-dlp, yt-dlp.tar.gz, yt-dlp_linux, yt-dlp_linux.zip
-        default: true
-        type: boolean
-      linux_arm:
-        description: yt-dlp_linux_aarch64, yt-dlp_linux_armv7l
-        default: true
-        type: boolean
-      macos:
-        description: yt-dlp_macos, yt-dlp_macos.zip
-        default: true
-        type: boolean
-      macos_legacy:
-        description: yt-dlp_macos_legacy
-        default: true
-        type: boolean
-      windows:
-        description: yt-dlp.exe, yt-dlp_min.exe, yt-dlp_win.zip
-        default: true
-        type: boolean
-      windows32:
-        description: yt-dlp_x86.exe
-        default: true
-        type: boolean
-      meta_files:
-        description: SHA2-256SUMS, SHA2-512SUMS, _update_spec
-        default: true
-        type: boolean
-      origin:
-        description: .
-        required: false
-        default: ''
-        type: choice
-        options:
-        - ''
-
-permissions:
-  contents: read
+name: Build
+on: workflow_dispatch
 
 jobs:
-  process:
+  prepare:
     runs-on: ubuntu-latest
     outputs:
-      origin: ${{ steps.process_origin.outputs.origin }}
+      version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
+      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
+      head_sha: ${{ steps.push_release.outputs.head_sha }}
     steps:
-      - name: Process origin
-        id: process_origin
-        run: |
-          echo "origin=${{ inputs.origin || github.repository }}" >> "$GITHUB_OUTPUT"
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-python@v4
+      with:
+          python-version: '3.10'
+
+    - name: Set version suffix
+      id: version_suffix
+      env:
+        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
+      if: "env.PUSH_VERSION_COMMIT == ''"
+      run: echo ::set-output name=version_suffix::$(date -u +"%H%M%S")
+    - name: Bump version
+      id: bump_version
+      run: |
+        python devscripts/update-version.py ${{ steps.version_suffix.outputs.version_suffix }}
+        make issuetemplates
+
+    - name: Push to release
+      id: push_release
+      run: |
+        git config --global user.name github-actions
+        git config --global user.email github-actions@example.com
+        git add -u
+        git commit -m "[version] update" -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
+        git push origin --force ${{ github.event.ref }}:release
+        echo ::set-output name=head_sha::$(git rev-parse HEAD)
+    - name: Update master
+      env:
+        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
+      if: "env.PUSH_VERSION_COMMIT != ''"
+      run: git push origin ${{ github.event.ref }}
+
+
+  build_unix:
+    needs: prepare
+    runs-on: ubuntu-18.04  # Standalone executable should be built on minimum supported OS
 
-  unix:
-    needs: process
-    if: inputs.unix
-    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          miniforge-variant: Mambaforge
-          use-mamba: true
-          channels: conda-forge
-          auto-update-conda: true
-          activate-environment: ""
-          auto-activate-base: false
-      - name: Install Requirements
-        run: |
-          sudo apt -y install zip pandoc man sed
-          reqs=$(mktemp)
-          cat > "$reqs" << EOF
-          python=3.10.*
-          pyinstaller
-          cffi
-          brotli-python
-          secretstorage
-          EOF
-          sed -E '/^(brotli|secretstorage).*/d' requirements.txt >> "$reqs"
-          mamba create -n build --file "$reqs"
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+          python-version: '3.10'
+    - name: Install Requirements
+      run: |
+          sudo apt-get -y install zip pandoc man
+          python -m pip install --upgrade pip setuptools wheel twine
+          python -m pip install Pyinstaller -r requirements.txt
 
-      - name: Prepare
-        run: |
-          python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
+    - name: Prepare
+      run: |
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python devscripts/make_lazy_extractors.py
-      - name: Build Unix platform-independent binary
-        run: |
+    - name: Build Unix executables
+      run: |
           make all tar
-      - name: Build Unix standalone binary
-        shell: bash -l {0}
-        run: |
-          unset LD_LIBRARY_PATH  # Harmful; set by setup-python
-          conda activate build
           python pyinst.py --onedir
           (cd ./dist/yt-dlp_linux && zip -r ../yt-dlp_linux.zip .)
           python pyinst.py
-          mv ./dist/yt-dlp_linux ./yt-dlp_linux
-          mv ./dist/yt-dlp_linux.zip ./yt-dlp_linux.zip
+    - name: Get SHA2-SUMS
+      id: get_sha
+      run: |
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          binaries=("yt-dlp" "yt-dlp_linux")
-          for binary in "${binaries[@]}"; do
-            chmod +x ./${binary}
-            cp ./${binary} ./${binary}_downgraded
-            version="$(./${binary} --version)"
-            ./${binary}_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-            downgraded_version="$(./${binary}_downgraded --version)"
-            [[ "$version" != "$downgraded_version" ]]
-          done
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          yt-dlp
+          yt-dlp.tar.gz
+          dist/yt-dlp_linux
+          dist/yt-dlp_linux.zip
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            yt-dlp
-            yt-dlp.tar.gz
-            yt-dlp_linux
-            yt-dlp_linux.zip
+    - name: Build and publish on PyPi
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+      if: "env.TWINE_PASSWORD != ''"
+      run: |
+        rm -rf dist/*
+        python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
+        python setup.py sdist bdist_wheel
+        twine upload dist/*
 
-  linux_arm:
-    needs: process
-    if: inputs.linux_arm
-    permissions:
-      contents: read
-      packages: write # for creating cache
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        architecture:
-          - armv7
-          - aarch64
+    - name: Install SSH private key for Homebrew
+      env:
+        BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
+      if: "env.BREW_TOKEN != ''"
+      uses: yt-dlp/ssh-agent@v0.5.3
+      with:
+          ssh-private-key: ${{ env.BREW_TOKEN }}
+    - name: Update Homebrew Formulae
+      env:
+        BREW_TOKEN: ${{ secrets.BREW_TOKEN }}
+      if: "env.BREW_TOKEN != ''"
+      run: |
+        git clone git@github.com:yt-dlp/homebrew-taps taps/
+        python devscripts/update-formulae.py taps/Formula/yt-dlp.rb "${{ needs.prepare.outputs.ytdlp_version }}"
+        git -C taps/ config user.name github-actions
+        git -C taps/ config user.email github-actions@example.com
+        git -C taps/ commit -am 'yt-dlp: ${{ needs.prepare.outputs.ytdlp_version }}'
+        git -C taps/ push
 
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: ./repo
-      - name: Virtualized Install, Prepare & Build
-        uses: yt-dlp/run-on-arch-action@v2
-        with:
-          # Ref: https://github.com/uraimo/run-on-arch-action/issues/55
-          env: |
-            GITHUB_WORKFLOW: build
-          githubToken: ${{ github.token }} # To cache image
-          arch: ${{ matrix.architecture }}
-          distro: ubuntu18.04 # Standalone executable should be built on minimum supported OS
-          dockerRunArgs: --volume "${PWD}/repo:/repo"
-          install: | # Installing Python 3.10 from the Deadsnakes repo raises errors
-            apt update
-            apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip
-            python3.8 -m pip install -U pip setuptools wheel
-            # Cannot access requirements.txt from the repo directory at this stage
-            python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi
 
-          run: |
-            cd repo
-            python3.8 -m pip install -U Pyinstaller -r requirements.txt  # Cached version may be out of date
-            python3.8 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
-            python3.8 devscripts/make_lazy_extractors.py
-            python3.8 pyinst.py
-
-            if ${{ vars.UPDATE_TO_VERIFICATION && 'true' || 'false' }}; then
-              arch="${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }}"
-              chmod +x ./dist/yt-dlp_linux_${arch}
-              cp ./dist/yt-dlp_linux_${arch} ./dist/yt-dlp_linux_${arch}_downgraded
-              version="$(./dist/yt-dlp_linux_${arch} --version)"
-              ./dist/yt-dlp_linux_${arch}_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-              downgraded_version="$(./dist/yt-dlp_linux_${arch}_downgraded --version)"
-              [[ "$version" != "$downgraded_version" ]]
-            fi
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: | # run-on-arch-action designates armv7l as armv7
-            repo/dist/yt-dlp_linux_${{ (matrix.architecture == 'armv7' && 'armv7l') || matrix.architecture }}
-
-  macos:
-    needs: process
-    if: inputs.macos
+  build_macos:
     runs-on: macos-11
+    needs: prepare
 
     steps:
-      - uses: actions/checkout@v4
-      # NB: Building universal2 does not work with python from actions/setup-python
-      - name: Install Requirements
-        run: |
+    - uses: actions/checkout@v3
+    # NB: In order to create a universal2 application, the version of python3 in /usr/bin has to be used
+    - name: Install Requirements
+      run: |
           brew install coreutils
-          python3 -m pip install -U --user pip setuptools wheel
-          # We need to ignore wheels otherwise we break universal2 builds
-          python3 -m pip install -U --user --no-binary :all: Pyinstaller -r requirements.txt
+          /usr/bin/python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
 
-      - name: Prepare
-        run: |
-          python3 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
-          python3 devscripts/make_lazy_extractors.py
-      - name: Build
-        run: |
-          python3 pyinst.py --target-architecture universal2 --onedir
+    - name: Prepare
+      run: |
+          /usr/bin/python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
+          /usr/bin/python3 devscripts/make_lazy_extractors.py
+    - name: Build
+      run: |
+          /usr/bin/python3 pyinst.py --target-architecture universal2 --onedir
           (cd ./dist/yt-dlp_macos && zip -r ../yt-dlp_macos.zip .)
-          python3 pyinst.py --target-architecture universal2
+          /usr/bin/python3 pyinst.py --target-architecture universal2
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          chmod +x ./dist/yt-dlp_macos
-          cp ./dist/yt-dlp_macos ./dist/yt-dlp_macos_downgraded
-          version="$(./dist/yt-dlp_macos --version)"
-          ./dist/yt-dlp_macos_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-          downgraded_version="$(./dist/yt-dlp_macos_downgraded --version)"
-          [[ "$version" != "$downgraded_version" ]]
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp_macos
+          dist/yt-dlp_macos.zip
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            dist/yt-dlp_macos
-            dist/yt-dlp_macos.zip
 
-  macos_legacy:
-    needs: process
-    if: inputs.macos_legacy
+  build_macos_legacy:
     runs-on: macos-latest
+    needs: prepare
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Install Python
-        # We need the official Python, because the GA ones only support newer macOS versions
-        env:
-          PYTHON_VERSION: 3.10.5
-          MACOSX_DEPLOYMENT_TARGET: 10.9 # Used up by the Python build tools
-        run: |
+    - uses: actions/checkout@v3
+    - name: Install Python
+      # We need the official Python, because the GA ones only support newer macOS versions
+      env:
+        PYTHON_VERSION: 3.10.5
+        MACOSX_DEPLOYMENT_TARGET: 10.9  # Used up by the Python build tools
+      run: |
           # Hack to get the latest patch version. Uncomment if needed
           #brew install python@3.10
           #export PYTHON_VERSION=$( $(brew --prefix)/opt/python@3.10/bin/python3 --version | cut -d ' ' -f 2 )
           curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o "python.pkg"
           sudo installer -pkg python.pkg -target /
           python3 --version
-      - name: Install Requirements
-        run: |
+    - name: Install Requirements
+      run: |
           brew install coreutils
-          python3 -m pip install -U --user pip setuptools wheel
-          python3 -m pip install -U --user Pyinstaller -r requirements.txt
+          python3 -m pip install -U --user pip Pyinstaller -r requirements.txt
 
-      - name: Prepare
-        run: |
-          python3 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
+    - name: Prepare
+      run: |
+          python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python3 devscripts/make_lazy_extractors.py
-      - name: Build
-        run: |
+    - name: Build
+      run: |
           python3 pyinst.py
           mv dist/yt-dlp_macos dist/yt-dlp_macos_legacy
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          chmod +x ./dist/yt-dlp_macos_legacy
-          cp ./dist/yt-dlp_macos_legacy ./dist/yt-dlp_macos_legacy_downgraded
-          version="$(./dist/yt-dlp_macos_legacy --version)"
-          ./dist/yt-dlp_macos_legacy_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
-          downgraded_version="$(./dist/yt-dlp_macos_legacy_downgraded --version)"
-          [[ "$version" != "$downgraded_version" ]]
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp_macos_legacy
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            dist/yt-dlp_macos_legacy
 
-  windows:
-    needs: process
-    if: inputs.windows
+  build_windows:
     runs-on: windows-latest
+    needs: prepare
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with: # 3.8 is used for Win7 support
-          python-version: "3.8"
-      - name: Install Requirements
-        run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
-          python -m pip install -U pip setuptools wheel py2exe
-          pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.8.0-py3-none-any.whl" -r requirements.txt
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:  # 3.8 is used for Win7 support
+          python-version: '3.8'
+    - name: Install Requirements
+      run: |  # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
+          python -m pip install --upgrade pip setuptools wheel py2exe
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
 
-      - name: Prepare
-        run: |
-          python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
+    - name: Prepare
+      run: |
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python devscripts/make_lazy_extractors.py
-      - name: Build
-        run: |
+    - name: Build
+      run: |
           python setup.py py2exe
           Move-Item ./dist/yt-dlp.exe ./dist/yt-dlp_min.exe
           python pyinst.py
           python pyinst.py --onedir
           Compress-Archive -Path ./dist/yt-dlp/* -DestinationPath ./dist/yt-dlp_win.zip
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          foreach ($name in @("yt-dlp","yt-dlp_min")) {
-            Copy-Item "./dist/${name}.exe" "./dist/${name}_downgraded.exe"
-            $version = & "./dist/${name}.exe" --version
-            & "./dist/${name}_downgraded.exe" -v --update-to yt-dlp/yt-dlp@2023.03.04
-            $downgraded_version = & "./dist/${name}_downgraded.exe" --version
-            if ($version -eq $downgraded_version) {
-              exit 1
-            }
-          }
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp.exe
+          dist/yt-dlp_min.exe
+          dist/yt-dlp_win.zip
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            dist/yt-dlp.exe
-            dist/yt-dlp_min.exe
-            dist/yt-dlp_win.zip
 
-  windows32:
-    needs: process
-    if: inputs.windows32
+  build_windows32:
     runs-on: windows-latest
+    needs: prepare
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with: # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
-          python-version: "3.7"
-          architecture: "x86"
-      - name: Install Requirements
-        run: |
-          python -m pip install -U pip setuptools wheel
-          pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.8.0-py3-none-any.whl" -r requirements.txt
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:  # 3.7 is used for Vista support. See https://github.com/yt-dlp/yt-dlp/issues/390
+          python-version: '3.7'
+          architecture: 'x86'
+    - name: Install Requirements
+      run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.2-py3-none-any.whl" -r requirements.txt
 
-      - name: Prepare
-        run: |
-          python devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
+    - name: Prepare
+      run: |
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
           python devscripts/make_lazy_extractors.py
-      - name: Build
-        run: |
+    - name: Build
+      run: |
           python pyinst.py
 
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          foreach ($name in @("yt-dlp_x86")) {
-            Copy-Item "./dist/${name}.exe" "./dist/${name}_downgraded.exe"
-            $version = & "./dist/${name}.exe" --version
-            & "./dist/${name}_downgraded.exe" -v --update-to yt-dlp/yt-dlp@2023.03.04
-            $downgraded_version = & "./dist/${name}_downgraded.exe" --version
-            if ($version -eq $downgraded_version) {
-              exit 1
-            }
-          }
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          dist/yt-dlp_x86.exe
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            dist/yt-dlp_x86.exe
 
-  meta_files:
-    if: inputs.meta_files && always() && !cancelled()
-    needs:
-      - process
-      - unix
-      - linux_arm
-      - macos
-      - macos_legacy
-      - windows
-      - windows32
+  publish_release:
     runs-on: ubuntu-latest
+    needs: [prepare, build_unix, build_windows, build_windows32, build_macos, build_macos_legacy]
+
     steps:
-      - uses: actions/download-artifact@v3
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
 
-      - name: Make SHA2-SUMS files
-        run: |
-          cd ./artifact/
-          sha256sum * > ../SHA2-256SUMS
-          sha512sum * > ../SHA2-512SUMS
+    - name: Get Changelog
+      run: |
+        changelog=$(grep -oPz '(?s)(?<=### ${{ needs.prepare.outputs.ytdlp_version }}\n{2}).+?(?=\n{2,3}###)' Changelog.md) || true
+        echo "changelog<<EOF" >> $GITHUB_ENV
+        echo "$changelog" >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
+    - name: Make Update spec
+      run: |
+        echo "# This file is used for regulating self-update" >> _update_spec
+        echo "lock 2022.08.18.36 .+ Python 3.6" >> _update_spec
+    - name: Make SHA2-SUMS files
+      run: |
+          sha256sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-256SUMS
+          sha256sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-256SUMS
+          sha256sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-256SUMS
+          sha256sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-256SUMS
+          sha512sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-512SUMS
+          sha512sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-512SUMS
+          sha512sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-512SUMS
+          sha512sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-512SUMS
 
-      - name: Make Update spec
-        run: |
-          cat >> _update_spec << EOF
-          # This file is used for regulating self-update
-          lock 2022.08.18.36 .+ Python 3.6
-          EOF
+    - name: Publish Release
+      uses: yt-dlp/action-gh-release@v1
+      with:
+        tag_name: ${{ needs.prepare.outputs.ytdlp_version }}
+        name: yt-dlp ${{ needs.prepare.outputs.ytdlp_version }}
+        target_commitish: ${{ needs.prepare.outputs.head_sha }}
+        body: |
+          #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
 
-      - name: Sign checksum files
-        env:
-          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
-        if: env.GPG_SIGNING_KEY != ''
-        run: |
-          gpg --batch --import <<< "${{ secrets.GPG_SIGNING_KEY }}"
-          for signfile in ./SHA*SUMS; do
-            gpg --batch --detach-sign "$signfile"
-          done
+          ---
+          <details open><summary><h3>Changelog</summary>
+          <p>
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            SHA*SUMS*
-            _update_spec
+          ${{ env.changelog }}
+
+          </p>
+          </details>
+        files: |
+          SHA2-256SUMS
+          SHA2-512SUMS
+          artifact/yt-dlp
+          artifact/yt-dlp.tar.gz
+          artifact/yt-dlp.exe
+          artifact/yt-dlp_win.zip
+          artifact/yt-dlp_min.exe
+          artifact/yt-dlp_x86.exe
+          artifact/yt-dlp_macos
+          artifact/yt-dlp_macos.zip
+          artifact/yt-dlp_macos_legacy
+          artifact/dist/yt-dlp_linux
+          artifact/dist/yt-dlp_linux.zip
+          _update_spec

.github/workflows/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@v4
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      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@v2
-
-    # ℹ️ 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@v2
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/core.yml

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

.github/workflows/download.yml

@@ -1,15 +1,12 @@
 name: Download Tests
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
   quick:
     name: Quick Download Tests
     if: "contains(github.event.head_commit.message, 'ci run dl')"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -28,7 +25,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.7', '3.10', '3.12', pypy-3.7, pypy-3.8, pypy-3.10]
+        python-version: ['3.6', '3.7', '3.10', 3.11-dev, pypy-3.6, pypy-3.7, pypy-3.8]
         run-tests-ext: [sh]
         include:
         # atleast one of each CPython/PyPy tests must be in windows
@@ -39,7 +36,7 @@ jobs:
           python-version: pypy-3.9
           run-tests-ext: bat
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

.github/workflows/quick-test.yml

@@ -1,32 +1,30 @@
 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@v4
-    - name: Set up Python 3.11
+    - uses: actions/checkout@v3
+    - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: 3.9
     - name: Install test requirements
       run: pip install pytest pycryptodomex
     - name: Run tests
-      run: |
-        python3 -m yt_dlp -v || true
-        ./devscripts/run_tests.sh core
+      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@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
     - name: Install flake8
       run: pip install flake8
     - name: Make lazy extractors

.github/workflows/release-master.yml

@@ -1,28 +0,0 @@
-name: Release (master)
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - "yt_dlp/**.py"
-      - "!yt_dlp/version.py"
-      - "setup.py"
-      - "pyinst.py"
-concurrency:
-  group: release-master
-  cancel-in-progress: true
-permissions:
-  contents: read
-
-jobs:
-  release:
-    if: vars.BUILD_MASTER != ''
-    uses: ./.github/workflows/release.yml
-    with:
-      prerelease: true
-      source: master
-    permissions:
-      contents: write
-      packages: write
-      id-token: write  # mandatory for trusted publishing
-    secrets: inherit

.github/workflows/release-nightly.yml

@@ -1,35 +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@v4
-        with:
-          fetch-depth: 0
-      - name: Check for new commits
-        id: check_for_new_commits
-        run: |
-          relevant_files=("yt_dlp/*.py" ':!yt_dlp/version.py' "setup.py" "pyinst.py")
-          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: nightly
-    permissions:
-      contents: write
-      packages: write
-      id-token: write  # mandatory for trusted publishing
-    secrets: inherit

.github/workflows/release.yml

@@ -1,399 +0,0 @@
-name: Release
-on:
-  workflow_call:
-    inputs:
-      prerelease:
-        required: false
-        default: true
-        type: boolean
-      source:
-        required: false
-        default: ''
-        type: string
-      target:
-        required: false
-        default: ''
-        type: string
-      version:
-        required: false
-        default: ''
-        type: string
-  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
-      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 }}
-      pypi_token: ${{ steps.setup_variables.outputs.pypi_token }}
-      head_sha: ${{ steps.get_target.outputs.head_sha }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      - name: Process inputs
-        id: process_inputs
-        run: |
-          cat << EOF
-          ::group::Inputs
-          prerelease=${{ inputs.prerelease }}
-          source=${{ inputs.source }}
-          target=${{ inputs.target }}
-          version=${{ inputs.version }}
-          ::endgroup::
-          EOF
-          IFS='@' read -r source_repo source_tag <<<"${{ inputs.source }}"
-          IFS='@' read -r target_repo target_tag <<<"${{ inputs.target }}"
-          cat << EOF >> "$GITHUB_OUTPUT"
-          source_repo=${source_repo}
-          source_tag=${source_tag}
-          target_repo=${target_repo}
-          target_tag=${target_tag}
-          EOF
-
-      - name: Setup variables
-        id: setup_variables
-        env:
-          source_repo: ${{ steps.process_inputs.outputs.source_repo }}
-          source_tag: ${{ steps.process_inputs.outputs.source_tag }}
-          target_repo: ${{ steps.process_inputs.outputs.target_repo }}
-          target_tag: ${{ steps.process_inputs.outputs.target_tag }}
-        run: |
-          # unholy bash monstrosity (sincere apologies)
-          fallback_token () {
-            if ${{ !secrets.ARCHIVE_REPO_TOKEN }}; then
-              echo "::error::Repository access secret ${target_repo_token^^} not found"
-              exit 1
-            fi
-            target_repo_token=ARCHIVE_REPO_TOKEN
-            return 0
-          }
-
-          source_is_channel=0
-          [[ "${source_repo}" == 'stable' ]] && source_repo='yt-dlp/yt-dlp'
-          if [[ -z "${source_repo}" ]]; then
-            source_repo='${{ github.repository }}'
-          elif [[ '${{ vars[format('{0}_archive_repo', env.source_repo)] }}' ]]; then
-            source_is_channel=1
-            source_channel='${{ vars[format('{0}_archive_repo', env.source_repo)] }}'
-          elif [[ -z "${source_tag}" && "${source_repo}" != */* ]]; then
-            source_tag="${source_repo}"
-            source_repo='${{ github.repository }}'
-          fi
-          resolved_source="${source_repo}"
-          if [[ "${source_tag}" ]]; then
-            resolved_source="${resolved_source}@${source_tag}"
-          elif [[ "${source_repo}" == 'yt-dlp/yt-dlp' ]]; then
-            resolved_source='stable'
-          fi
-
-          revision="${{ (inputs.prerelease || !vars.PUSH_VERSION_COMMIT) && '$(date -u +"%H%M%S")' || '' }}"
-          version="$(
-            python devscripts/update-version.py \
-            -c "${resolved_source}" -r "${{ github.repository }}" ${{ inputs.version || '$revision' }} | \
-            grep -Po "version=\K\d+\.\d+\.\d+(\.\d+)?")"
-
-          if [[ "${target_repo}" ]]; then
-            if [[ -z "${target_tag}" ]]; then
-              if [[ '${{ vars[format('{0}_archive_repo', env.target_repo)] }}' ]]; then
-                target_tag="${source_tag:-${version}}"
-              else
-                target_tag="${target_repo}"
-                target_repo='${{ github.repository }}'
-              fi
-            fi
-            if [[ "${target_repo}" != '${{ github.repository}}' ]]; then
-              target_repo='${{ vars[format('{0}_archive_repo', env.target_repo)] }}'
-              target_repo_token='${{ env.target_repo }}_archive_repo_token'
-              ${{ !!secrets[format('{0}_archive_repo_token', env.target_repo)] }} || fallback_token
-              pypi_project='${{ vars[format('{0}_pypi_project', env.target_repo)] }}'
-              pypi_suffix='${{ vars[format('{0}_pypi_suffix', env.target_repo)] }}'
-              ${{ !secrets[format('{0}_pypi_token', env.target_repo)] }} || pypi_token='${{ env.target_repo }}_pypi_token'
-            fi
-          else
-            target_tag="${source_tag:-${version}}"
-            if ((source_is_channel)); then
-              target_repo="${source_channel}"
-              target_repo_token='${{ env.source_repo }}_archive_repo_token'
-              ${{ !!secrets[format('{0}_archive_repo_token', env.source_repo)] }} || fallback_token
-              pypi_project='${{ vars[format('{0}_pypi_project', env.source_repo)] }}'
-              pypi_suffix='${{ vars[format('{0}_pypi_suffix', env.source_repo)] }}'
-              ${{ !secrets[format('{0}_pypi_token', env.source_repo)] }} || pypi_token='${{ env.source_repo }}_pypi_token'
-            else
-              target_repo='${{ github.repository }}'
-            fi
-          fi
-
-          if [[ "${target_repo}" == '${{ github.repository }}' ]] && ${{ !inputs.prerelease }}; then
-            pypi_project='${{ vars.PYPI_PROJECT }}'
-          fi
-          if [[ -z "${pypi_token}" && "${pypi_project}" ]]; then
-            if ${{ !secrets.PYPI_TOKEN }}; then
-              pypi_token=OIDC
-            else
-              pypi_token=PYPI_TOKEN
-            fi
-          fi
-
-          echo "::group::Output variables"
-          cat << EOF | tee -a "$GITHUB_OUTPUT"
-          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}
-          pypi_token=${pypi_token}
-          EOF
-          echo "::endgroup::"
-
-      - name: Update documentation
-        env:
-          version: ${{ steps.setup_variables.outputs.version }}
-          target_repo: ${{ steps.setup_variables.outputs.target_repo }}
-        if: |
-          !inputs.prerelease && env.target_repo == github.repository
-        run: |
-          make doc
-          sed '/### /Q' Changelog.md >> ./CHANGELOG
-          echo '### ${{ env.version }}' >> ./CHANGELOG
-          python ./devscripts/make_changelog.py -vv -c >> ./CHANGELOG
-          echo >> ./CHANGELOG
-          grep -Poz '(?s)### \d+\.\d+\.\d+.+' 'Changelog.md' | head -n -1 >> ./CHANGELOG
-          cat ./CHANGELOG > Changelog.md
-
-      - name: Push to release
-        id: push_release
-        env:
-          version: ${{ steps.setup_variables.outputs.version }}
-          target_repo: ${{ steps.setup_variables.outputs.target_repo }}
-        if: |
-          !inputs.prerelease && env.target_repo == github.repository
-        run: |
-          git config --global user.name github-actions
-          git config --global user.email github-actions@github.com
-          git add -u
-          git commit -m "Release ${{ env.version }}" \
-            -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
-          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:
-          target_repo: ${{ steps.setup_variables.outputs.target_repo }}
-        if: |
-          vars.PUSH_VERSION_COMMIT != '' && !inputs.prerelease && env.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 }}
-    permissions:
-      contents: read
-      packages: write # For package cache
-    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@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      - name: Install Requirements
-        run: |
-          sudo apt -y install pandoc man
-          python -m pip install -U pip setuptools wheel twine
-          python -m pip install -U -r requirements.txt
-
-      - 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 "${{ env.channel }}" -r "${{ env.target_repo }}" -s "${{ env.suffix }}" "${{ env.version }}"
-          python devscripts/make_lazy_extractors.py
-          sed -i -E "s/(name=')[^']+(',  # package name)/\1${{ env.pypi_project }}\2/" setup.py
-
-      - name: Build
-        run: |
-          rm -rf dist/*
-          make pypi-files
-          python devscripts/set-variant.py pip -M "You installed yt-dlp with pip or using the wheel from PyPi; Use that to update"
-          python setup.py sdist bdist_wheel
-
-      - name: Publish to PyPI via token
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets[needs.prepare.outputs.pypi_token] }}
-        if: |
-          needs.prepare.outputs.pypi_token != 'OIDC' && env.TWINE_PASSWORD
-        run: |
-          twine upload dist/*
-
-      - name: Publish to PyPI via trusted publishing
-        if: |
-          needs.prepare.outputs.pypi_token == 'OIDC'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true
-
-  publish:
-    needs: [prepare, build]
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/download-artifact@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      - name: Generate release notes
-        env:
-          head_sha: ${{ needs.prepare.outputs.head_sha }}
-          target_repo: ${{ needs.prepare.outputs.target_repo }}
-          target_tag: ${{ needs.prepare.outputs.target_tag }}
-        run: |
-          printf '%s' \
-            '[![Installation](https://img.shields.io/badge/-Which%20file%20should%20I%20download%3F-white.svg?style=for-the-badge)]' \
-              '(https://github.com/${{ github.repository }}#installation "Installation instructions") ' \
-            '[![Documentation](https://img.shields.io/badge/-Docs-brightgreen.svg?style=for-the-badge&logo=GitBook&labelColor=555555)]' \
-              '(https://github.com/${{ github.repository }}' \
-              '${{ env.target_repo == github.repository && format('/tree/{0}', env.target_tag) || '' }}#readme "Documentation") ' \
-            '[![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)]' \
-              '(https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators "Donate") ' \
-            '[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)]' \
-              '(https://discord.gg/H5MNcFW63r "Discord") ' \
-            ${{ env.target_repo == 'yt-dlp/yt-dlp' && '\
-              "[![Nightly](https://img.shields.io/badge/Get%20nightly%20builds-purple.svg?style=for-the-badge)]" \
-              "(https://github.com/yt-dlp/yt-dlp-nightly-builds/releases/latest \"Nightly builds\") " \
-              "[![Master](https://img.shields.io/badge/Get%20master%20builds-lightblue.svg?style=for-the-badge)]" \
-              "(https://github.com/yt-dlp/yt-dlp-master-builds/releases/latest \"Master builds\")"' || '' }} > ./RELEASE_NOTES
-          printf '\n\n' >> ./RELEASE_NOTES
-          cat >> ./RELEASE_NOTES << EOF
-          #### A description of the various files are in the [README](https://github.com/${{ github.repository }}#release-files)
-          ---
-          $(python ./devscripts/make_changelog.py -vv --collapsible)
-          EOF
-          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/${{ github.repository }}/commit/${{ env.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 }}
-          version: ${{ needs.prepare.outputs.version }}
-          channel: ${{ needs.prepare.outputs.channel }}
-        if: |
-          inputs.prerelease && env.GH_TOKEN != '' && env.GH_REPO != '' && env.GH_REPO != github.repository
-        run: |
-          title="${{ startswith(env.GH_REPO, 'yt-dlp/') && 'yt-dlp ' || '' }}${{ env.channel }}"
-          gh release create \
-            --notes-file ARCHIVE_NOTES \
-            --title "${title} ${{ env.version }}" \
-            ${{ env.version }} \
-            artifact/*
-
-      - name: Prune old release
-        env:
-          GH_TOKEN: ${{ github.token }}
-          version: ${{ needs.prepare.outputs.version }}
-          target_repo: ${{ needs.prepare.outputs.target_repo }}
-          target_tag: ${{ needs.prepare.outputs.target_tag }}
-        if: |
-          env.target_repo == github.repository && env.target_tag != env.version
-        run: |
-          gh release delete --yes --cleanup-tag "${{ env.target_tag }}" || true
-          git tag --delete "${{ env.target_tag }}" || true
-          sleep 5  # Enough time to cover deletion race condition
-
-      - name: Publish release
-        env:
-          GH_TOKEN: ${{ github.token }}
-          version: ${{ needs.prepare.outputs.version }}
-          target_repo: ${{ needs.prepare.outputs.target_repo }}
-          target_tag: ${{ needs.prepare.outputs.target_tag }}
-          head_sha: ${{ needs.prepare.outputs.head_sha }}
-        if: |
-          env.target_repo == github.repository
-        run: |
-          title="${{ github.repository == 'yt-dlp/yt-dlp' && 'yt-dlp ' || '' }}"
-          title+="${{ env.target_tag != env.version && format('{0} ', env.target_tag) || '' }}"
-          gh release create \
-            --notes-file ${{ inputs.prerelease && 'PRERELEASE_NOTES' || 'RELEASE_NOTES' }} \
-            --target ${{ env.head_sha }} \
-            --title "${title}${{ env.version }}" \
-            ${{ inputs.prerelease && '--prerelease' || '' }} \
-            ${{ env.target_tag }} \
-            artifact/*

.gitignore

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

CONTRIBUTING.md

@@ -79,7 +79,7 @@ Before reporting any issue, type `yt-dlp -U`. This should report that you're up-
 
 ###  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, subcribe to it to be notified when there is any progress. Unless you have something useful to add to the converation, 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,7 +127,7 @@ While these steps won't necessarily ensure that no misuse of the account takes p
 
 ### 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). 
 
 
 
@@ -161,7 +161,7 @@ The same applies for changes to the documentation, code style, or overarching ch
 
 ## Adding support for a new site
 
-If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](#is-the-website-primarily-used-for-piracy)**. yt-dlp does **not support** such sites thus pull requests adding support for them **will be rejected**.
+If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](https://www.github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. yt-dlp does **not support** such sites thus pull requests adding support for them **will be rejected**.
 
 After you have ensured this site is distributing its content legally, you can follow this quick list (assuming your service is called `yourextractor`):
 
@@ -217,7 +217,7 @@ After you have ensured this site is distributing its content legally, you can fo
 1. Add an import in [`yt_dlp/extractor/_extractors.py`](yt_dlp/extractor/_extractors.py). Note that the class name must end with `IE`.
 1. Run `python test/test_download.py TestDownload.test_YourExtractor` (note that `YourExtractor` doesn't end with `IE`). This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, the tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in. You can also run all the tests in one go with `TestDownload.test_YourExtractor_all`
 1. Make sure you have atleast one test for your extractor. Even if all videos covered by the extractor are expected to be inaccessible for automated testing, tests should still be added with a `skip` parameter indicating why the particular test is disabled from running.
-1. Have a look at [`yt_dlp/extractor/common.py`](yt_dlp/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](yt_dlp/extractor/common.py#L119-L440). Add tests and code for as many as you want.
+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):
 
         $ flake8 yt_dlp/extractor/yourextractor.py
@@ -246,12 +246,12 @@ In any case, thank you very much for your contributions!
 
 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)
@@ -351,9 +351,8 @@ Say you extracted a list of thumbnails into `thumbnail_data` and want to iterate
 ```python
 thumbnail_data = data.get('thumbnails') or []
 thumbnails = [{
-    'url': item['url'],
-    'height': item.get('h'),
-} for item in thumbnail_data if item.get('url')]  # correct
+    'url': item['url']
+} for item in thumbnail_data]  # correct
 ```
 
 and not like:
@@ -361,27 +360,12 @@ and not like:
 ```python
 thumbnail_data = data.get('thumbnails')
 thumbnails = [{
-    'url': item['url'],
-    'height': item.get('h'),
+    'url': item['url']
 } for item in thumbnail_data]  # incorrect
 ```
 
 In this case, `thumbnail_data` will be `None` if the field was not found and this will cause the loop `for item in thumbnail_data` to raise a fatal error. Using `or []` avoids this error and results in setting an empty list in `thumbnails` instead.
 
-Alternately, this can be further simplified by using `traverse_obj`
-
-```python
-thumbnails = [{
-    'url': item['url'],
-    'height': item.get('h'),
-} for item in traverse_obj(data, ('thumbnails', lambda _, v: v['url']))]
-```
-
-or, even better,
-
-```python
-thumbnails = traverse_obj(data, ('thumbnails', ..., {'url': 'url', 'height': 'h'}))
-```
 
 ### Provide fallbacks
 
@@ -696,7 +680,7 @@ formats = [
 
 ### 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.
 
@@ -704,7 +688,7 @@ Use `traverse_obj` and `try_call` (superseeds `dict_get` and `try_get`) for safe
 
 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
 

CONTRIBUTORS

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

Collaborators.md

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

Makefile

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

devscripts/changelog_override.json

@@ -1,118 +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"
-    }
-]

devscripts/changelog_override.schema.json

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

devscripts/cli_to_api.py

@@ -1,48 +0,0 @@
-# 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',
-    })
-    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/lazy_load_template.py

@@ -6,23 +6,19 @@ 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
+ALLOWED_CLASSMETHODS = {'get_testcases', 'extract_from_webpage'}
 
 
 class LazyLoadMetaClass(type):
     def __getattr__(cls, name):
-        global _WARNED
-        if ('_real_class' not in cls.__dict__
-                and name not in ALLOWED_CLASSMETHODS and not _WARNED):
-            _WARNED = True
-            write_string('WARNING: Falling back to normal extractor since lazy extractor '
-                         f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
+        if '_real_class' not in cls.__dict__ and name not in ALLOWED_CLASSMETHODS:
+            write_string(
+                'WARNING: Falling back to normal extractor since lazy extractor '
+                f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
         return getattr(cls.real_class, name)
 
 

devscripts/make_changelog.py

@@ -1,517 +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.CORE: {
-                    'aes',
-                    'cache',
-                    'compat_utils',
-                    'compat',
-                    'cookies',
-                    'dependencies',
-                    'formats',
-                    'jsinterp',
-                    'outtmpl',
-                    'plugins',
-                    'update',
-                    'utils',
-                },
-                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('/'))
-
-        result = cls.group_lookup().get(group)
-        if not result:
-            if subgroup:
-                return None, value
-            subgroup = group
-            result = cls.subgroup_lookup().get(subgroup)
-
-        return result, subgroup 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'
-
-            group = groups[item]
-            if group:
-                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, hash):
-        assert message or hash, 'Improperly defined commit message or override'
-        message = message if message else hash[:HASH_LENGTH]
-        return f'[{message}]({self.repo_url}/commit/{hash})' if 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:Fix(?:es)?(?:\s+bugs?)?(?:\s+in|\s+for)?|Revert)\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'
-
-            authors = [default_author] if default_author else []
-            for line in iter(lambda: next(lines), self.COMMIT_SEPARATOR):
-                match = self.AUTHOR_INDICATOR_RE.match(line)
-                if match:
-                    authors = sorted(map(str.strip, line[match.end():].split(',')), key=str.casefold)
-
-            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
-
-            revert_match = self.REVERT_RE.fullmatch(commit.short)
-            if revert_match:
-                reverts[revert_match.group(1)] = commit
-                continue
-
-            fix_match = self.FIXES_RE.search(commit.short)
-            if fix_match:
-                commitish = fix_match.group(1)
-                fixes[commitish].append(commit)
-
-            commits[commit.hash] = commit
-
-        for commitish, revert_commit in reverts.items():
-            reverted = commits.pop(commitish, None)
-            if reverted:
-                logger.debug(f'{commitish} fully reverted {reverted}')
-            else:
-                commits[revert_commit.hash] = revert_commit
-
-        for commitish, fix_commits in fixes.items():
-            if commitish in commits:
-                hashes = ', '.join(commit.hash[:HASH_LENGTH] for commit in fix_commits)
-                logger.info(f'Found fix(es) for {commitish[:HASH_LENGTH]}: {hashes}')
-                for fix_commit in fix_commits:
-                    del commits[fix_commit.hash]
-            else:
-                logger.debug(f'Commit with fixes not in changes: {commitish[:HASH_LENGTH]}')
-
-        return commits, fixes
-
-    def apply_overrides(self, overrides):
-        for override in overrides:
-            when = override.get('when')
-            if when and when not in self and when != self._start:
-                logger.debug(f'Ignored {when!r} override')
-                continue
-
-            override_hash = override.get('hash') or when
-            if override['action'] == 'add':
-                commit = Commit(override.get('hash'), override['short'], override.get('authors') or [])
-                logger.info(f'ADD    {commit}')
-                self._commits_added.append(commit)
-
-            elif override['action'] == 'remove':
-                if override_hash in self._commits:
-                    logger.info(f'REMOVE {self._commits[override_hash]}')
-                    del self._commits[override_hash]
-
-            elif override['action'] == 'change':
-                if override_hash not in self._commits:
-                    continue
-                commit = Commit(override_hash, override['short'], override.get('authors') or [])
-                logger.info(f'CHANGE {self._commits[commit.hash]} -> {commit}')
-                self._commits[commit.hash] = commit
-
-        self._commits = {key: value for key, value in 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(',')))
-                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
-                else:
-                    group = CommitGroup.POSTPROCESSOR
-                logger.warning(f'Failed to map {commit.short!r}, selected {group.name.lower()}')
-
-            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)
-
-
-if __name__ == '__main__':
-    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)')
-    args = parser.parse_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')
-
-    new_contributors = get_new_contributors(args.contributors_path, commits)
-    if new_contributors:
-        if args.contributors:
-            write_file(args.contributors_path, '\n'.join(new_contributors) + '\n', mode='a')
-        logger.info(f'New contributors: {", ".join(new_contributors)}')
-
-    print(Changelog(commits.groups(), args.repo, args.collapsible))

devscripts/make_issue_template.py

@@ -12,6 +12,7 @@ import re
 from devscripts.utils import (
     get_filename_args,
     read_file,
+    read_version,
     write_file,
 )
 
@@ -23,8 +24,6 @@ VERBOSE_TMPL = '''
       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
@@ -34,18 +33,19 @@ VERBOSE_TMPL = '''
       description: |
         It should start like this:
       placeholder: |
-        [debug] Command-line config: ['-vU', 'https://www.youtube.com/watch?v=BaW_jenozKc']
+        [debug] Command-line config: ['-vU', 'test:youtube']
+        [debug] Portable config "yt-dlp.conf": ['-i']
         [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version nightly@... from yt-dlp/yt-dlp [b634ba742] (win_exe)
+        [debug] yt-dlp version %(version)s [9d339c4] (win32_exe)
         [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
+        [debug] Checking exe version: ffmpeg -bsfs
+        [debug] Checking exe version: ffprobe -bsfs
         [debug] exe versions: ffmpeg N-106550-g072101bd52-20220410 (fdk,setts), ffprobe N-106624-g391ce570c8-20220415, phantomjs 2.1.1
         [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
         [debug] Proxy map: {}
-        [debug] Request Handlers: urllib, requests
-        [debug] Loaded 1893 extractors
-        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest
-        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
+        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
+        Latest version: %(version)s, Current version: %(version)s
+        yt-dlp is up to date (%(version)s)
         <more lines>
       render: shell
     validations:
@@ -58,13 +58,13 @@ NO_SKIP = '''
       label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
       description: Fill all fields even if you think it is irrelevant for the issue
       options:
-        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\\* field
+        - label: I understand that I will be **blocked** if I remove or skip any mandatory\\* field
           required: true
 '''.strip()
 
 
 def main():
-    fields = {'no_skip': NO_SKIP}
+    fields = {'version': read_version(), 'no_skip': NO_SKIP}
     fields['verbose'] = VERBOSE_TMPL % fields
     fields['verbose_optional'] = re.sub(r'(\n\s+validations:)?\n\s+required: true', '', fields['verbose'])
 

devscripts/make_lazy_extractors.py

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

devscripts/make_readme.py

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

devscripts/run_tests.sh

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

devscripts/update-formulae.py

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

devscripts/update-version.py

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

devscripts/utils.py

@@ -1,6 +1,5 @@
 import argparse
 import functools
-import subprocess
 
 
 def read_file(fname):
@@ -8,16 +7,15 @@ def read_file(fname):
         return f.read()
 
 
-def write_file(fname, content, mode='w'):
-    with open(fname, mode, encoding='utf-8') as f:
+def write_file(fname, content):
+    with open(fname, 'w', encoding='utf-8') as f:
         return f.write(content)
 
 
-def read_version(fname='yt_dlp/version.py', varname='__version__'):
-    """Get the version without importing the package"""
-    items = {}
-    exec(compile(read_file(fname), fname, 'exec'), items)
-    return items[varname]
+# Get the version without importing the package
+def read_version(fname='yt_dlp/version.py'):
+    exec(compile(read_file(fname), fname, 'exec'))
+    return locals()['__version__']
 
 
 def get_filename_args(has_infile=False, default_outfile=None):
@@ -35,13 +33,3 @@ def get_filename_args(has_infile=False, default_outfile=None):
 
 def compose_functions(*functions):
     return lambda x: functools.reduce(lambda y, f: f(y), functions, x)
-
-
-def run_process(*args, **kwargs):
-    kwargs.setdefault('text', True)
-    kwargs.setdefault('check', True)
-    kwargs.setdefault('capture_output', True)
-    if kwargs['text']:
-        kwargs.setdefault('encoding', 'utf-8')
-        kwargs.setdefault('errors', 'replace')
-    return subprocess.run(args, **kwargs)

public.key

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

pyinst.py

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

pyproject.toml

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

requirements.txt

@@ -1,9 +1,6 @@
 mutagen
 pycryptodomex
 websockets
-brotli; implementation_name=='cpython'
-brotlicffi; implementation_name!='cpython'
+brotli; platform_python_implementation=='CPython'
+brotlicffi; platform_python_implementation!='CPython'
 certifi
-requests>=2.31.0,<3
-urllib3>=1.26.17,<3
-secretstorage; sys_platform=='linux' and (implementation_name!='pypy' or implementation_version>='7.3.10')

setup.cfg

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

setup.py

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

test/conftest.py

@@ -1,21 +0,0 @@
-import functools
-import inspect
-
-import pytest
-
-from yt_dlp.networking import RequestHandler
-from yt_dlp.networking.common import _REQUEST_HANDLERS
-from yt_dlp.utils._utils import _YDLLogger as FakeLogger
-
-
-@pytest.fixture
-def handler(request):
-    RH_KEY = request.param
-    if inspect.isclass(RH_KEY) and issubclass(RH_KEY, RequestHandler):
-        handler = RH_KEY
-    elif RH_KEY in _REQUEST_HANDLERS:
-        handler = _REQUEST_HANDLERS[RH_KEY]
-    else:
-        pytest.skip(f'{RH_KEY} request handler is not available')
-
-    return functools.partial(handler, logger=FakeLogger)

test/helper.py

@@ -194,8 +194,8 @@ def sanitize_got_info_dict(got_dict):
         'formats', 'thumbnails', 'subtitles', 'automatic_captions', 'comments', 'entries',
 
         # Auto-generated
-        'autonumber', 'playlist', 'format_index', 'video_ext', 'audio_ext', 'duration_string', 'epoch', 'n_entries',
-        'fulltitle', 'extractor', 'extractor_key', 'filename', 'filepath', 'infojson_filename', 'original_url',
+        'autonumber', 'playlist', 'format_index', 'video_ext', 'audio_ext', 'duration_string', 'epoch',
+        'fulltitle', 'extractor', 'extractor_key', 'filepath', 'infojson_filename', 'original_url', 'n_entries',
 
         # Only live_status needs to be checked
         'is_live', 'was_live',
@@ -222,10 +222,6 @@ def sanitize_got_info_dict(got_dict):
     if test_info_dict.get('display_id') == test_info_dict.get('id'):
         test_info_dict.pop('display_id')
 
-    # Check url for flat entries
-    if got_dict.get('_type', 'video') != 'video' and got_dict.get('url'):
-        test_info_dict['url'] = got_dict['url']
-
     return test_info_dict
 
 
@@ -239,9 +235,8 @@ def expect_info_dict(self, got_dict, expected_dict):
         for key in mandatory_fields:
             self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
     # Check for mandatory fields that are automatically set by YoutubeDL
-    if got_dict.get('_type', 'video') == 'video':
-        for key in ['webpage_url', 'extractor', 'extractor_key']:
-            self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
+    for key in ['webpage_url', 'extractor', 'extractor_key']:
+        self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
 
     test_info_dict = sanitize_got_info_dict(got_dict)
 
@@ -254,16 +249,19 @@ def expect_info_dict(self, got_dict, expected_dict):
                 return v.__name__
             else:
                 return repr(v)
-        info_dict_str = ''.join(
-            f'    {_repr(k)}: {_repr(v)},\n'
-            for k, v in test_info_dict.items() if k not in missing_keys)
-        if info_dict_str:
-            info_dict_str += '\n'
+        info_dict_str = ''
+        if len(missing_keys) != len(expected_dict):
+            info_dict_str += ''.join(
+                f'    {_repr(k)}: {_repr(v)},\n'
+                for k, v in test_info_dict.items() if k not in missing_keys)
+
+            if info_dict_str:
+                info_dict_str += '\n'
         info_dict_str += ''.join(
             f'    {_repr(k)}: {_repr(test_info_dict[k])},\n'
             for k in missing_keys)
-        info_dict_str = '\n\'info_dict\': {\n' + info_dict_str + '},\n'
-        write_string(info_dict_str.replace('\n', '\n        '), out=sys.stderr)
+        write_string(
+            '\n\'info_dict\': {\n' + info_dict_str + '},\n', out=sys.stderr)
         self.assertFalse(
             missing_keys,
             'Missing keys in test definition: %s' % (

test/parameters.json

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

test/test_InfoExtractor.py

@@ -41,9 +41,7 @@ class InfoExtractorTestRequestHandler(http.server.BaseHTTPRequestHandler):
 
 
 class DummyIE(InfoExtractor):
-    def _sort_formats(self, formats, field_preference=[]):
-        self._downloader.sort_formats(
-            {'formats': formats, '_format_sort_fields': field_preference})
+    pass
 
 
 class TestInfoExtractor(unittest.TestCase):
@@ -69,7 +67,6 @@ class TestInfoExtractor(unittest.TestCase):
             <meta name="og:test1" content='foo > < bar'/>
             <meta name="og:test2" content="foo >//< bar"/>
             <meta property=og-test3 content='Ill-formatted opengraph'/>
-            <meta property=og:test4 content=unquoted-value/>
             '''
         self.assertEqual(ie._og_search_title(html), 'Foo')
         self.assertEqual(ie._og_search_description(html), 'Some video\'s description ')
@@ -82,7 +79,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(ie._og_search_property(('test0', 'test1'), html), 'foo > < bar')
         self.assertRaises(RegexNotFoundError, ie._og_search_property, 'test0', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._og_search_property, ('test0', 'test00'), html, None, fatal=True)
-        self.assertEqual(ie._og_search_property('test4', html), 'unquoted-value')
 
     def test_html_search_meta(self):
         ie = self.ie
@@ -917,6 +913,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 263.851,
+                    'abr': 0,
                 }, {
                     'format_id': '577',
                     'format_index': None,
@@ -934,6 +932,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 577.61,
+                    'abr': 0,
                 }, {
                     'format_id': '915',
                     'format_index': None,
@@ -951,6 +951,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 915.905,
+                    'abr': 0,
                 }, {
                     'format_id': '1030',
                     'format_index': None,
@@ -968,6 +970,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 1030.138,
+                    'abr': 0,
                 }, {
                     'format_id': '1924',
                     'format_index': None,
@@ -985,6 +989,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'acodec': 'mp4a.40.2',
                     'video_ext': 'mp4',
                     'audio_ext': 'none',
+                    'vbr': 1924.009,
+                    'abr': 0,
                 }],
                 {
                     'en': [{
@@ -1396,7 +1402,6 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'vcodec': 'none',
                     'acodec': 'AACL',
                     'protocol': 'ism',
-                    'audio_channels': 2,
                     '_download_params': {
                         'stream_type': 'audio',
                         'duration': 8880746666,
@@ -1410,6 +1415,9 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'bits_per_sample': 16,
                         'nal_unit_length_field': 4
                     },
+                    'audio_ext': 'isma',
+                    'video_ext': 'none',
+                    'abr': 128,
                 }, {
                     'format_id': 'video-100',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1433,6 +1441,9 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'bits_per_sample': 16,
                         'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 100,
                 }, {
                     'format_id': 'video-326',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1456,6 +1467,9 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'bits_per_sample': 16,
                         'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 326,
                 }, {
                     'format_id': 'video-698',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1479,6 +1493,9 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'bits_per_sample': 16,
                         'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 698,
                 }, {
                     'format_id': 'video-1493',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1502,6 +1519,9 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'bits_per_sample': 16,
                         'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 1493,
                 }, {
                     'format_id': 'video-4482',
                     'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/Manifest',
@@ -1525,6 +1545,9 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                         'bits_per_sample': 16,
                         'nal_unit_length_field': 4
                     },
+                    'video_ext': 'ismv',
+                    'audio_ext': 'none',
+                    'vbr': 4482,
                 }],
                 {
                     'eng': [
@@ -1544,265 +1567,6 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     ]
                 },
             ),
-            (
-                'ec-3_test',
-                'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                [{
-                    'format_id': 'audio_deu-127',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'isma',
-                    'tbr': 127,
-                    'asr': 48000,
-                    'vcodec': 'none',
-                    'acodec': 'AACL',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    'audio_channels': 2,
-                    '_download_params': {
-                        'stream_type': 'audio',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 0,
-                        'height': 0,
-                        'fourcc': 'AACL',
-                        'language': 'deu',
-                        'codec_private_data': '1190',
-                        'sampling_rate': 48000,
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'audio_deu_1-224',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'isma',
-                    'tbr': 224,
-                    'asr': 48000,
-                    'vcodec': 'none',
-                    'acodec': 'EC-3',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    'audio_channels': 6,
-                    '_download_params': {
-                        'stream_type': 'audio',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 0,
-                        'height': 0,
-                        'fourcc': 'EC-3',
-                        'language': 'deu',
-                        'codec_private_data': '00063F000000AF87FBA7022DFB42A4D405CD93843BDD0700200F00',
-                        'sampling_rate': 48000,
-                        'channels': 6,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-23',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 384,
-                    'height': 216,
-                    'tbr': 23,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 384,
-                        'height': 216,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '000000016742C00CDB06077E5C05A808080A00000300020000030009C0C02EE0177CC6300F142AE00000000168CA8DC8',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-403',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 400,
-                    'height': 224,
-                    'tbr': 403,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 400,
-                        'height': 224,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4014E98323B602D4040405000003000100000300320F1429380000000168EAECF2',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-680',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 640,
-                    'height': 360,
-                    'tbr': 680,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 640,
-                        'height': 360,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-1253',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 640,
-                    'height': 360,
-                    'tbr': 1253,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'vbr': 1253,
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 640,
-                        'height': 360,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-2121',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 768,
-                    'height': 432,
-                    'tbr': 2121,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 768,
-                        'height': 432,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D401EECA0601BD80B50101014000003000400000300C83C58B6580000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-3275',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1280,
-                    'height': 720,
-                    'tbr': 3275,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 1280,
-                        'height': 720,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4020ECA02802DD80B501010140000003004000000C83C60C65800000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-5300',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1920,
-                    'height': 1080,
-                    'tbr': 5300,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 1920,
-                        'height': 1080,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }, {
-                    'format_id': 'video_deu-8079',
-                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
-                    'ext': 'ismv',
-                    'width': 1920,
-                    'height': 1080,
-                    'tbr': 8079,
-                    'vcodec': 'AVC1',
-                    'acodec': 'none',
-                    'protocol': 'ism',
-                    'language': 'deu',
-                    '_download_params': {
-                        'stream_type': 'video',
-                        'duration': 370000000,
-                        'timescale': 10000000,
-                        'width': 1920,
-                        'height': 1080,
-                        'fourcc': 'AVC1',
-                        'language': 'deu',
-                        'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
-                        'channels': 2,
-                        'bits_per_sample': 16,
-                        'nal_unit_length_field': 4
-                    },
-                }],
-                {},
-            ),
         ]
 
         for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:

test/test_YoutubeDL.py

@@ -10,8 +10,9 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import copy
 import json
+import urllib.error
 
-from test.helper import FakeYDL, assertRegexpMatches, try_rm
+from test.helper import FakeYDL, assertRegexpMatches
 from yt_dlp import YoutubeDL
 from yt_dlp.compat import compat_os_name
 from yt_dlp.extractor import YoutubeIE
@@ -24,7 +25,6 @@ from yt_dlp.utils import (
     int_or_none,
     match_filter_func,
 )
-from yt_dlp.utils.traversal import traverse_obj
 
 TEST_URL = 'http://localhost/sample.mp4'
 
@@ -68,7 +68,8 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'mp4', 'height': 460, 'url': TEST_URL},
         ]
         info_dict = _make_result(formats)
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'webm')
@@ -81,7 +82,8 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'mp4', 'height': 1080, 'url': TEST_URL},
         ]
         info_dict['formats'] = formats
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'mp4')
@@ -95,7 +97,8 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'flv', 'height': 720, 'url': TEST_URL},
         ]
         info_dict['formats'] = formats
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'mp4')
@@ -107,14 +110,15 @@ class TestFormatSelection(unittest.TestCase):
             {'ext': 'webm', 'height': 720, 'url': TEST_URL},
         ]
         info_dict['formats'] = formats
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['ext'], 'webm')
 
     def test_format_selection(self):
         formats = [
-            {'format_id': '35', 'ext': 'mp4', 'preference': 0, 'url': TEST_URL},
+            {'format_id': '35', 'ext': 'mp4', 'preference': 1, 'url': TEST_URL},
             {'format_id': 'example-with-dashes', 'ext': 'webm', 'preference': 1, 'url': TEST_URL},
             {'format_id': '45', 'ext': 'webm', 'preference': 2, 'url': TEST_URL},
             {'format_id': '47', 'ext': 'webm', 'preference': 3, 'url': TEST_URL},
@@ -182,19 +186,22 @@ class TestFormatSelection(unittest.TestCase):
 
         info_dict = _make_result(formats)
         ydl = YDL({'format': 'best'})
-        ydl.sort_formats(info_dict)
+        ie = YoutubeIE(ydl)
+        ie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'aac-64')
 
         ydl = YDL({'format': 'mp3'})
-        ydl.sort_formats(info_dict)
+        ie = YoutubeIE(ydl)
+        ie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'mp3-64')
 
         ydl = YDL({'prefer_free_formats': True})
-        ydl.sort_formats(info_dict)
+        ie = YoutubeIE(ydl)
+        ie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(copy.deepcopy(info_dict))
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], 'ogg-64')
@@ -339,7 +346,8 @@ class TestFormatSelection(unittest.TestCase):
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': 'bestvideo+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], '248+172')
@@ -347,35 +355,40 @@ class TestFormatSelection(unittest.TestCase):
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': 'bestvideo[height>=999999]+bestaudio/best'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded['format_id'], '38')
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': 'bestvideo/best,bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['137', '141'])
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': '(bestvideo[ext=mp4],bestvideo[ext=webm])+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['137+141', '248+141'])
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': '(bestvideo[ext=mp4],bestvideo[ext=webm])[height<=720]+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['136+141', '247+141'])
 
         info_dict = _make_result(list(formats_order), extractor='youtube')
         ydl = YDL({'format': '(bestvideo[ext=none]/bestvideo[ext=webm])+bestaudio'})
-        ydl.sort_formats(info_dict)
+        yie = YoutubeIE(ydl)
+        yie._sort_formats(info_dict['formats'])
         ydl.process_ie_result(info_dict)
         downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
         self.assertEqual(downloaded_ids, ['248+141'])
@@ -383,14 +396,16 @@ class TestFormatSelection(unittest.TestCase):
         for f1, f2 in zip(formats_order, formats_order[1:]):
             info_dict = _make_result([f1, f2], extractor='youtube')
             ydl = YDL({'format': 'best/bestvideo'})
-            ydl.sort_formats(info_dict)
+            yie = YoutubeIE(ydl)
+            yie._sort_formats(info_dict['formats'])
             ydl.process_ie_result(info_dict)
             downloaded = ydl.downloaded_info_dicts[0]
             self.assertEqual(downloaded['format_id'], f1['format_id'])
 
             info_dict = _make_result([f2, f1], extractor='youtube')
             ydl = YDL({'format': 'best/bestvideo'})
-            ydl.sort_formats(info_dict)
+            yie = YoutubeIE(ydl)
+            yie._sort_formats(info_dict['formats'])
             ydl.process_ie_result(info_dict)
             downloaded = ydl.downloaded_info_dicts[0]
             self.assertEqual(downloaded['format_id'], f1['format_id'])
@@ -465,7 +480,7 @@ class TestFormatSelection(unittest.TestCase):
         for f in formats:
             f['url'] = 'http://_/'
             f['ext'] = 'unknown'
-        info_dict = _make_result(formats, _format_sort_fields=('id', ))
+        info_dict = _make_result(formats)
 
         ydl = YDL({'format': 'best[filesize<3000]'})
         ydl.process_ie_result(info_dict)
@@ -647,17 +662,13 @@ class TestYoutubeDL(unittest.TestCase):
         'playlist_autonumber': 2,
         '__last_playlist_index': 100,
         'n_entries': 10,
-        'formats': [
-            {'id': 'id 1', 'height': 1080, 'width': 1920},
-            {'id': 'id 2', 'height': 720},
-            {'id': 'id 3'}
-        ]
+        'formats': [{'id': 'id 1'}, {'id': 'id 2'}, {'id': 'id 3'}]
     }
 
     def test_prepare_outtmpl_and_filename(self):
         def test(tmpl, expected, *, info=None, **params):
             params['outtmpl'] = tmpl
-            ydl = FakeYDL(params)
+            ydl = YoutubeDL(params)
             ydl._num_downloads = 1
             self.assertEqual(ydl.validate_outtmpl(tmpl), None)
 
@@ -669,7 +680,7 @@ class TestYoutubeDL(unittest.TestCase):
             for (name, got), expect in zip((('outtmpl', out), ('filename', fname)), expected):
                 if callable(expect):
                     self.assertTrue(expect(got), f'Wrong {name} from {tmpl}')
-                elif expect is not None:
+                else:
                     self.assertEqual(got, expect, f'Wrong {name} from {tmpl}')
 
         # Side-effects
@@ -684,8 +695,7 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(id)s.%(ext)s', '1234.mp4')
         test('%(duration_string)s', ('27:46:40', '27-46-40'))
         test('%(resolution)s', '1080p')
-        test('%(playlist_index|)s', '001')
-        test('%(playlist_index&{}!)s', '1!')
+        test('%(playlist_index)s', '001')
         test('%(playlist_autonumber)s', '02')
         test('%(autonumber)s', '00001')
         test('%(autonumber+2)03d', '005', autonumber_start=3)
@@ -719,7 +729,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertTrue(isinstance(YoutubeDL.validate_outtmpl('%(title)'), ValueError))
         test('%(invalid@tmpl|def)s', 'none', outtmpl_na_placeholder='none')
         test('%(..)s', 'NA')
-        test('%(formats.{id)s', 'NA')
 
         # Entire info_dict
         def expect_same_infodict(out):
@@ -756,23 +765,20 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(ext)c', 'm')
         test('%(id)d %(id)r', "1234 '1234'")
         test('%(id)r %(height)r', "'1234' 1080")
-        test('%(title5)a %(height)a', (R"'\xe1\xe9\xed \U0001d400' 1080", None))
         test('%(ext)s-%(ext|def)d', 'mp4-def')
-        test('%(width|0)04d', '0')
-        test('a%(width|b)d', 'ab', outtmpl_na_placeholder='none')
+        test('%(width|0)04d', '0000')
+        test('a%(width|)d', 'a', outtmpl_na_placeholder='none')
 
         FORMATS = self.outtmpl_info['formats']
+        sanitize = lambda x: x.replace(':', '：').replace('"', "＂").replace('\n', ' ')
 
         # Custom type casting
         test('%(formats.:.id)l', 'id 1, id 2, id 3')
         test('%(formats.:.id)#l', ('id 1\nid 2\nid 3', 'id 1 id 2 id 3'))
         test('%(ext)l', 'mp4')
         test('%(formats.:.id) 18l', '  id 1, id 2, id 3')
-        test('%(formats)j', (json.dumps(FORMATS), None))
-        test('%(formats)#j', (
-            json.dumps(FORMATS, indent=4),
-            json.dumps(FORMATS, indent=4).replace(':', '：').replace('"', "＂").replace('\n', ' ')
-        ))
+        test('%(formats)j', (json.dumps(FORMATS), sanitize(json.dumps(FORMATS))))
+        test('%(formats)#j', (json.dumps(FORMATS, indent=4), sanitize(json.dumps(FORMATS, indent=4))))
         test('%(title5).3B', 'á')
         test('%(title5)U', 'áéí 𝐀')
         test('%(title5)#U', 'a\u0301e\u0301i\u0301 𝐀')
@@ -784,9 +790,9 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(title4)#S', 'foo_bar_test')
         test('%(title4).10S', ('foo ＂bar＂ ', 'foo ＂bar＂' + ('#' if compat_os_name == 'nt' else ' ')))
         if compat_os_name == 'nt':
-            test('%(title4)q', ('"foo ""bar"" test"', None))
-            test('%(formats.:.id)#q', ('"id 1" "id 2" "id 3"', None))
-            test('%(formats.0.id)#q', ('"id 1"', None))
+            test('%(title4)q', ('"foo \\"bar\\" test"', "＂foo ⧹＂bar⧹＂ test＂"))
+            test('%(formats.:.id)#q', ('"id 1" "id 2" "id 3"', '＂id 1＂ ＂id 2＂ ＂id 3＂'))
+            test('%(formats.0.id)#q', ('"id 1"', '＂id 1＂'))
         else:
             test('%(title4)q', ('\'foo "bar" test\'', '\'foo ＂bar＂ test\''))
             test('%(formats.:.id)#q', "'id 1' 'id 2' 'id 3'")
@@ -797,8 +803,8 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(title|%)s %(title|%%)s', '% %%')
         test('%(id+1-height+3)05d', '00158')
         test('%(width+100)05d', 'NA')
-        test('%(formats.0) 15s', ('% 15s' % FORMATS[0], None))
-        test('%(formats.0)r', (repr(FORMATS[0]), None))
+        test('%(formats.0) 15s', ('% 15s' % FORMATS[0], '% 15s' % sanitize(str(FORMATS[0]))))
+        test('%(formats.0)r', (repr(FORMATS[0]), sanitize(repr(FORMATS[0]))))
         test('%(height.0)03d', '001')
         test('%(-height.0)04d', '-001')
         test('%(formats.-1.id)s', FORMATS[-1]['id'])
@@ -807,12 +813,6 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(formats.:2:-1)r', repr(FORMATS[:2:-1]))
         test('%(formats.0.id.-1+id)f', '1235.000000')
         test('%(formats.0.id.-1+formats.1.id.-1)d', '3')
-        out = json.dumps([{'id': f['id'], 'height.:2': str(f['height'])[:2]}
-                          if 'height' in f else {'id': f['id']}
-                          for f in FORMATS])
-        test('%(formats.:.{id,height.:2})j', (out, None))
-        test('%(formats.:.{id,height}.id)l', ', '.join(f['id'] for f in FORMATS))
-        test('%(.{id,title})j', ('{"id": "1234"}', '{＂id＂： ＂1234＂}'))
 
         # Alternates
         test('%(title,id)s', '1234')
@@ -826,11 +826,6 @@ class TestYoutubeDL(unittest.TestCase):
         test('%(title&foo|baz)s.bar', 'baz.bar')
         test('%(x,id&foo|baz)s.bar', 'foo.bar')
         test('%(x,title&foo|baz)s.bar', 'baz.bar')
-        test('%(id&a\nb|)s', ('a\nb', 'a b'))
-        test('%(id&hi {:>10} {}|)s', 'hi       1234 1234')
-        test(R'%(id&{0} {}|)s', 'NA')
-        test(R'%(id&{0.1}|)s', 'NA')
-        test('%(height&{:,d})S', '1,080')
 
         # Laziness
         def gen():
@@ -876,12 +871,12 @@ class TestYoutubeDL(unittest.TestCase):
 
         class SimplePP(PostProcessor):
             def run(self, info):
-                with open(audiofile, 'w') as f:
+                with open(audiofile, 'wt') as f:
                     f.write('EXAMPLE')
                 return [info['filepath']], info
 
         def run_pp(params, PP):
-            with open(filename, 'w') as f:
+            with open(filename, 'wt') as f:
                 f.write('EXAMPLE')
             ydl = YoutubeDL(params)
             ydl.add_post_processor(PP())
@@ -900,7 +895,7 @@ class TestYoutubeDL(unittest.TestCase):
 
         class ModifierPP(PostProcessor):
             def run(self, info):
-                with open(info['filepath'], 'w') as f:
+                with open(info['filepath'], 'wt') as f:
                     f.write('MODIFIED')
                 return [], info
 
@@ -1102,6 +1097,11 @@ class TestYoutubeDL(unittest.TestCase):
         test_selection({'playlist_items': '-15::2'}, INDICES[1::2], True)
         test_selection({'playlist_items': '-15::15'}, [], True)
 
+    def test_urlopen_no_file_protocol(self):
+        # see https://github.com/ytdl-org/youtube-dl/issues/8227
+        ydl = YDL()
+        self.assertRaises(urllib.error.URLError, ydl.urlopen, 'file:///etc/passwd')
+
     def test_do_not_override_ie_key_in_url_transparent(self):
         ydl = YDL()
 
@@ -1215,129 +1215,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertEqual(downloaded['extractor'], 'Video')
         self.assertEqual(downloaded['extractor_key'], 'Video')
 
-    def test_header_cookies(self):
-        from http.cookiejar import Cookie
-
-        ydl = FakeYDL()
-        ydl.report_warning = lambda *_, **__: None
-
-        def cookie(name, value, version=None, domain='', path='', secure=False, expires=None):
-            return Cookie(
-                version or 0, name, value, None, False,
-                domain, bool(domain), bool(domain), path, bool(path),
-                secure, expires, False, None, None, rest={})
-
-        _test_url = 'https://yt.dlp/test'
-
-        def test(encoded_cookies, cookies, *, headers=False, round_trip=None, error_re=None):
-            def _test():
-                ydl.cookiejar.clear()
-                ydl._load_cookies(encoded_cookies, autoscope=headers)
-                if headers:
-                    ydl._apply_header_cookies(_test_url)
-                data = {'url': _test_url}
-                ydl._calc_headers(data)
-                self.assertCountEqual(
-                    map(vars, ydl.cookiejar), map(vars, cookies),
-                    'Extracted cookiejar.Cookie is not the same')
-                if not headers:
-                    self.assertEqual(
-                        data.get('cookies'), round_trip or encoded_cookies,
-                        'Cookie is not the same as round trip')
-                ydl.__dict__['_YoutubeDL__header_cookies'] = []
-
-            with self.subTest(msg=encoded_cookies):
-                if not error_re:
-                    _test()
-                    return
-                with self.assertRaisesRegex(Exception, error_re):
-                    _test()
-
-        test('test=value; Domain=.yt.dlp', [cookie('test', 'value', domain='.yt.dlp')])
-        test('test=value', [cookie('test', 'value')], error_re=r'Unscoped cookies are not allowed')
-        test('cookie1=value1; Domain=.yt.dlp; Path=/test; cookie2=value2; Domain=.yt.dlp; Path=/', [
-            cookie('cookie1', 'value1', domain='.yt.dlp', path='/test'),
-            cookie('cookie2', 'value2', domain='.yt.dlp', path='/')])
-        test('test=value; Domain=.yt.dlp; Path=/test; Secure; Expires=9999999999', [
-            cookie('test', 'value', domain='.yt.dlp', path='/test', secure=True, expires=9999999999)])
-        test('test="value; "; path=/test; domain=.yt.dlp', [
-            cookie('test', 'value; ', domain='.yt.dlp', path='/test')],
-            round_trip='test="value\\073 "; Domain=.yt.dlp; Path=/test')
-        test('name=; Domain=.yt.dlp', [cookie('name', '', domain='.yt.dlp')],
-             round_trip='name=""; Domain=.yt.dlp')
-
-        test('test=value', [cookie('test', 'value', domain='.yt.dlp')], headers=True)
-        test('cookie1=value; Domain=.yt.dlp; cookie2=value', [], headers=True, error_re=r'Invalid syntax')
-        ydl.deprecated_feature = ydl.report_error
-        test('test=value', [], headers=True, error_re=r'Passing cookies as a header is a potential security risk')
-
-    def test_infojson_cookies(self):
-        TEST_FILE = 'test_infojson_cookies.info.json'
-        TEST_URL = 'https://example.com/example.mp4'
-        COOKIES = 'a=b; Domain=.example.com; c=d; Domain=.example.com'
-        COOKIE_HEADER = {'Cookie': 'a=b; c=d'}
-
-        ydl = FakeYDL()
-        ydl.process_info = lambda x: ydl._write_info_json('test', x, TEST_FILE)
-
-        def make_info(info_header_cookies=False, fmts_header_cookies=False, cookies_field=False):
-            fmt = {'url': TEST_URL}
-            if fmts_header_cookies:
-                fmt['http_headers'] = COOKIE_HEADER
-            if cookies_field:
-                fmt['cookies'] = COOKIES
-            return _make_result([fmt], http_headers=COOKIE_HEADER if info_header_cookies else None)
-
-        def test(initial_info, note):
-            result = {}
-            result['processed'] = ydl.process_ie_result(initial_info)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=f'No cookies set in cookiejar after initial process when {note}')
-            ydl.cookiejar.clear()
-            with open(TEST_FILE) as infojson:
-                result['loaded'] = ydl.sanitize_info(json.load(infojson), True)
-            result['final'] = ydl.process_ie_result(result['loaded'].copy(), download=False)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=f'No cookies set in cookiejar after final process when {note}')
-            ydl.cookiejar.clear()
-            for key in ('processed', 'loaded', 'final'):
-                info = result[key]
-                self.assertIsNone(
-                    traverse_obj(info, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False),
-                    msg=f'Cookie header not removed in {key} result when {note}')
-                self.assertEqual(
-                    traverse_obj(info, ((None, ('formats', 0)), 'cookies'), get_all=False), COOKIES,
-                    msg=f'No cookies field found in {key} result when {note}')
-
-        test({'url': TEST_URL, 'http_headers': COOKIE_HEADER, 'id': '1', 'title': 'x'}, 'no formats field')
-        test(make_info(info_header_cookies=True), 'info_dict header cokies')
-        test(make_info(fmts_header_cookies=True), 'format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True), 'info_dict and format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True, cookies_field=True), 'all cookies fields')
-        test(make_info(cookies_field=True), 'cookies format field')
-        test({'url': TEST_URL, 'cookies': COOKIES, 'id': '1', 'title': 'x'}, 'info_dict cookies field only')
-
-        try_rm(TEST_FILE)
-
-    def test_add_headers_cookie(self):
-        def check_for_cookie_header(result):
-            return traverse_obj(result, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False)
-
-        ydl = FakeYDL({'http_headers': {'Cookie': 'a=b'}})
-        ydl._apply_header_cookies(_make_result([])['webpage_url'])  # Scope to input webpage URL: .example.com
-
-        fmt = {'url': 'https://example.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies in result info_dict')
-        self.assertEqual(result.get('cookies'), 'a=b; Domain=.example.com', msg='No cookies were set in cookies field')
-        self.assertIn('a=b', ydl.cookiejar.get_cookie_header(fmt['url']), msg='No cookies were set in cookiejar')
-
-        fmt = {'url': 'https://wrong.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies for wrong domain')
-        self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
-        self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_YoutubeDLCookieJar.py

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

test/test_aes.py

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

test/test_age_restriction.py

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

test/test_compat.py

@@ -9,16 +9,15 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 import struct
+import urllib.parse
 
 from yt_dlp import compat
-from yt_dlp.compat import urllib  # isort: split
 from yt_dlp.compat import (
     compat_etree_fromstring,
     compat_expanduser,
     compat_urllib_parse_unquote,
     compat_urllib_parse_urlencode,
 )
-from yt_dlp.compat.urllib.request import getproxies
 
 
 class TestCompat(unittest.TestCase):
@@ -29,10 +28,7 @@ class TestCompat(unittest.TestCase):
         with self.assertWarns(DeprecationWarning):
             compat.WINDOWS_VT_MODE
 
-        self.assertEqual(urllib.request.getproxies, getproxies)
-
-        with self.assertWarns(DeprecationWarning):
-            compat.compat_pycrypto_AES  # Must not raise error
+        compat.asyncio.events  # Must not raise error
 
     def test_compat_expanduser(self):
         old_home = os.environ.get('HOME')

test/test_config.py

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

test/test_cookies.py

@@ -3,7 +3,6 @@ from datetime import datetime, timezone
 
 from yt_dlp import cookies
 from yt_dlp.cookies import (
-    LenientSimpleCookie,
     LinuxChromeCookieDecryptor,
     MacChromeCookieDecryptor,
     WindowsChromeCookieDecryptor,
@@ -49,38 +48,32 @@ class TestCookies(unittest.TestCase):
         """ based on https://chromium.googlesource.com/chromium/src/+/refs/heads/main/base/nix/xdg_util_unittest.cc """
         test_cases = [
             ({}, _LinuxDesktopEnvironment.OTHER),
-            ({'DESKTOP_SESSION': 'my_custom_de'}, _LinuxDesktopEnvironment.OTHER),
-            ({'XDG_CURRENT_DESKTOP': 'my_custom_de'}, _LinuxDesktopEnvironment.OTHER),
 
             ({'DESKTOP_SESSION': 'gnome'}, _LinuxDesktopEnvironment.GNOME),
             ({'DESKTOP_SESSION': 'mate'}, _LinuxDesktopEnvironment.GNOME),
-            ({'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
-            ({'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE3),
+            ({'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE),
+            ({'DESKTOP_SESSION': 'kde'}, _LinuxDesktopEnvironment.KDE),
             ({'DESKTOP_SESSION': 'xfce'}, _LinuxDesktopEnvironment.XFCE),
 
             ({'GNOME_DESKTOP_SESSION_ID': 1}, _LinuxDesktopEnvironment.GNOME),
-            ({'KDE_FULL_SESSION': 1}, _LinuxDesktopEnvironment.KDE3),
-            ({'KDE_FULL_SESSION': 1, 'DESKTOP_SESSION': 'kde4'}, _LinuxDesktopEnvironment.KDE4),
+            ({'KDE_FULL_SESSION': 1}, _LinuxDesktopEnvironment.KDE),
 
             ({'XDG_CURRENT_DESKTOP': 'X-Cinnamon'}, _LinuxDesktopEnvironment.CINNAMON),
-            ({'XDG_CURRENT_DESKTOP': 'Deepin'}, _LinuxDesktopEnvironment.DEEPIN),
             ({'XDG_CURRENT_DESKTOP': 'GNOME'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'GNOME:GNOME-Classic'}, _LinuxDesktopEnvironment.GNOME),
             ({'XDG_CURRENT_DESKTOP': 'GNOME : GNOME-Classic'}, _LinuxDesktopEnvironment.GNOME),
 
             ({'XDG_CURRENT_DESKTOP': 'Unity', 'DESKTOP_SESSION': 'gnome-fallback'}, _LinuxDesktopEnvironment.GNOME),
-            ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '5'}, _LinuxDesktopEnvironment.KDE5),
-            ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '6'}, _LinuxDesktopEnvironment.KDE6),
-            ({'XDG_CURRENT_DESKTOP': 'KDE'}, _LinuxDesktopEnvironment.KDE4),
+            ({'XDG_CURRENT_DESKTOP': 'KDE', 'KDE_SESSION_VERSION': '5'}, _LinuxDesktopEnvironment.KDE),
+            ({'XDG_CURRENT_DESKTOP': 'KDE'}, _LinuxDesktopEnvironment.KDE),
             ({'XDG_CURRENT_DESKTOP': 'Pantheon'}, _LinuxDesktopEnvironment.PANTHEON),
-            ({'XDG_CURRENT_DESKTOP': 'UKUI'}, _LinuxDesktopEnvironment.UKUI),
             ({'XDG_CURRENT_DESKTOP': 'Unity'}, _LinuxDesktopEnvironment.UNITY),
             ({'XDG_CURRENT_DESKTOP': 'Unity:Unity7'}, _LinuxDesktopEnvironment.UNITY),
             ({'XDG_CURRENT_DESKTOP': 'Unity:Unity8'}, _LinuxDesktopEnvironment.UNITY),
         ]
 
         for env, expected_desktop_environment in test_cases:
-            self.assertEqual(_get_linux_desktop_environment(env, Logger()), expected_desktop_environment)
+            self.assertEqual(_get_linux_desktop_environment(env), expected_desktop_environment)
 
     def test_chrome_cookie_decryptor_linux_derive_key(self):
         key = LinuxChromeCookieDecryptor.derive_key(b'abc')
@@ -144,163 +137,3 @@ class TestCookies(unittest.TestCase):
     def test_pbkdf2_sha1(self):
         key = pbkdf2_sha1(b'peanuts', b' ' * 16, 1, 16)
         self.assertEqual(key, b'g\xe1\x8e\x0fQ\x1c\x9b\xf3\xc9`!\xaa\x90\xd9\xd34')
-
-
-class TestLenientSimpleCookie(unittest.TestCase):
-    def _run_tests(self, *cases):
-        for message, raw_cookie, expected in cases:
-            cookie = LenientSimpleCookie(raw_cookie)
-
-            with self.subTest(message, expected=expected):
-                self.assertEqual(cookie.keys(), expected.keys(), message)
-
-                for key, expected_value in expected.items():
-                    morsel = cookie[key]
-                    if isinstance(expected_value, tuple):
-                        expected_value, expected_attributes = expected_value
-                    else:
-                        expected_attributes = {}
-
-                    attributes = {
-                        key: value
-                        for key, value in dict(morsel).items()
-                        if value != ""
-                    }
-                    self.assertEqual(attributes, expected_attributes, message)
-
-                    self.assertEqual(morsel.value, expected_value, message)
-
-    def test_parsing(self):
-        self._run_tests(
-            # Copied from https://github.com/python/cpython/blob/v3.10.7/Lib/test/test_http_cookies.py
-            (
-                "Test basic cookie",
-                "chips=ahoy; vienna=finger",
-                {"chips": "ahoy", "vienna": "finger"},
-            ),
-            (
-                "Test quoted cookie",
-                'keebler="E=mc2; L=\\"Loves\\"; fudge=\\012;"',
-                {"keebler": 'E=mc2; L="Loves"; fudge=\012;'},
-            ),
-            (
-                "Allow '=' in an unquoted value",
-                "keebler=E=mc2",
-                {"keebler": "E=mc2"},
-            ),
-            (
-                "Allow cookies with ':' in their name",
-                "key:term=value:term",
-                {"key:term": "value:term"},
-            ),
-            (
-                "Allow '[' and ']' in cookie values",
-                "a=b; c=[; d=r; f=h",
-                {"a": "b", "c": "[", "d": "r", "f": "h"},
-            ),
-            (
-                "Test basic cookie attributes",
-                'Customer="WILE_E_COYOTE"; Version=1; Path=/acme',
-                {"Customer": ("WILE_E_COYOTE", {"version": "1", "path": "/acme"})},
-            ),
-            (
-                "Test flag only cookie attributes",
-                'Customer="WILE_E_COYOTE"; HttpOnly; Secure',
-                {"Customer": ("WILE_E_COYOTE", {"httponly": True, "secure": True})},
-            ),
-            (
-                "Test flag only attribute with values",
-                "eggs=scrambled; httponly=foo; secure=bar; Path=/bacon",
-                {"eggs": ("scrambled", {"httponly": "foo", "secure": "bar", "path": "/bacon"})},
-            ),
-            (
-                "Test special case for 'expires' attribute, 4 digit year",
-                'Customer="W"; expires=Wed, 01 Jan 2010 00:00:00 GMT',
-                {"Customer": ("W", {"expires": "Wed, 01 Jan 2010 00:00:00 GMT"})},
-            ),
-            (
-                "Test special case for 'expires' attribute, 2 digit year",
-                'Customer="W"; expires=Wed, 01 Jan 98 00:00:00 GMT',
-                {"Customer": ("W", {"expires": "Wed, 01 Jan 98 00:00:00 GMT"})},
-            ),
-            (
-                "Test extra spaces in keys and values",
-                "eggs  =  scrambled  ;  secure  ;  path  =  bar   ; foo=foo   ",
-                {"eggs": ("scrambled", {"secure": True, "path": "bar"}), "foo": "foo"},
-            ),
-            (
-                "Test quoted attributes",
-                'Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"',
-                {"Customer": ("WILE_E_COYOTE", {"version": "1", "path": "/acme"})}
-            ),
-            # Our own tests that CPython passes
-            (
-                "Allow ';' in quoted value",
-                'chips="a;hoy"; vienna=finger',
-                {"chips": "a;hoy", "vienna": "finger"},
-            ),
-            (
-                "Keep only the last set value",
-                "a=c; a=b",
-                {"a": "b"},
-            ),
-        )
-
-    def test_lenient_parsing(self):
-        self._run_tests(
-            (
-                "Ignore and try to skip invalid cookies",
-                'chips={"ahoy;": 1}; vienna="finger;"',
-                {"vienna": "finger;"},
-            ),
-            (
-                "Ignore cookies without a name",
-                "a=b; unnamed; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Ignore '\"' cookie without name",
-                'a=b; "; c=d',
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Skip all space separated values",
-                "x a=b c=d x; e=f",
-                {"a": "b", "c": "d", "e": "f"},
-            ),
-            (
-                "Skip all space separated values",
-                'x a=b; data={"complex": "json", "with": "key=value"}; x c=d x',
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Expect quote mending",
-                'a=b; invalid="; c=d',
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Reset morsel after invalid to not capture attributes",
-                "a=b; invalid; Version=1; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Reset morsel after invalid to not capture attributes",
-                "a=b; $invalid; $Version=1; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Continue after non-flag attribute without value",
-                "a=b; path; Version=1; c=d",
-                {"a": "b", "c": "d"},
-            ),
-            (
-                "Allow cookie attributes with `$` prefix",
-                'Customer="WILE_E_COYOTE"; $Version=1; $Secure; $Path=/acme',
-                {"Customer": ("WILE_E_COYOTE", {"version": "1", "secure": True, "path": "/acme"})},
-            ),
-            (
-                "Invalid Morsel keys should not result in an error",
-                "Key=Value; [Invalid]=Value; Another=Value",
-                {"Key": "Value", "Another": "Value"},
-            ),
-        )

test/test_download.py

@@ -10,7 +10,10 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import collections
 import hashlib
+import http.client
 import json
+import socket
+import urllib.error
 
 from test.helper import (
     assertGreaterEqual,
@@ -26,12 +29,10 @@ from test.helper import (
 
 import yt_dlp.YoutubeDL  # isort: split
 from yt_dlp.extractor import get_info_extractor
-from yt_dlp.networking.exceptions import HTTPError, TransportError
 from yt_dlp.utils import (
     DownloadError,
     ExtractorError,
     UnavailableVideoError,
-    YoutubeDLError,
     format_bytes,
     join_nonempty,
 )
@@ -101,13 +102,11 @@ def generator(test_case, tname):
             print_skipping('IE marked as not _WORKING')
 
         for tc in test_cases:
-            if tc.get('expected_exception'):
-                continue
             info_dict = tc.get('info_dict', {})
             params = tc.get('params', {})
             if not info_dict.get('id'):
                 raise Exception(f'Test {tname} definition incorrect - "id" key is not present')
-            elif not info_dict.get('ext') and info_dict.get('_type', 'video') == 'video':
+            elif not info_dict.get('ext'):
                 if params.get('skip_download') and params.get('ignore_no_formats_error'):
                     continue
                 raise Exception(f'Test {tname} definition incorrect - "ext" key must be present to define the output file')
@@ -123,8 +122,7 @@ def generator(test_case, tname):
         params['outtmpl'] = tname + '_' + params['outtmpl']
         if is_playlist and 'playlist' not in test_case:
             params.setdefault('extract_flat', 'in_playlist')
-            params.setdefault('playlistend', test_case.get(
-                'playlist_mincount', test_case.get('playlist_count', -2) + 1))
+            params.setdefault('playlistend', test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)
@@ -142,17 +140,6 @@ def generator(test_case, tname):
 
         res_dict = None
 
-        def match_exception(err):
-            expected_exception = test_case.get('expected_exception')
-            if not expected_exception:
-                return False
-            if err.__class__.__name__ == expected_exception:
-                return True
-            for exc in err.exc_info:
-                if exc.__class__.__name__ == expected_exception:
-                    return True
-            return False
-
         def try_rm_tcs_files(tcs=None):
             if tcs is None:
                 tcs = test_cases
@@ -174,9 +161,8 @@ def generator(test_case, tname):
                         force_generic_extractor=params.get('force_generic_extractor', False))
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
-                    if not isinstance(err.exc_info[1], (TransportError, UnavailableVideoError)) or (isinstance(err.exc_info[1], HTTPError) and err.exc_info[1].status == 503):
-                        if match_exception(err):
-                            return
+                    if (err.exc_info[0] not in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine)
+                            or (err.exc_info[0] == urllib.error.HTTPError and err.exc_info[1].code == 503)):
                         err.msg = f'{getattr(err, "msg", err)} ({tname})'
                         raise
 
@@ -187,10 +173,6 @@ def generator(test_case, tname):
                     print(f'Retrying: {try_num} failed tries\n\n##########\n\n')
 
                     try_num += 1
-                except YoutubeDLError as err:
-                    if match_exception(err):
-                        return
-                    raise
                 else:
                     break
 
@@ -230,8 +212,6 @@ def generator(test_case, tname):
                 tc_res_dict = res_dict['entries'][tc_num]
                 # First, check test cases' data against extracted data alone
                 expect_info_dict(self, tc_res_dict, tc.get('info_dict', {}))
-                if tc_res_dict.get('_type', 'video') != 'video':
-                    continue
                 # Now, check downloaded file consistency
                 tc_filename = get_tc_filename(tc)
                 if not test_case.get('params', {}).get('skip_download', False):
@@ -266,7 +246,7 @@ def generator(test_case, tname):
                 # extractor returns full results even with extract_flat
                 res_tcs = [{'info_dict': e} for e in res_dict['entries']]
                 try_rm_tcs_files(res_tcs)
-            ydl.close()
+
     return test_template
 
 

test/test_downloader_external.py

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

test/test_downloader_http.py

@@ -16,7 +16,6 @@ from test.helper import http_server_port, try_rm
 from yt_dlp import YoutubeDL
 from yt_dlp.downloader.http import HttpFD
 from yt_dlp.utils import encodeFilename
-from yt_dlp.utils._utils import _YDLLogger as FakeLogger
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -68,6 +67,17 @@ class HTTPTestRequestHandler(http.server.BaseHTTPRequestHandler):
             assert False
 
 
+class FakeLogger:
+    def debug(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        pass
+
+
 class TestHttpFD(unittest.TestCase):
     def setUp(self):
         self.httpd = http.server.HTTPServer(

test/test_execution.py

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

test/test_http.py

@@ -0,0 +1,192 @@
+#!/usr/bin/env python3
+
+# Allow direct execution
+import os
+import sys
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+import http.server
+import ssl
+import threading
+import urllib.request
+
+from test.helper import http_server_port
+from yt_dlp import YoutubeDL
+
+TEST_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class HTTPTestRequestHandler(http.server.BaseHTTPRequestHandler):
+    def log_message(self, format, *args):
+        pass
+
+    def do_GET(self):
+        if self.path == '/video.html':
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
+        elif self.path == '/vid.mp4':
+            self.send_response(200)
+            self.send_header('Content-Type', 'video/mp4')
+            self.end_headers()
+            self.wfile.write(b'\x00\x00\x00\x00\x20\x66\x74[video]')
+        elif self.path == '/%E4%B8%AD%E6%96%87.html':
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
+        else:
+            assert False
+
+
+class FakeLogger:
+    def debug(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        pass
+
+
+class TestHTTP(unittest.TestCase):
+    def setUp(self):
+        self.httpd = http.server.HTTPServer(
+            ('127.0.0.1', 0), HTTPTestRequestHandler)
+        self.port = http_server_port(self.httpd)
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
+
+
+class TestHTTPS(unittest.TestCase):
+    def setUp(self):
+        certfn = os.path.join(TEST_DIR, 'testcert.pem')
+        self.httpd = http.server.HTTPServer(
+            ('127.0.0.1', 0), HTTPTestRequestHandler)
+        sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        sslctx.load_cert_chain(certfn, None)
+        self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)
+        self.port = http_server_port(self.httpd)
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
+
+    def test_nocheckcertificate(self):
+        ydl = YoutubeDL({'logger': FakeLogger()})
+        self.assertRaises(
+            Exception,
+            ydl.extract_info, 'https://127.0.0.1:%d/video.html' % self.port)
+
+        ydl = YoutubeDL({'logger': FakeLogger(), 'nocheckcertificate': True})
+        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
+        self.assertEqual(r['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
+
+
+class TestClientCert(unittest.TestCase):
+    def setUp(self):
+        certfn = os.path.join(TEST_DIR, 'testcert.pem')
+        self.certdir = os.path.join(TEST_DIR, 'testdata', 'certificate')
+        cacertfn = os.path.join(self.certdir, 'ca.crt')
+        self.httpd = http.server.HTTPServer(('127.0.0.1', 0), HTTPTestRequestHandler)
+        sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        sslctx.verify_mode = ssl.CERT_REQUIRED
+        sslctx.load_verify_locations(cafile=cacertfn)
+        sslctx.load_cert_chain(certfn, None)
+        self.httpd.socket = sslctx.wrap_socket(self.httpd.socket, server_side=True)
+        self.port = http_server_port(self.httpd)
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
+
+    def _run_test(self, **params):
+        ydl = YoutubeDL({
+            'logger': FakeLogger(),
+            # Disable client-side validation of unacceptable self-signed testcert.pem
+            # The test is of a check on the server side, so unaffected
+            'nocheckcertificate': True,
+            **params,
+        })
+        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
+        self.assertEqual(r['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
+
+    def test_certificate_combined_nopass(self):
+        self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithkey.crt'))
+
+    def test_certificate_nocombined_nopass(self):
+        self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),
+                       client_certificate_key=os.path.join(self.certdir, 'client.key'))
+
+    def test_certificate_combined_pass(self):
+        self._run_test(client_certificate=os.path.join(self.certdir, 'clientwithencryptedkey.crt'),
+                       client_certificate_password='foobar')
+
+    def test_certificate_nocombined_pass(self):
+        self._run_test(client_certificate=os.path.join(self.certdir, 'client.crt'),
+                       client_certificate_key=os.path.join(self.certdir, 'clientencrypted.key'),
+                       client_certificate_password='foobar')
+
+
+def _build_proxy_handler(name):
+    class HTTPTestRequestHandler(http.server.BaseHTTPRequestHandler):
+        proxy_name = name
+
+        def log_message(self, format, *args):
+            pass
+
+        def do_GET(self):
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/plain; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(f'{self.proxy_name}: {self.path}'.encode())
+    return HTTPTestRequestHandler
+
+
+class TestProxy(unittest.TestCase):
+    def setUp(self):
+        self.proxy = http.server.HTTPServer(
+            ('127.0.0.1', 0), _build_proxy_handler('normal'))
+        self.port = http_server_port(self.proxy)
+        self.proxy_thread = threading.Thread(target=self.proxy.serve_forever)
+        self.proxy_thread.daemon = True
+        self.proxy_thread.start()
+
+        self.geo_proxy = http.server.HTTPServer(
+            ('127.0.0.1', 0), _build_proxy_handler('geo'))
+        self.geo_port = http_server_port(self.geo_proxy)
+        self.geo_proxy_thread = threading.Thread(target=self.geo_proxy.serve_forever)
+        self.geo_proxy_thread.daemon = True
+        self.geo_proxy_thread.start()
+
+    def test_proxy(self):
+        geo_proxy = f'127.0.0.1:{self.geo_port}'
+        ydl = YoutubeDL({
+            'proxy': f'127.0.0.1:{self.port}',
+            'geo_verification_proxy': geo_proxy,
+        })
+        url = 'http://foo.com/bar'
+        response = ydl.urlopen(url).read().decode()
+        self.assertEqual(response, f'normal: {url}')
+
+        req = urllib.request.Request(url)
+        req.add_header('Ytdl-request-proxy', geo_proxy)
+        response = ydl.urlopen(req).read().decode()
+        self.assertEqual(response, f'geo: {url}')
+
+    def test_proxy_with_idn(self):
+        ydl = YoutubeDL({
+            'proxy': f'127.0.0.1:{self.port}',
+        })
+        url = 'http://中文.tw/'
+        response = ydl.urlopen(url).read().decode()
+        # b'xn--fiq228c' is '中文'.encode('idna')
+        self.assertEqual(response, 'normal: http://xn--fiq228c.tw/')
+
+
+if __name__ == '__main__':
+    unittest.main()

test/test_jsinterp.py

@@ -9,371 +9,343 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import math
 
+from yt_dlp.compat import re
 from yt_dlp.jsinterp import JS_Undefined, JSInterpreter
 
 
-class NaN:
-    pass
-
-
 class TestJSInterpreter(unittest.TestCase):
-    def _test(self, jsi_or_code, expected, func='f', args=()):
-        if isinstance(jsi_or_code, str):
-            jsi_or_code = JSInterpreter(jsi_or_code)
-        got = jsi_or_code.call_function(func, *args)
-        if expected is NaN:
-            self.assertTrue(math.isnan(got), f'{got} is not NaN')
-        else:
-            self.assertEqual(got, expected)
-
     def test_basic(self):
-        jsi = JSInterpreter('function f(){;}')
-        self.assertEqual(repr(jsi.extract_function('f')), 'F<f>')
-        self._test(jsi, None)
+        jsi = JSInterpreter('function x(){;}')
+        self.assertEqual(jsi.call_function('x'), None)
 
-        self._test('function f(){return 42;}', 42)
-        self._test('function f(){42}', None)
-        self._test('var f = function(){return 42;}', 42)
+        jsi = JSInterpreter('function x3(){return 42;}')
+        self.assertEqual(jsi.call_function('x3'), 42)
 
-    def test_add(self):
-        self._test('function f(){return 42 + 7;}', 49)
-        self._test('function f(){return 42 + undefined;}', NaN)
-        self._test('function f(){return 42 + null;}', 42)
+        jsi = JSInterpreter('function x3(){42}')
+        self.assertEqual(jsi.call_function('x3'), None)
 
-    def test_sub(self):
-        self._test('function f(){return 42 - 7;}', 35)
-        self._test('function f(){return 42 - undefined;}', NaN)
-        self._test('function f(){return 42 - null;}', 42)
-
-    def test_mul(self):
-        self._test('function f(){return 42 * 7;}', 294)
-        self._test('function f(){return 42 * undefined;}', NaN)
-        self._test('function f(){return 42 * null;}', 0)
-
-    def test_div(self):
-        jsi = JSInterpreter('function f(a, b){return a / b;}')
-        self._test(jsi, NaN, args=(0, 0))
-        self._test(jsi, NaN, args=(JS_Undefined, 1))
-        self._test(jsi, float('inf'), args=(2, 0))
-        self._test(jsi, 0, args=(0, 3))
-
-    def test_mod(self):
-        self._test('function f(){return 42 % 7;}', 0)
-        self._test('function f(){return 42 % 0;}', NaN)
-        self._test('function f(){return 42 % undefined;}', NaN)
-
-    def test_exp(self):
-        self._test('function f(){return 42 ** 2;}', 1764)
-        self._test('function f(){return 42 ** undefined;}', NaN)
-        self._test('function f(){return 42 ** null;}', 1)
-        self._test('function f(){return undefined ** 42;}', NaN)
+        jsi = JSInterpreter('var x5 = function(){return 42;}')
+        self.assertEqual(jsi.call_function('x5'), 42)
 
     def test_calc(self):
-        self._test('function f(a){return 2*a+1;}', 7, args=[3])
+        jsi = JSInterpreter('function x4(a){return 2*a+1;}')
+        self.assertEqual(jsi.call_function('x4', 3), 7)
 
     def test_empty_return(self):
-        self._test('function f(){return; y()}', None)
+        jsi = JSInterpreter('function f(){return; y()}')
+        self.assertEqual(jsi.call_function('f'), None)
 
     def test_morespace(self):
-        self._test('function f (a) { return 2 * a + 1 ; }', 7, args=[3])
-        self._test('function f () { x =  2  ; return x; }', 2)
+        jsi = JSInterpreter('function x (a) { return 2 * a + 1 ; }')
+        self.assertEqual(jsi.call_function('x', 3), 7)
+
+        jsi = JSInterpreter('function f () { x =  2  ; return x; }')
+        self.assertEqual(jsi.call_function('f'), 2)
 
     def test_strange_chars(self):
-        self._test('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }',
-                   21, args=[20], func='$_xY1')
+        jsi = JSInterpreter('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }')
+        self.assertEqual(jsi.call_function('$_xY1', 20), 21)
 
     def test_operators(self):
-        self._test('function f(){return 1 << 5;}', 32)
-        self._test('function f(){return 2 ** 5}', 32)
-        self._test('function f(){return 19 & 21;}', 17)
-        self._test('function f(){return 11 >> 2;}', 2)
-        self._test('function f(){return []? 2+3: 4;}', 5)
-        self._test('function f(){return 1 == 2}', False)
-        self._test('function f(){return 0 && 1 || 2;}', 2)
-        self._test('function f(){return 0 ?? 42;}', 0)
-        self._test('function f(){return "life, the universe and everything" < 42;}', False)
+        jsi = JSInterpreter('function f(){return 1 << 5;}')
+        self.assertEqual(jsi.call_function('f'), 32)
+
+        jsi = JSInterpreter('function f(){return 2 ** 5}')
+        self.assertEqual(jsi.call_function('f'), 32)
+
+        jsi = JSInterpreter('function f(){return 19 & 21;}')
+        self.assertEqual(jsi.call_function('f'), 17)
+
+        jsi = JSInterpreter('function f(){return 11 >> 2;}')
+        self.assertEqual(jsi.call_function('f'), 2)
+
+        jsi = JSInterpreter('function f(){return []? 2+3: 4;}')
+        self.assertEqual(jsi.call_function('f'), 5)
+
+        jsi = JSInterpreter('function f(){return 1 == 2}')
+        self.assertEqual(jsi.call_function('f'), False)
+
+        jsi = JSInterpreter('function f(){return 0 && 1 || 2;}')
+        self.assertEqual(jsi.call_function('f'), 2)
+
+        jsi = JSInterpreter('function f(){return 0 ?? 42;}')
+        self.assertEqual(jsi.call_function('f'), 0)
 
     def test_array_access(self):
-        self._test('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}', [5, 2, 7])
+        jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}')
+        self.assertEqual(jsi.call_function('f'), [5, 2, 7])
 
     def test_parens(self):
-        self._test('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}', 7)
-        self._test('function f(){return (1 + 2) * 3;}', 9)
+        jsi = JSInterpreter('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}')
+        self.assertEqual(jsi.call_function('f'), 7)
+
+        jsi = JSInterpreter('function f(){return (1 + 2) * 3;}')
+        self.assertEqual(jsi.call_function('f'), 9)
 
     def test_quotes(self):
-        self._test(R'function f(){return "a\"\\("}', R'a"\(')
+        jsi = JSInterpreter(R'function f(){return "a\"\\("}')
+        self.assertEqual(jsi.call_function('f'), R'a"\(')
 
     def test_assignments(self):
-        self._test('function f(){var x = 20; x = 30 + 1; return x;}', 31)
-        self._test('function f(){var x = 20; x += 30 + 1; return x;}', 51)
-        self._test('function f(){var x = 20; x -= 30 + 1; return x;}', -11)
+        jsi = JSInterpreter('function f(){var x = 20; x = 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), 31)
+
+        jsi = JSInterpreter('function f(){var x = 20; x += 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), 51)
+
+        jsi = JSInterpreter('function f(){var x = 20; x -= 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), -11)
 
-    @unittest.skip('Not implemented')
     def test_comments(self):
-        self._test('''
-            function f() {
-                var x = /* 1 + */ 2;
-                var y = /* 30
-                * 40 */ 50;
-                return x + y;
-            }
-        ''', 52)
+        'Skipping: Not yet fully implemented'
+        return
+        jsi = JSInterpreter('''
+        function x() {
+            var x = /* 1 + */ 2;
+            var y = /* 30
+            * 40 */ 50;
+            return x + y;
+        }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 52)
 
-        self._test('''
-            function f() {
-                var x = "/*";
-                var y = 1 /* comment */ + 2;
-                return y;
-            }
-        ''', 3)
+        jsi = JSInterpreter('''
+        function f() {
+            var x = "/*";
+            var y = 1 /* comment */ + 2;
+            return y;
+        }
+        ''')
+        self.assertEqual(jsi.call_function('f'), 3)
 
     def test_precedence(self):
-        self._test('''
-            function f() {
-                var a = [10, 20, 30, 40, 50];
-                var b = 6;
-                a[0]=a[b%a.length];
-                return a;
-            }
-        ''', [20, 20, 30, 40, 50])
+        jsi = JSInterpreter('''
+        function x() {
+            var a = [10, 20, 30, 40, 50];
+            var b = 6;
+            a[0]=a[b%a.length];
+            return a;
+        }''')
+        self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
 
     def test_builtins(self):
-        self._test('function f() { return NaN }', NaN)
-
-    def test_date(self):
-        self._test('function f() { return new Date("Wednesday 31 December 1969 18:01:26 MDT") - 0; }', 86000)
-
-        jsi = JSInterpreter('function f(dt) { return new Date(dt) - 0; }')
-        self._test(jsi, 86000, args=['Wednesday 31 December 1969 18:01:26 MDT'])
-        self._test(jsi, 86000, args=['12/31/1969 18:01:26 MDT'])  # m/d/y
-        self._test(jsi, 0, args=['1 January 1970 00:00:00 UTC'])
+        jsi = JSInterpreter('''
+        function x() { return new Date('Wednesday 31 December 1969 18:01:26 MDT') - 0; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 86000)
+        jsi = JSInterpreter('''
+        function x(dt) { return new Date(dt) - 0; }
+        ''')
+        self.assertEqual(jsi.call_function('x', 'Wednesday 31 December 1969 18:01:26 MDT'), 86000)
 
     def test_call(self):
         jsi = JSInterpreter('''
-            function x() { return 2; }
-            function y(a) { return x() + (a?a:0); }
-            function z() { return y(3); }
+        function x() { return 2; }
+        function y(a) { return x() + (a?a:0); }
+        function z() { return y(3); }
         ''')
-        self._test(jsi, 5, func='z')
-        self._test(jsi, 2, func='y')
-
-    def test_if(self):
-        self._test('''
-            function f() {
-                let a = 9;
-                if (0==0) {a++}
-                return a
-            }
-        ''', 10)
-
-        self._test('''
-            function f() {
-                if (0==0) {return 10}
-            }
-        ''', 10)
-
-        self._test('''
-            function f() {
-                if (0!=0) {return 1}
-                else {return 10}
-            }
-        ''', 10)
-
-        """  # Unsupported
-        self._test('''
-            function f() {
-                if (0!=0) {return 1}
-                else if (1==0) {return 2}
-                else {return 10}
-            }
-        ''', 10)
-        """
+        self.assertEqual(jsi.call_function('z'), 5)
+        self.assertEqual(jsi.call_function('y'), 2)
 
     def test_for_loop(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) {a++} return a }', 10)
+        jsi = JSInterpreter('''
+        function x() { a=0; for (i=0; i-10; i++) {a++} return a }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 10)
 
     def test_switch(self):
         jsi = JSInterpreter('''
-            function f(x) { switch(x){
-                case 1:x+=1;
-                case 2:x+=2;
-                case 3:x+=3;break;
-                case 4:x+=4;
-                default:x=0;
-            } return x }
+        function x(f) { switch(f){
+            case 1:f+=1;
+            case 2:f+=2;
+            case 3:f+=3;break;
+            case 4:f+=4;
+            default:f=0;
+        } return f }
         ''')
-        self._test(jsi, 7, args=[1])
-        self._test(jsi, 6, args=[3])
-        self._test(jsi, 0, args=[5])
+        self.assertEqual(jsi.call_function('x', 1), 7)
+        self.assertEqual(jsi.call_function('x', 3), 6)
+        self.assertEqual(jsi.call_function('x', 5), 0)
 
     def test_switch_default(self):
         jsi = JSInterpreter('''
-            function f(x) { switch(x){
-                case 2: x+=2;
-                default: x-=1;
-                case 5:
-                case 6: x+=6;
-                case 0: break;
-                case 1: x+=1;
-            } return x }
+        function x(f) { switch(f){
+            case 2: f+=2;
+            default: f-=1;
+            case 5:
+            case 6: f+=6;
+            case 0: break;
+            case 1: f+=1;
+        } return f }
         ''')
-        self._test(jsi, 2, args=[1])
-        self._test(jsi, 11, args=[5])
-        self._test(jsi, 14, args=[9])
+        self.assertEqual(jsi.call_function('x', 1), 2)
+        self.assertEqual(jsi.call_function('x', 5), 11)
+        self.assertEqual(jsi.call_function('x', 9), 14)
 
     def test_try(self):
-        self._test('function f() { try{return 10} catch(e){return 5} }', 10)
-
-    def test_catch(self):
-        self._test('function f() { try{throw 10} catch(e){return 5} }', 5)
-
-    def test_finally(self):
-        self._test('function f() { try{throw 10} finally {return 42} }', 42)
-        self._test('function f() { try{throw 10} catch(e){return 5} finally {return 42} }', 42)
-
-    def test_nested_try(self):
-        self._test('''
-            function f() {try {
-                try{throw 10} finally {throw 42}
-                } catch(e){return 5} }
-        ''', 5)
+        jsi = JSInterpreter('''
+        function x() { try{return 10} catch(e){return 5} }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 10)
 
     def test_for_loop_continue(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }', 0)
+        jsi = JSInterpreter('''
+        function x() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 0)
 
     def test_for_loop_break(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) { break; a++ } return a }', 0)
-
-    def test_for_loop_try(self):
-        self._test('''
-            function f() {
-                for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
-                return 42 }
-        ''', 42)
+        jsi = JSInterpreter('''
+        function x() { a=0; for (i=0; i-10; i++) { break; a++ } return a }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 0)
 
     def test_literal_list(self):
-        self._test('function f() { return [1, 2, "asdf", [5, 6, 7]][3] }', [5, 6, 7])
+        jsi = JSInterpreter('''
+        function x() { return [1, 2, "asdf", [5, 6, 7]][3] }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [5, 6, 7])
 
     def test_comma(self):
-        self._test('function f() { a=5; a -= 1, a+=3; return a }', 7)
-        self._test('function f() { a=5; return (a -= 1, a+=3, a); }', 7)
-        self._test('function f() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }', 5)
+        jsi = JSInterpreter('''
+        function x() { a=5; a -= 1, a+=3; return a }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 7)
+
+        jsi = JSInterpreter('''
+        function x() { a=5; return (a -= 1, a+=3, a); }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 7)
+
+        jsi = JSInterpreter('''
+        function x() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 5)
 
     def test_void(self):
-        self._test('function f() { return void 42; }', None)
+        jsi = JSInterpreter('''
+        function x() { return void 42; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), None)
 
     def test_return_function(self):
         jsi = JSInterpreter('''
-            function f() { return [1, function(){return 1}][1] }
+        function x() { return [1, function(){return 1}][1] }
         ''')
-        self.assertEqual(jsi.call_function('f')([]), 1)
+        self.assertEqual(jsi.call_function('x')([]), 1)
 
     def test_null(self):
-        self._test('function f() { return null; }', None)
-        self._test('function f() { return [null > 0, null < 0, null == 0, null === 0]; }',
-                   [False, False, False, False])
-        self._test('function f() { return [null >= 0, null <= 0]; }', [True, True])
-
-    def test_undefined(self):
-        self._test('function f() { return undefined === undefined; }', True)
-        self._test('function f() { return undefined; }', JS_Undefined)
-        self._test('function f() {return undefined ?? 42; }', 42)
-        self._test('function f() { let v; return v; }', JS_Undefined)
-        self._test('function f() { let v; return v**0; }', 1)
-        self._test('function f() { let v; return [v>42, v<=42, v&&42, 42&&v]; }',
-                   [False, False, JS_Undefined, JS_Undefined])
-
-        self._test('''
-            function f() { return [
-                undefined === undefined,
-                undefined == undefined,
-                undefined == null,
-                undefined < undefined,
-                undefined > undefined,
-                undefined === 0,
-                undefined == 0,
-                undefined < 0,
-                undefined > 0,
-                undefined >= 0,
-                undefined <= 0,
-                undefined > null,
-                undefined < null,
-                undefined === null
-            ]; }
-        ''', list(map(bool, (1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))))
+        jsi = JSInterpreter('''
+        function x() { return null; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), None)
 
         jsi = JSInterpreter('''
-            function f() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
+        function x() { return [null > 0, null < 0, null == 0, null === 0]; }
         ''')
-        for y in jsi.call_function('f'):
+        self.assertEqual(jsi.call_function('x'), [False, False, False, False])
+
+        jsi = JSInterpreter('''
+        function x() { return [null >= 0, null <= 0]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [True, True])
+
+    def test_undefined(self):
+        jsi = JSInterpreter('''
+        function x() { return undefined === undefined; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), True)
+
+        jsi = JSInterpreter('''
+        function x() { return undefined; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), JS_Undefined)
+
+        jsi = JSInterpreter('''
+        function x() { let v; return v; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), JS_Undefined)
+
+        jsi = JSInterpreter('''
+        function x() { return [undefined === undefined, undefined == undefined, undefined < undefined, undefined > undefined]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [True, True, False, False])
+
+        jsi = JSInterpreter('''
+        function x() { return [undefined === 0, undefined == 0, undefined < 0, undefined > 0]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [False, False, False, False])
+
+        jsi = JSInterpreter('''
+        function x() { return [undefined >= 0, undefined <= 0]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [False, False])
+
+        jsi = JSInterpreter('''
+        function x() { return [undefined > null, undefined < null, undefined == null, undefined === null]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [False, False, True, False])
+
+        jsi = JSInterpreter('''
+        function x() { return [undefined === null, undefined == null, undefined < null, undefined > null]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [False, True, False, False])
+
+        jsi = JSInterpreter('''
+        function x() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
+        ''')
+        for y in jsi.call_function('x'):
             self.assertTrue(math.isnan(y))
 
+        jsi = JSInterpreter('''
+        function x() { let v; return v**0; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 1)
+
+        jsi = JSInterpreter('''
+        function x() { let v; return [v>42, v<=42, v&&42, 42&&v]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [False, False, JS_Undefined, JS_Undefined])
+
+        jsi = JSInterpreter('function x(){return undefined ?? 42; }')
+        self.assertEqual(jsi.call_function('x'), 42)
+
     def test_object(self):
-        self._test('function f() { return {}; }', {})
-        self._test('function f() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }', [42, 0])
-        self._test('function f() { let a; return a?.qq; }', JS_Undefined)
-        self._test('function f() { let a = {m1: 42, m2: 0 }; return a?.qq; }', JS_Undefined)
+        jsi = JSInterpreter('''
+        function x() { return {}; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), {})
+
+        jsi = JSInterpreter('''
+        function x() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), [42, 0])
+
+        jsi = JSInterpreter('''
+        function x() { let a; return a?.qq; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), JS_Undefined)
+
+        jsi = JSInterpreter('''
+        function x() { let a = {m1: 42, m2: 0 }; return a?.qq; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), JS_Undefined)
 
     def test_regex(self):
-        self._test('function f() { let a=/,,[/,913,/](,)}/; }', None)
-        self._test('function f() { let a=/,,[/,913,/](,)}/; return a; }', R'/,,[/,913,/](,)}/0')
+        jsi = JSInterpreter('''
+        function x() { let a=/,,[/,913,/](,)}/; }
+        ''')
+        self.assertEqual(jsi.call_function('x'), None)
 
-        R'''  # We are not compiling regex
-        jsi = JSInterpreter('function f() { let a=/,,[/,913,/](,)}/; return a; }')
-        self.assertIsInstance(jsi.call_function('f'), re.Pattern)
+        jsi = JSInterpreter('''
+        function x() { let a=/,,[/,913,/](,)}/; return a; }
+        ''')
+        self.assertIsInstance(jsi.call_function('x'), re.Pattern)
 
-        jsi = JSInterpreter('function f() { let a=/,,[/,913,/](,)}/i; return a; }')
-        self.assertEqual(jsi.call_function('f').flags & re.I, re.I)
-
-        jsi = JSInterpreter(R'function f() { let a=/,][}",],()}(\[)/; return a; }')
-        self.assertEqual(jsi.call_function('f').pattern, r',][}",],()}(\[)')
-
-        jsi = JSInterpreter(R'function f() { let a=[/[)\\]/]; return a[0]; }')
-        self.assertEqual(jsi.call_function('f').pattern, r'[)\\]')
-        '''
-
-    @unittest.skip('Not implemented')
-    def test_replace(self):
-        self._test('function f() { let a="data-name".replace("data-", ""); return a }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(new RegExp("^.+-"), ""); return a; }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(/^.+-/, ""); return a; }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(/a/g, "o"); return a; }',
-                   'doto-nome')
-        self._test('function f() { let a="data-name".replaceAll("a", "o"); return a; }',
-                   'doto-nome')
-
-    def test_char_code_at(self):
-        jsi = JSInterpreter('function f(i){return "test".charCodeAt(i)}')
-        self._test(jsi, 116, args=[0])
-        self._test(jsi, 101, args=[1])
-        self._test(jsi, 115, args=[2])
-        self._test(jsi, 116, args=[3])
-        self._test(jsi, None, args=[4])
-        self._test(jsi, 116, args=['not_a_number'])
-
-    def test_bitwise_operators_overflow(self):
-        self._test('function f(){return -524999584 << 5}', 379882496)
-        self._test('function f(){return 1236566549 << 5}', 915423904)
-
-    def test_bitwise_operators_typecast(self):
-        self._test('function f(){return null << 5}', 0)
-        self._test('function f(){return undefined >> 5}', 0)
-        self._test('function f(){return 42 << NaN}', 42)
-
-    def test_negative(self):
-        self._test('function f(){return 2    *    -2.0    ;}', -4)
-        self._test('function f(){return 2    -    - -2    ;}', 0)
-        self._test('function f(){return 2    -    - - -2  ;}', 4)
-        self._test('function f(){return 2    -    + + - -2;}', 0)
-        self._test('function f(){return 2    +    - + - -2;}', 0)
-
-    @unittest.skip('Not implemented')
-    def test_packed(self):
-        jsi = JSInterpreter('''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''')
-        self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))
+        jsi = JSInterpreter('''
+        function x() { let a=/,,[/,913,/](,)}/i; return a; }
+        ''')
+        self.assertEqual(jsi.call_function('x').flags & re.I, re.I)
 
 
 if __name__ == '__main__':

test/test_networking_utils.py

@@ -1,282 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-
-import pytest
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import contextlib
-import io
-import platform
-import random
-import ssl
-import urllib.error
-import warnings
-
-from yt_dlp.cookies import YoutubeDLCookieJar
-from yt_dlp.dependencies import certifi
-from yt_dlp.networking import Response
-from yt_dlp.networking._helper import (
-    InstanceStoreMixin,
-    add_accept_encoding_header,
-    get_redirect_method,
-    make_socks_proxy_opts,
-    select_proxy,
-    ssl_load_certs,
-)
-from yt_dlp.networking.exceptions import (
-    HTTPError,
-    IncompleteRead,
-    _CompatHTTPError,
-)
-from yt_dlp.socks import ProxyType
-from yt_dlp.utils.networking import HTTPHeaderDict
-
-TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-
-
-class TestNetworkingUtils:
-
-    def test_select_proxy(self):
-        proxies = {
-            'all': 'socks5://example.com',
-            'http': 'http://example.com:1080',
-            'no': 'bypass.example.com,yt-dl.org'
-        }
-
-        assert select_proxy('https://example.com', proxies) == proxies['all']
-        assert select_proxy('http://example.com', proxies) == proxies['http']
-        assert select_proxy('http://bypass.example.com', proxies) is None
-        assert select_proxy('https://yt-dl.org', proxies) is None
-
-    @pytest.mark.parametrize('socks_proxy,expected', [
-        ('socks5h://example.com', {
-            'proxytype': ProxyType.SOCKS5,
-            'addr': 'example.com',
-            'port': 1080,
-            'rdns': True,
-            'username': None,
-            'password': None
-        }),
-        ('socks5://user:@example.com:5555', {
-            'proxytype': ProxyType.SOCKS5,
-            'addr': 'example.com',
-            'port': 5555,
-            'rdns': False,
-            'username': 'user',
-            'password': ''
-        }),
-        ('socks4://u%40ser:pa%20ss@127.0.0.1:1080', {
-            'proxytype': ProxyType.SOCKS4,
-            'addr': '127.0.0.1',
-            'port': 1080,
-            'rdns': False,
-            'username': 'u@ser',
-            'password': 'pa ss'
-        }),
-        ('socks4a://:pa%20ss@127.0.0.1', {
-            'proxytype': ProxyType.SOCKS4A,
-            'addr': '127.0.0.1',
-            'port': 1080,
-            'rdns': True,
-            'username': '',
-            'password': 'pa ss'
-        })
-    ])
-    def test_make_socks_proxy_opts(self, socks_proxy, expected):
-        assert make_socks_proxy_opts(socks_proxy) == expected
-
-    def test_make_socks_proxy_unknown(self):
-        with pytest.raises(ValueError, match='Unknown SOCKS proxy version: socks'):
-            make_socks_proxy_opts('socks://127.0.0.1')
-
-    @pytest.mark.skipif(not certifi, reason='certifi is not installed')
-    def test_load_certifi(self):
-        context_certifi = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        context_certifi.load_verify_locations(cafile=certifi.where())
-        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        ssl_load_certs(context, use_certifi=True)
-        assert context.get_ca_certs() == context_certifi.get_ca_certs()
-
-        context_default = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        context_default.load_default_certs()
-        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        ssl_load_certs(context, use_certifi=False)
-        assert context.get_ca_certs() == context_default.get_ca_certs()
-
-        if context_default.get_ca_certs() == context_certifi.get_ca_certs():
-            pytest.skip('System uses certifi as default. The test is not valid')
-
-    @pytest.mark.parametrize('method,status,expected', [
-        ('GET', 303, 'GET'),
-        ('HEAD', 303, 'HEAD'),
-        ('PUT', 303, 'GET'),
-        ('POST', 301, 'GET'),
-        ('HEAD', 301, 'HEAD'),
-        ('POST', 302, 'GET'),
-        ('HEAD', 302, 'HEAD'),
-        ('PUT', 302, 'PUT'),
-        ('POST', 308, 'POST'),
-        ('POST', 307, 'POST'),
-        ('HEAD', 308, 'HEAD'),
-        ('HEAD', 307, 'HEAD'),
-    ])
-    def test_get_redirect_method(self, method, status, expected):
-        assert get_redirect_method(method, status) == expected
-
-    @pytest.mark.parametrize('headers,supported_encodings,expected', [
-        ({'Accept-Encoding': 'br'}, ['gzip', 'br'], {'Accept-Encoding': 'br'}),
-        ({}, ['gzip', 'br'], {'Accept-Encoding': 'gzip, br'}),
-        ({'Content-type': 'application/json'}, [], {'Content-type': 'application/json', 'Accept-Encoding': 'identity'}),
-    ])
-    def test_add_accept_encoding_header(self, headers, supported_encodings, expected):
-        headers = HTTPHeaderDict(headers)
-        add_accept_encoding_header(headers, supported_encodings)
-        assert headers == HTTPHeaderDict(expected)
-
-
-class TestInstanceStoreMixin:
-
-    class FakeInstanceStoreMixin(InstanceStoreMixin):
-        def _create_instance(self, **kwargs):
-            return random.randint(0, 1000000)
-
-        def _close_instance(self, instance):
-            pass
-
-    def test_mixin(self):
-        mixin = self.FakeInstanceStoreMixin()
-        assert mixin._get_instance(d={'a': 1, 'b': 2, 'c': {'d', 4}}) == mixin._get_instance(d={'a': 1, 'b': 2, 'c': {'d', 4}})
-
-        assert mixin._get_instance(d={'a': 1, 'b': 2, 'c': {'e', 4}}) != mixin._get_instance(d={'a': 1, 'b': 2, 'c': {'d', 4}})
-
-        assert mixin._get_instance(d={'a': 1, 'b': 2, 'c': {'d', 4}} != mixin._get_instance(d={'a': 1, 'b': 2, 'g': {'d', 4}}))
-
-        assert mixin._get_instance(d={'a': 1}, e=[1, 2, 3]) == mixin._get_instance(d={'a': 1}, e=[1, 2, 3])
-
-        assert mixin._get_instance(d={'a': 1}, e=[1, 2, 3]) != mixin._get_instance(d={'a': 1}, e=[1, 2, 3, 4])
-
-        cookiejar = YoutubeDLCookieJar()
-        assert mixin._get_instance(b=[1, 2], c=cookiejar) == mixin._get_instance(b=[1, 2], c=cookiejar)
-
-        assert mixin._get_instance(b=[1, 2], c=cookiejar) != mixin._get_instance(b=[1, 2], c=YoutubeDLCookieJar())
-
-        # Different order
-        assert mixin._get_instance(c=cookiejar, b=[1, 2]) == mixin._get_instance(b=[1, 2], c=cookiejar)
-
-        m = mixin._get_instance(t=1234)
-        assert mixin._get_instance(t=1234) == m
-        mixin._clear_instances()
-        assert mixin._get_instance(t=1234) != m
-
-
-class TestNetworkingExceptions:
-
-    @staticmethod
-    def create_response(status):
-        return Response(fp=io.BytesIO(b'test'), url='http://example.com', headers={'tesT': 'test'}, status=status)
-
-    @pytest.mark.parametrize('http_error_class', [HTTPError, lambda r: _CompatHTTPError(HTTPError(r))])
-    def test_http_error(self, http_error_class):
-
-        response = self.create_response(403)
-        error = http_error_class(response)
-
-        assert error.status == 403
-        assert str(error) == error.msg == 'HTTP Error 403: Forbidden'
-        assert error.reason == response.reason
-        assert error.response is response
-
-        data = error.response.read()
-        assert data == b'test'
-        assert repr(error) == '<HTTPError 403: Forbidden>'
-
-    @pytest.mark.parametrize('http_error_class', [HTTPError, lambda *args, **kwargs: _CompatHTTPError(HTTPError(*args, **kwargs))])
-    def test_redirect_http_error(self, http_error_class):
-        response = self.create_response(301)
-        error = http_error_class(response, redirect_loop=True)
-        assert str(error) == error.msg == 'HTTP Error 301: Moved Permanently (redirect loop detected)'
-        assert error.reason == 'Moved Permanently'
-
-    def test_compat_http_error(self):
-        response = self.create_response(403)
-        error = _CompatHTTPError(HTTPError(response))
-        assert isinstance(error, HTTPError)
-        assert isinstance(error, urllib.error.HTTPError)
-
-        @contextlib.contextmanager
-        def raises_deprecation_warning():
-            with warnings.catch_warnings(record=True) as w:
-                warnings.simplefilter('always')
-                yield
-
-                if len(w) == 0:
-                    pytest.fail('Did not raise DeprecationWarning')
-                if len(w) > 1:
-                    pytest.fail(f'Raised multiple warnings: {w}')
-
-                if not issubclass(w[-1].category, DeprecationWarning):
-                    pytest.fail(f'Expected DeprecationWarning, got {w[-1].category}')
-                w.clear()
-
-        with raises_deprecation_warning():
-            assert error.code == 403
-
-        with raises_deprecation_warning():
-            assert error.getcode() == 403
-
-        with raises_deprecation_warning():
-            assert error.hdrs is error.response.headers
-
-        with raises_deprecation_warning():
-            assert error.info() is error.response.headers
-
-        with raises_deprecation_warning():
-            assert error.headers is error.response.headers
-
-        with raises_deprecation_warning():
-            assert error.filename == error.response.url
-
-        with raises_deprecation_warning():
-            assert error.url == error.response.url
-
-        with raises_deprecation_warning():
-            assert error.geturl() == error.response.url
-
-        # Passthrough file operations
-        with raises_deprecation_warning():
-            assert error.read() == b'test'
-
-        with raises_deprecation_warning():
-            assert not error.closed
-
-        with raises_deprecation_warning():
-            # Technically Response operations are also passed through, which should not be used.
-            assert error.get_header('test') == 'test'
-
-        # Should not raise a warning
-        error.close()
-
-    @pytest.mark.skipif(
-        platform.python_implementation() == 'PyPy', reason='garbage collector works differently in pypy')
-    def test_compat_http_error_autoclose(self):
-        # Compat HTTPError should not autoclose response
-        response = self.create_response(403)
-        _CompatHTTPError(HTTPError(response))
-        assert not response.closed
-
-    def test_incomplete_read_error(self):
-        error = IncompleteRead(4, 3, cause='test')
-        assert isinstance(error, IncompleteRead)
-        assert repr(error) == '<IncompleteRead: 4 bytes read, 3 more expected>'
-        assert str(error) == error.msg == '4 bytes read, 3 more expected'
-        assert error.partial == 4
-        assert error.expected == 3
-        assert error.cause == 'test'
-
-        error = IncompleteRead(3)
-        assert repr(error) == '<IncompleteRead: 3 bytes read>'
-        assert str(error) == '3 bytes read'

test/test_plugins.py

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

test/test_postprocessors.py

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

test/test_socks.py

@@ -1,450 +1,113 @@
 #!/usr/bin/env python3
+
 # Allow direct execution
 import os
 import sys
-import threading
 import unittest
 
-import pytest
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import abc
-import contextlib
-import enum
-import functools
-import http.server
-import json
+
 import random
-import socket
-import struct
-import time
-from socketserver import (
-    BaseRequestHandler,
-    StreamRequestHandler,
-    ThreadingTCPServer,
-)
+import subprocess
+import urllib.request
 
-from test.helper import http_server_port
-from yt_dlp.networking import Request
-from yt_dlp.networking.exceptions import ProxyError, TransportError
-from yt_dlp.socks import (
-    SOCKS4_REPLY_VERSION,
-    SOCKS4_VERSION,
-    SOCKS5_USER_AUTH_SUCCESS,
-    SOCKS5_USER_AUTH_VERSION,
-    SOCKS5_VERSION,
-    Socks5AddressType,
-    Socks5Auth,
-)
-
-SOCKS5_USER_AUTH_FAILURE = 0x1
+from test.helper import FakeYDL, get_params, is_download_test
 
 
-class Socks4CD(enum.IntEnum):
-    REQUEST_GRANTED = 90
-    REQUEST_REJECTED_OR_FAILED = 91
-    REQUEST_REJECTED_CANNOT_CONNECT_TO_IDENTD = 92
-    REQUEST_REJECTED_DIFFERENT_USERID = 93
-
-
-class Socks5Reply(enum.IntEnum):
-    SUCCEEDED = 0x0
-    GENERAL_FAILURE = 0x1
-    CONNECTION_NOT_ALLOWED = 0x2
-    NETWORK_UNREACHABLE = 0x3
-    HOST_UNREACHABLE = 0x4
-    CONNECTION_REFUSED = 0x5
-    TTL_EXPIRED = 0x6
-    COMMAND_NOT_SUPPORTED = 0x7
-    ADDRESS_TYPE_NOT_SUPPORTED = 0x8
-
-
-class SocksTestRequestHandler(BaseRequestHandler):
-
-    def __init__(self, *args, socks_info=None, **kwargs):
-        self.socks_info = socks_info
-        super().__init__(*args, **kwargs)
-
-
-class SocksProxyHandler(BaseRequestHandler):
-    def __init__(self, request_handler_class, socks_server_kwargs, *args, **kwargs):
-        self.socks_kwargs = socks_server_kwargs or {}
-        self.request_handler_class = request_handler_class
-        super().__init__(*args, **kwargs)
-
-
-class Socks5ProxyHandler(StreamRequestHandler, SocksProxyHandler):
-
-    # SOCKS5 protocol https://tools.ietf.org/html/rfc1928
-    # SOCKS5 username/password authentication https://tools.ietf.org/html/rfc1929
-
-    def handle(self):
-        sleep = self.socks_kwargs.get('sleep')
-        if sleep:
-            time.sleep(sleep)
-        version, nmethods = self.connection.recv(2)
-        assert version == SOCKS5_VERSION
-        methods = list(self.connection.recv(nmethods))
-
-        auth = self.socks_kwargs.get('auth')
-
-        if auth is not None and Socks5Auth.AUTH_USER_PASS not in methods:
-            self.connection.sendall(struct.pack('!BB', SOCKS5_VERSION, Socks5Auth.AUTH_NO_ACCEPTABLE))
-            self.server.close_request(self.request)
-            return
-
-        elif Socks5Auth.AUTH_USER_PASS in methods:
-            self.connection.sendall(struct.pack("!BB", SOCKS5_VERSION, Socks5Auth.AUTH_USER_PASS))
-
-            _, user_len = struct.unpack('!BB', self.connection.recv(2))
-            username = self.connection.recv(user_len).decode()
-            pass_len = ord(self.connection.recv(1))
-            password = self.connection.recv(pass_len).decode()
-
-            if username == auth[0] and password == auth[1]:
-                self.connection.sendall(struct.pack('!BB', SOCKS5_USER_AUTH_VERSION, SOCKS5_USER_AUTH_SUCCESS))
-            else:
-                self.connection.sendall(struct.pack('!BB', SOCKS5_USER_AUTH_VERSION, SOCKS5_USER_AUTH_FAILURE))
-                self.server.close_request(self.request)
+@is_download_test
+class TestMultipleSocks(unittest.TestCase):
+    @staticmethod
+    def _check_params(attrs):
+        params = get_params()
+        for attr in attrs:
+            if attr not in params:
+                print('Missing %s. Skipping.' % attr)
                 return
+        return params
 
-        elif Socks5Auth.AUTH_NONE in methods:
-            self.connection.sendall(struct.pack('!BB', SOCKS5_VERSION, Socks5Auth.AUTH_NONE))
-        else:
-            self.connection.sendall(struct.pack('!BB', SOCKS5_VERSION, Socks5Auth.AUTH_NO_ACCEPTABLE))
-            self.server.close_request(self.request)
+    def test_proxy_http(self):
+        params = self._check_params(['primary_proxy', 'primary_server_ip'])
+        if params is None:
+            return
+        ydl = FakeYDL({
+            'proxy': params['primary_proxy']
+        })
+        self.assertEqual(
+            ydl.urlopen('http://yt-dl.org/ip').read().decode(),
+            params['primary_server_ip'])
+
+    def test_proxy_https(self):
+        params = self._check_params(['primary_proxy', 'primary_server_ip'])
+        if params is None:
+            return
+        ydl = FakeYDL({
+            'proxy': params['primary_proxy']
+        })
+        self.assertEqual(
+            ydl.urlopen('https://yt-dl.org/ip').read().decode(),
+            params['primary_server_ip'])
+
+    def test_secondary_proxy_http(self):
+        params = self._check_params(['secondary_proxy', 'secondary_server_ip'])
+        if params is None:
+            return
+        ydl = FakeYDL()
+        req = urllib.request.Request('http://yt-dl.org/ip')
+        req.add_header('Ytdl-request-proxy', params['secondary_proxy'])
+        self.assertEqual(
+            ydl.urlopen(req).read().decode(),
+            params['secondary_server_ip'])
+
+    def test_secondary_proxy_https(self):
+        params = self._check_params(['secondary_proxy', 'secondary_server_ip'])
+        if params is None:
+            return
+        ydl = FakeYDL()
+        req = urllib.request.Request('https://yt-dl.org/ip')
+        req.add_header('Ytdl-request-proxy', params['secondary_proxy'])
+        self.assertEqual(
+            ydl.urlopen(req).read().decode(),
+            params['secondary_server_ip'])
+
+
+@is_download_test
+class TestSocks(unittest.TestCase):
+    _SKIP_SOCKS_TEST = True
+
+    def setUp(self):
+        if self._SKIP_SOCKS_TEST:
             return
 
-        version, command, _, address_type = struct.unpack('!BBBB', self.connection.recv(4))
-        socks_info = {
-            'version': version,
-            'auth_methods': methods,
-            'command': command,
-            'client_address': self.client_address,
-            'ipv4_address': None,
-            'domain_address': None,
-            'ipv6_address': None,
-        }
-        if address_type == Socks5AddressType.ATYP_IPV4:
-            socks_info['ipv4_address'] = socket.inet_ntoa(self.connection.recv(4))
-        elif address_type == Socks5AddressType.ATYP_DOMAINNAME:
-            socks_info['domain_address'] = self.connection.recv(ord(self.connection.recv(1))).decode()
-        elif address_type == Socks5AddressType.ATYP_IPV6:
-            socks_info['ipv6_address'] = socket.inet_ntop(socket.AF_INET6, self.connection.recv(16))
-        else:
-            self.server.close_request(self.request)
+        self.port = random.randint(20000, 30000)
+        self.server_process = subprocess.Popen([
+            'srelay', '-f', '-i', '127.0.0.1:%d' % self.port],
+            stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
-        socks_info['port'] = struct.unpack('!H', self.connection.recv(2))[0]
-
-        # dummy response, the returned IP is just a placeholder
-        self.connection.sendall(struct.pack(
-            '!BBBBIH', SOCKS5_VERSION, self.socks_kwargs.get('reply', Socks5Reply.SUCCEEDED), 0x0, 0x1, 0x7f000001, 40000))
-
-        self.request_handler_class(self.request, self.client_address, self.server, socks_info=socks_info)
-
-
-class Socks4ProxyHandler(StreamRequestHandler, SocksProxyHandler):
-
-    # SOCKS4 protocol http://www.openssh.com/txt/socks4.protocol
-    # SOCKS4A protocol http://www.openssh.com/txt/socks4a.protocol
-
-    def _read_until_null(self):
-        return b''.join(iter(functools.partial(self.connection.recv, 1), b'\x00'))
-
-    def handle(self):
-        sleep = self.socks_kwargs.get('sleep')
-        if sleep:
-            time.sleep(sleep)
-        socks_info = {
-            'version': SOCKS4_VERSION,
-            'command': None,
-            'client_address': self.client_address,
-            'ipv4_address': None,
-            'port': None,
-            'domain_address': None,
-        }
-        version, command, dest_port, dest_ip = struct.unpack('!BBHI', self.connection.recv(8))
-        socks_info['port'] = dest_port
-        socks_info['command'] = command
-        if version != SOCKS4_VERSION:
-            self.server.close_request(self.request)
-            return
-        use_remote_dns = False
-        if 0x0 < dest_ip <= 0xFF:
-            use_remote_dns = True
-        else:
-            socks_info['ipv4_address'] = socket.inet_ntoa(struct.pack("!I", dest_ip))
-
-        user_id = self._read_until_null().decode()
-        if user_id != (self.socks_kwargs.get('user_id') or ''):
-            self.connection.sendall(struct.pack(
-                '!BBHI', SOCKS4_REPLY_VERSION, Socks4CD.REQUEST_REJECTED_DIFFERENT_USERID, 0x00, 0x00000000))
-            self.server.close_request(self.request)
+    def tearDown(self):
+        if self._SKIP_SOCKS_TEST:
             return
 
-        if use_remote_dns:
-            socks_info['domain_address'] = self._read_until_null().decode()
+        self.server_process.terminate()
+        self.server_process.communicate()
 
-        # dummy response, the returned IP is just a placeholder
-        self.connection.sendall(
-            struct.pack(
-                '!BBHI', SOCKS4_REPLY_VERSION,
-                self.socks_kwargs.get('cd_reply', Socks4CD.REQUEST_GRANTED), 40000, 0x7f000001))
+    def _get_ip(self, protocol):
+        if self._SKIP_SOCKS_TEST:
+            return '127.0.0.1'
 
-        self.request_handler_class(self.request, self.client_address, self.server, socks_info=socks_info)
+        ydl = FakeYDL({
+            'proxy': '%s://127.0.0.1:%d' % (protocol, self.port),
+        })
+        return ydl.urlopen('http://yt-dl.org/ip').read().decode()
 
+    def test_socks4(self):
+        self.assertTrue(isinstance(self._get_ip('socks4'), str))
 
-class IPv6ThreadingTCPServer(ThreadingTCPServer):
-    address_family = socket.AF_INET6
+    def test_socks4a(self):
+        self.assertTrue(isinstance(self._get_ip('socks4a'), str))
 
-
-class SocksHTTPTestRequestHandler(http.server.BaseHTTPRequestHandler, SocksTestRequestHandler):
-    def do_GET(self):
-        if self.path == '/socks_info':
-            payload = json.dumps(self.socks_info.copy())
-            self.send_response(200)
-            self.send_header('Content-Type', 'application/json; charset=utf-8')
-            self.send_header('Content-Length', str(len(payload)))
-            self.end_headers()
-            self.wfile.write(payload.encode())
-
-
-@contextlib.contextmanager
-def socks_server(socks_server_class, request_handler, bind_ip=None, **socks_server_kwargs):
-    server = server_thread = None
-    try:
-        bind_address = bind_ip or '127.0.0.1'
-        server_type = ThreadingTCPServer if '.' in bind_address else IPv6ThreadingTCPServer
-        server = server_type(
-            (bind_address, 0), functools.partial(socks_server_class, request_handler, socks_server_kwargs))
-        server_port = http_server_port(server)
-        server_thread = threading.Thread(target=server.serve_forever)
-        server_thread.daemon = True
-        server_thread.start()
-        if '.' not in bind_address:
-            yield f'[{bind_address}]:{server_port}'
-        else:
-            yield f'{bind_address}:{server_port}'
-    finally:
-        server.shutdown()
-        server.server_close()
-        server_thread.join(2.0)
-
-
-class SocksProxyTestContext(abc.ABC):
-    REQUEST_HANDLER_CLASS = None
-
-    def socks_server(self, server_class, *args, **kwargs):
-        return socks_server(server_class, self.REQUEST_HANDLER_CLASS, *args, **kwargs)
-
-    @abc.abstractmethod
-    def socks_info_request(self, handler, target_domain=None, target_port=None, **req_kwargs) -> dict:
-        """return a dict of socks_info"""
-
-
-class HTTPSocksTestProxyContext(SocksProxyTestContext):
-    REQUEST_HANDLER_CLASS = SocksHTTPTestRequestHandler
-
-    def socks_info_request(self, handler, target_domain=None, target_port=None, **req_kwargs):
-        request = Request(f'http://{target_domain or "127.0.0.1"}:{target_port or "40000"}/socks_info', **req_kwargs)
-        handler.validate(request)
-        return json.loads(handler.send(request).read().decode())
-
-
-CTX_MAP = {
-    'http': HTTPSocksTestProxyContext,
-}
-
-
-@pytest.fixture(scope='module')
-def ctx(request):
-    return CTX_MAP[request.param]()
-
-
-class TestSocks4Proxy:
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks4_no_auth(self, handler, ctx):
-        with handler() as rh:
-            with ctx.socks_server(Socks4ProxyHandler) as server_address:
-                response = ctx.socks_info_request(
-                    rh, proxies={'all': f'socks4://{server_address}'})
-                assert response['version'] == 4
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks4_auth(self, handler, ctx):
-        with handler() as rh:
-            with ctx.socks_server(Socks4ProxyHandler, user_id='user') as server_address:
-                with pytest.raises(ProxyError):
-                    ctx.socks_info_request(rh, proxies={'all': f'socks4://{server_address}'})
-                response = ctx.socks_info_request(
-                    rh, proxies={'all': f'socks4://user:@{server_address}'})
-                assert response['version'] == 4
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks4a_ipv4_target(self, handler, ctx):
-        with ctx.socks_server(Socks4ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks4a://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='127.0.0.1')
-                assert response['version'] == 4
-                assert (response['ipv4_address'] == '127.0.0.1') != (response['domain_address'] == '127.0.0.1')
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks4a_domain_target(self, handler, ctx):
-        with ctx.socks_server(Socks4ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks4a://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='localhost')
-                assert response['version'] == 4
-                assert response['ipv4_address'] is None
-                assert response['domain_address'] == 'localhost'
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_ipv4_client_source_address(self, handler, ctx):
-        with ctx.socks_server(Socks4ProxyHandler) as server_address:
-            source_address = f'127.0.0.{random.randint(5, 255)}'
-            with handler(proxies={'all': f'socks4://{server_address}'},
-                         source_address=source_address) as rh:
-                response = ctx.socks_info_request(rh)
-                assert response['client_address'][0] == source_address
-                assert response['version'] == 4
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    @pytest.mark.parametrize('reply_code', [
-        Socks4CD.REQUEST_REJECTED_OR_FAILED,
-        Socks4CD.REQUEST_REJECTED_CANNOT_CONNECT_TO_IDENTD,
-        Socks4CD.REQUEST_REJECTED_DIFFERENT_USERID,
-    ])
-    def test_socks4_errors(self, handler, ctx, reply_code):
-        with ctx.socks_server(Socks4ProxyHandler, cd_reply=reply_code) as server_address:
-            with handler(proxies={'all': f'socks4://{server_address}'}) as rh:
-                with pytest.raises(ProxyError):
-                    ctx.socks_info_request(rh)
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_ipv6_socks4_proxy(self, handler, ctx):
-        with ctx.socks_server(Socks4ProxyHandler, bind_ip='::1') as server_address:
-            with handler(proxies={'all': f'socks4://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='127.0.0.1')
-                assert response['client_address'][0] == '::1'
-                assert response['ipv4_address'] == '127.0.0.1'
-                assert response['version'] == 4
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_timeout(self, handler, ctx):
-        with ctx.socks_server(Socks4ProxyHandler, sleep=2) as server_address:
-            with handler(proxies={'all': f'socks4://{server_address}'}, timeout=0.5) as rh:
-                with pytest.raises(TransportError):
-                    ctx.socks_info_request(rh)
-
-
-class TestSocks5Proxy:
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5_no_auth(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh)
-                assert response['auth_methods'] == [0x0]
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5_user_pass(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler, auth=('test', 'testpass')) as server_address:
-            with handler() as rh:
-                with pytest.raises(ProxyError):
-                    ctx.socks_info_request(rh, proxies={'all': f'socks5://{server_address}'})
-
-                response = ctx.socks_info_request(
-                    rh, proxies={'all': f'socks5://test:testpass@{server_address}'})
-
-                assert response['auth_methods'] == [Socks5Auth.AUTH_NONE, Socks5Auth.AUTH_USER_PASS]
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5_ipv4_target(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='127.0.0.1')
-                assert response['ipv4_address'] == '127.0.0.1'
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5_domain_target(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='localhost')
-                assert (response['ipv4_address'] == '127.0.0.1') != (response['ipv6_address'] == '::1')
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5h_domain_target(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks5h://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='localhost')
-                assert response['ipv4_address'] is None
-                assert response['domain_address'] == 'localhost'
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5h_ip_target(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks5h://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='127.0.0.1')
-                assert response['ipv4_address'] == '127.0.0.1'
-                assert response['domain_address'] is None
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_socks5_ipv6_destination(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='[::1]')
-                assert response['ipv6_address'] == '::1'
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_ipv6_socks5_proxy(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler, bind_ip='::1') as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
-                response = ctx.socks_info_request(rh, target_domain='127.0.0.1')
-                assert response['client_address'][0] == '::1'
-                assert response['ipv4_address'] == '127.0.0.1'
-                assert response['version'] == 5
-
-    # XXX: is there any feasible way of testing IPv6 source addresses?
-    # Same would go for non-proxy source_address test...
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    def test_ipv4_client_source_address(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler) as server_address:
-            source_address = f'127.0.0.{random.randint(5, 255)}'
-            with handler(proxies={'all': f'socks5://{server_address}'}, source_address=source_address) as rh:
-                response = ctx.socks_info_request(rh)
-                assert response['client_address'][0] == source_address
-                assert response['version'] == 5
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http'), ('Requests', 'http')], indirect=True)
-    @pytest.mark.parametrize('reply_code', [
-        Socks5Reply.GENERAL_FAILURE,
-        Socks5Reply.CONNECTION_NOT_ALLOWED,
-        Socks5Reply.NETWORK_UNREACHABLE,
-        Socks5Reply.HOST_UNREACHABLE,
-        Socks5Reply.CONNECTION_REFUSED,
-        Socks5Reply.TTL_EXPIRED,
-        Socks5Reply.COMMAND_NOT_SUPPORTED,
-        Socks5Reply.ADDRESS_TYPE_NOT_SUPPORTED,
-    ])
-    def test_socks5_errors(self, handler, ctx, reply_code):
-        with ctx.socks_server(Socks5ProxyHandler, reply=reply_code) as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}) as rh:
-                with pytest.raises(ProxyError):
-                    ctx.socks_info_request(rh)
-
-    @pytest.mark.parametrize('handler,ctx', [('Urllib', 'http')], indirect=True)
-    def test_timeout(self, handler, ctx):
-        with ctx.socks_server(Socks5ProxyHandler, sleep=2) as server_address:
-            with handler(proxies={'all': f'socks5://{server_address}'}, timeout=1) as rh:
-                with pytest.raises(TransportError):
-                    ctx.socks_info_request(rh)
+    def test_socks5(self):
+        self.assertTrue(isinstance(self._get_ip('socks5'), str))
 
 
 if __name__ == '__main__':

test/test_update.py

@@ -1,199 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-import unittest
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-from test.helper import FakeYDL, report_warning
-from yt_dlp.update import Updater, UpdateInfo
-
-TEST_API_DATA = {
-    'yt-dlp/yt-dlp/latest': {
-        'tag_name': '2023.12.31',
-        'target_commitish': 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
-        'name': 'yt-dlp 2023.12.31',
-        'body': 'BODY',
-    },
-    'yt-dlp/yt-dlp-nightly-builds/latest': {
-        'tag_name': '2023.12.31.123456',
-        'target_commitish': 'master',
-        'name': 'yt-dlp nightly 2023.12.31.123456',
-        'body': 'Generated from: https://github.com/yt-dlp/yt-dlp/commit/cccccccccccccccccccccccccccccccccccccccc',
-    },
-    'yt-dlp/yt-dlp-master-builds/latest': {
-        'tag_name': '2023.12.31.987654',
-        'target_commitish': 'master',
-        'name': 'yt-dlp master 2023.12.31.987654',
-        'body': 'Generated from: https://github.com/yt-dlp/yt-dlp/commit/dddddddddddddddddddddddddddddddddddddddd',
-    },
-    'yt-dlp/yt-dlp/tags/testing': {
-        'tag_name': 'testing',
-        'target_commitish': '9999999999999999999999999999999999999999',
-        'name': 'testing',
-        'body': 'BODY',
-    },
-    'fork/yt-dlp/latest': {
-        'tag_name': '2050.12.31',
-        'target_commitish': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-        'name': '2050.12.31',
-        'body': 'BODY',
-    },
-    'fork/yt-dlp/tags/pr0000': {
-        'tag_name': 'pr0000',
-        'target_commitish': 'ffffffffffffffffffffffffffffffffffffffff',
-        'name': 'pr1234 2023.11.11.000000',
-        'body': 'BODY',
-    },
-    'fork/yt-dlp/tags/pr1234': {
-        'tag_name': 'pr1234',
-        'target_commitish': '0000000000000000000000000000000000000000',
-        'name': 'pr1234 2023.12.31.555555',
-        'body': 'BODY',
-    },
-    'fork/yt-dlp/tags/pr9999': {
-        'tag_name': 'pr9999',
-        'target_commitish': '1111111111111111111111111111111111111111',
-        'name': 'pr9999',
-        'body': 'BODY',
-    },
-    'fork/yt-dlp-satellite/tags/pr987': {
-        'tag_name': 'pr987',
-        'target_commitish': 'master',
-        'name': 'pr987',
-        'body': 'Generated from: https://github.com/yt-dlp/yt-dlp/commit/2222222222222222222222222222222222222222',
-    },
-}
-
-TEST_LOCKFILE_V1 = '''# This file is used for regulating self-update
-lock 2022.08.18.36 .+ Python 3.6
-lock 2023.11.13 .+ Python 3.7
-'''
-
-TEST_LOCKFILE_V2 = '''# This file is used for regulating self-update
-lockV2 yt-dlp/yt-dlp 2022.08.18.36 .+ Python 3.6
-lockV2 yt-dlp/yt-dlp 2023.11.13 .+ Python 3.7
-'''
-
-TEST_LOCKFILE_V1_V2 = '''# This file is used for regulating self-update
-lock 2022.08.18.36 .+ Python 3.6
-lock 2023.11.13 .+ Python 3.7
-lockV2 yt-dlp/yt-dlp 2022.08.18.36 .+ Python 3.6
-lockV2 yt-dlp/yt-dlp 2023.11.13 .+ Python 3.7
-lockV2 fork/yt-dlp pr0000 .+ Python 3.6
-lockV2 fork/yt-dlp pr1234 .+ Python 3.7
-lockV2 fork/yt-dlp pr9999 .+ Python 3.11
-'''
-
-
-class FakeUpdater(Updater):
-    current_version = '2022.01.01'
-    current_commit = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-
-    _channel = 'stable'
-    _origin = 'yt-dlp/yt-dlp'
-
-    def _download_update_spec(self, *args, **kwargs):
-        return TEST_LOCKFILE_V1_V2
-
-    def _call_api(self, tag):
-        tag = f'tags/{tag}' if tag != 'latest' else tag
-        return TEST_API_DATA[f'{self.requested_repo}/{tag}']
-
-    def _report_error(self, msg, *args, **kwargs):
-        report_warning(msg)
-
-
-class TestUpdate(unittest.TestCase):
-    maxDiff = None
-
-    def test_update_spec(self):
-        ydl = FakeYDL()
-        updater = FakeUpdater(ydl, 'stable@latest')
-
-        def test(lockfile, identifier, input_tag, expect_tag, exact=False, repo='yt-dlp/yt-dlp'):
-            updater._identifier = identifier
-            updater._exact = exact
-            updater.requested_repo = repo
-            result = updater._process_update_spec(lockfile, input_tag)
-            self.assertEqual(
-                result, expect_tag,
-                f'{identifier!r} requesting {repo}@{input_tag} (exact={exact}) '
-                f'returned {result!r} instead of {expect_tag!r}')
-
-        test(TEST_LOCKFILE_V1, 'zip Python 3.11.0', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V1, 'zip stable Python 3.11.0', '2023.11.13', '2023.11.13', exact=True)
-        test(TEST_LOCKFILE_V1, 'zip Python 3.6.0', '2023.11.13', '2022.08.18.36')
-        test(TEST_LOCKFILE_V1, 'zip stable Python 3.6.0', '2023.11.13', None, exact=True)
-        test(TEST_LOCKFILE_V1, 'zip Python 3.7.0', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V1, 'zip stable Python 3.7.1', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V1, 'zip Python 3.7.1', '2023.12.31', '2023.11.13')
-        test(TEST_LOCKFILE_V1, 'zip stable Python 3.7.1', '2023.12.31', '2023.11.13')
-
-        test(TEST_LOCKFILE_V2, 'zip Python 3.11.1', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V2, 'zip stable Python 3.11.1', '2023.12.31', '2023.12.31')
-        test(TEST_LOCKFILE_V2, 'zip Python 3.6.1', '2023.11.13', '2022.08.18.36')
-        test(TEST_LOCKFILE_V2, 'zip stable Python 3.7.2', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V2, 'zip Python 3.7.2', '2023.12.31', '2023.11.13')
-
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.11.2', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V1_V2, 'zip stable Python 3.11.2', '2023.12.31', '2023.12.31')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.6.2', '2023.11.13', '2022.08.18.36')
-        test(TEST_LOCKFILE_V1_V2, 'zip stable Python 3.7.3', '2023.11.13', '2023.11.13')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.7.3', '2023.12.31', '2023.11.13')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.6.3', 'pr0000', None, repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip stable Python 3.7.4', 'pr0000', 'pr0000', repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.6.4', 'pr0000', None, repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.7.4', 'pr1234', None, repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip stable Python 3.8.1', 'pr1234', 'pr1234', repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.7.5', 'pr1234', None, repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.11.3', 'pr9999', None, repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip stable Python 3.12.0', 'pr9999', 'pr9999', repo='fork/yt-dlp')
-        test(TEST_LOCKFILE_V1_V2, 'zip Python 3.11.4', 'pr9999', None, repo='fork/yt-dlp')
-
-    def test_query_update(self):
-        ydl = FakeYDL()
-
-        def test(target, expected, current_version=None, current_commit=None, identifier=None):
-            updater = FakeUpdater(ydl, target)
-            if current_version:
-                updater.current_version = current_version
-            if current_commit:
-                updater.current_commit = current_commit
-            updater._identifier = identifier or 'zip'
-            update_info = updater.query_update(_output=True)
-            self.assertDictEqual(
-                update_info.__dict__ if update_info else {}, expected.__dict__ if expected else {})
-
-        test('yt-dlp/yt-dlp@latest', UpdateInfo(
-            '2023.12.31', version='2023.12.31', requested_version='2023.12.31', commit='b' * 40))
-        test('yt-dlp/yt-dlp-nightly-builds@latest', UpdateInfo(
-            '2023.12.31.123456', version='2023.12.31.123456', requested_version='2023.12.31.123456', commit='c' * 40))
-        test('yt-dlp/yt-dlp-master-builds@latest', UpdateInfo(
-            '2023.12.31.987654', version='2023.12.31.987654', requested_version='2023.12.31.987654', commit='d' * 40))
-        test('fork/yt-dlp@latest', UpdateInfo(
-            '2050.12.31', version='2050.12.31', requested_version='2050.12.31', commit='e' * 40))
-        test('fork/yt-dlp@pr0000', UpdateInfo(
-            'pr0000', version='2023.11.11.000000', requested_version='2023.11.11.000000', commit='f' * 40))
-        test('fork/yt-dlp@pr1234', UpdateInfo(
-            'pr1234', version='2023.12.31.555555', requested_version='2023.12.31.555555', commit='0' * 40))
-        test('fork/yt-dlp@pr9999', UpdateInfo(
-            'pr9999', version=None, requested_version=None, commit='1' * 40))
-        test('fork/yt-dlp-satellite@pr987', UpdateInfo(
-            'pr987', version=None, requested_version=None, commit='2' * 40))
-        test('yt-dlp/yt-dlp', None, current_version='2024.01.01')
-        test('stable', UpdateInfo(
-            '2023.12.31', version='2023.12.31', requested_version='2023.12.31', commit='b' * 40))
-        test('nightly', UpdateInfo(
-            '2023.12.31.123456', version='2023.12.31.123456', requested_version='2023.12.31.123456', commit='c' * 40))
-        test('master', UpdateInfo(
-            '2023.12.31.987654', version='2023.12.31.987654', requested_version='2023.12.31.987654', commit='d' * 40))
-        test('testing', None, current_commit='9' * 40)
-        test('testing', UpdateInfo('testing', commit='9' * 40))
-
-
-if __name__ == '__main__':
-    unittest.main()

test/test_update.py.disabled

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+# Allow direct execution
+import os
+import sys
+import unittest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+import json
+
+from yt_dlp.update import rsa_verify
+
+
+class TestUpdate(unittest.TestCase):
+    def test_rsa_verify(self):
+        UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
+        with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'versions.json'), 'rb') as f:
+            versions_info = f.read().decode()
+        versions_info = json.loads(versions_info)
+        signature = versions_info['signature']
+        del versions_info['signature']
+        self.assertTrue(rsa_verify(
+            json.dumps(versions_info, sort_keys=True).encode(),
+            signature, UPDATES_RSA_KEY))
+
+
+if __name__ == '__main__':
+    unittest.main()

test/test_utils.py

@@ -2,10 +2,8 @@
 
 # Allow direct execution
 import os
-import re
 import sys
 import unittest
-import warnings
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -14,7 +12,6 @@ import contextlib
 import io
 import itertools
 import json
-import subprocess
 import xml.etree.ElementTree
 
 from yt_dlp.compat import (
@@ -29,7 +26,6 @@ from yt_dlp.utils import (
     InAdvancePagedList,
     LazyList,
     OnDemandPagedList,
-    Popen,
     age_restricted,
     args_to_str,
     base_url,
@@ -49,9 +45,10 @@ from yt_dlp.utils import (
     encode_base_n,
     encode_compat_str,
     encodeFilename,
+    escape_rfc3986,
+    escape_url,
     expand_path,
     extract_attributes,
-    extract_basic_auth,
     find_xpath_attr,
     fix_xml_ampersands,
     float_or_none,
@@ -104,16 +101,14 @@ from yt_dlp.utils import (
     sanitize_filename,
     sanitize_path,
     sanitize_url,
+    sanitized_Request,
     shell_quote,
     smuggle_url,
-    str_or_none,
     str_to_int,
     strip_jsonp,
     strip_or_none,
     subtitles_filename,
     timeconvert,
-    traverse_obj,
-    try_call,
     unescapeHTML,
     unified_strdate,
     unified_timestamp,
@@ -125,19 +120,12 @@ from yt_dlp.utils import (
     urlencode_postdata,
     urljoin,
     urshift,
-    variadic,
     version_tuple,
     xpath_attr,
     xpath_element,
     xpath_text,
     xpath_with_ns,
 )
-from yt_dlp.utils.networking import (
-    HTTPHeaderDict,
-    escape_rfc3986,
-    normalize_url,
-    remove_dot_segments,
-)
 
 
 class TestUtil(unittest.TestCase):
@@ -264,6 +252,15 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_url('https://foo.bar'), 'https://foo.bar')
         self.assertEqual(sanitize_url('foo bar'), 'foo bar')
 
+    def test_extract_basic_auth(self):
+        auth_header = lambda url: sanitized_Request(url).get_header('Authorization')
+        self.assertFalse(auth_header('http://foo.bar'))
+        self.assertFalse(auth_header('http://:foo.bar'))
+        self.assertEqual(auth_header('http://@foo.bar'), 'Basic Og==')
+        self.assertEqual(auth_header('http://:pass@foo.bar'), 'Basic OnBhc3M=')
+        self.assertEqual(auth_header('http://user:@foo.bar'), 'Basic dXNlcjo=')
+        self.assertEqual(auth_header('http://user:pass@foo.bar'), 'Basic dXNlcjpwYXNz')
+
     def test_expand_path(self):
         def env(var):
             return f'%{var}%' if sys.platform == 'win32' else f'${var}'
@@ -569,7 +566,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(base_url('http://foo.de/bar/'), 'http://foo.de/bar/')
         self.assertEqual(base_url('http://foo.de/bar/baz'), 'http://foo.de/bar/')
         self.assertEqual(base_url('http://foo.de/bar/baz?x=z/x/c'), 'http://foo.de/bar/')
-        self.assertEqual(base_url('http://foo.de/bar/baz&x=z&w=y/x/c'), 'http://foo.de/bar/baz&x=z&w=y/x/')
 
     def test_urljoin(self):
         self.assertEqual(urljoin('http://foo.de/', '/a/b/c.txt'), 'http://foo.de/a/b/c.txt')
@@ -660,8 +656,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(parse_duration('P0Y0M0DT0H4M20.880S'), 260.88)
         self.assertEqual(parse_duration('01:02:03:050'), 3723.05)
         self.assertEqual(parse_duration('103:050'), 103.05)
-        self.assertEqual(parse_duration('1HR 3MIN'), 3780)
-        self.assertEqual(parse_duration('2hrs 3mins'), 7380)
 
     def test_fix_xml_ampersands(self):
         self.assertEqual(
@@ -938,124 +932,24 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(escape_rfc3986('foo bar'), 'foo%20bar')
         self.assertEqual(escape_rfc3986('foo%20bar'), 'foo%20bar')
 
-    def test_normalize_url(self):
+    def test_escape_url(self):
         self.assertEqual(
-            normalize_url('http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavré_FD.mp4'),
+            escape_url('http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavré_FD.mp4'),
             'http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavre%CC%81_FD.mp4'
         )
         self.assertEqual(
-            normalize_url('http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erklärt/Das-Erste/Video?documentId=22673108&bcastId=5290'),
+            escape_url('http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erklärt/Das-Erste/Video?documentId=22673108&bcastId=5290'),
             'http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erkl%C3%A4rt/Das-Erste/Video?documentId=22673108&bcastId=5290'
         )
         self.assertEqual(
-            normalize_url('http://тест.рф/фрагмент'),
+            escape_url('http://тест.рф/фрагмент'),
             'http://xn--e1aybc.xn--p1ai/%D1%84%D1%80%D0%B0%D0%B3%D0%BC%D0%B5%D0%BD%D1%82'
         )
         self.assertEqual(
-            normalize_url('http://тест.рф/абв?абв=абв#абв'),
+            escape_url('http://тест.рф/абв?абв=абв#абв'),
             'http://xn--e1aybc.xn--p1ai/%D0%B0%D0%B1%D0%B2?%D0%B0%D0%B1%D0%B2=%D0%B0%D0%B1%D0%B2#%D0%B0%D0%B1%D0%B2'
         )
-        self.assertEqual(normalize_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
-
-        self.assertEqual(normalize_url('http://www.example.com/../a/b/../c/./d.html'), 'http://www.example.com/a/c/d.html')
-
-    def test_remove_dot_segments(self):
-        self.assertEqual(remove_dot_segments('/a/b/c/./../../g'), '/a/g')
-        self.assertEqual(remove_dot_segments('mid/content=5/../6'), 'mid/6')
-        self.assertEqual(remove_dot_segments('/ad/../cd'), '/cd')
-        self.assertEqual(remove_dot_segments('/ad/../cd/'), '/cd/')
-        self.assertEqual(remove_dot_segments('/..'), '/')
-        self.assertEqual(remove_dot_segments('/./'), '/')
-        self.assertEqual(remove_dot_segments('/./a'), '/a')
-        self.assertEqual(remove_dot_segments('/abc/./.././d/././e/.././f/./../../ghi'), '/ghi')
-        self.assertEqual(remove_dot_segments('/'), '/')
-        self.assertEqual(remove_dot_segments('/t'), '/t')
-        self.assertEqual(remove_dot_segments('t'), 't')
-        self.assertEqual(remove_dot_segments(''), '')
-        self.assertEqual(remove_dot_segments('/../a/b/c'), '/a/b/c')
-        self.assertEqual(remove_dot_segments('../a'), 'a')
-        self.assertEqual(remove_dot_segments('./a'), 'a')
-        self.assertEqual(remove_dot_segments('.'), '')
-        self.assertEqual(remove_dot_segments('////'), '////')
-
-    def test_js_to_json_vars_strings(self):
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'null': a,
-                    'nullStr': b,
-                    'true': c,
-                    'trueStr': d,
-                    'false': e,
-                    'falseStr': f,
-                    'unresolvedVar': g,
-                }''',
-                {
-                    'a': 'null',
-                    'b': '"null"',
-                    'c': 'true',
-                    'd': '"true"',
-                    'e': 'false',
-                    'f': '"false"',
-                    'g': 'var',
-                }
-            )),
-            {
-                'null': None,
-                'nullStr': 'null',
-                'true': True,
-                'trueStr': 'true',
-                'false': False,
-                'falseStr': 'false',
-                'unresolvedVar': 'var'
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'int': a,
-                    'intStr': b,
-                    'float': c,
-                    'floatStr': d,
-                }''',
-                {
-                    'a': '123',
-                    'b': '"123"',
-                    'c': '1.23',
-                    'd': '"1.23"',
-                }
-            )),
-            {
-                'int': 123,
-                'intStr': '123',
-                'float': 1.23,
-                'floatStr': '1.23',
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'object': a,
-                    'objectStr': b,
-                    'array': c,
-                    'arrayStr': d,
-                }''',
-                {
-                    'a': '{}',
-                    'b': '"{}"',
-                    'c': '[]',
-                    'd': '"[]"',
-                }
-            )),
-            {
-                'object': {},
-                'objectStr': '{}',
-                'array': [],
-                'arrayStr': '[]',
-            }
-        )
+        self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
 
     def test_js_to_json_realworld(self):
         inp = '''{
@@ -1203,34 +1097,10 @@ class TestUtil(unittest.TestCase):
         on = js_to_json('[1,//{},\n2]')
         self.assertEqual(json.loads(on), [1, 2])
 
-        on = js_to_json(R'"\^\$\#"')
-        self.assertEqual(json.loads(on), R'^$#', msg='Unnecessary escapes should be stripped')
-
-        on = js_to_json('\'"\\""\'')
-        self.assertEqual(json.loads(on), '"""', msg='Unnecessary quote escape should be escaped')
-
-        on = js_to_json('[new Date("spam"), \'("eggs")\']')
-        self.assertEqual(json.loads(on), ['spam', '("eggs")'], msg='Date regex should match a single string')
-
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
 
-    def test_js_to_json_template_literal(self):
-        self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '"X"'}), '"XX"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '5'}), '"55"')
-        self.assertEqual(js_to_json('`${name}"${name}"`', {'name': '5'}), '"5\\"5\\""')
-        self.assertEqual(js_to_json('`${name}`', {}), '"name"')
-
-    def test_js_to_json_common_constructors(self):
-        self.assertEqual(json.loads(js_to_json('new Map([["a", 5]])')), {'a': 5})
-        self.assertEqual(json.loads(js_to_json('Array(5, 10)')), [5, 10])
-        self.assertEqual(json.loads(js_to_json('new Array(15,5)')), [15, 5])
-        self.assertEqual(json.loads(js_to_json('new Map([Array(5, 10),new Array(15,5)])')), {'5': 10, '15': 5})
-        self.assertEqual(json.loads(js_to_json('new Date("123")')), "123")
-        self.assertEqual(json.loads(js_to_json('new Date(\'2023-10-19\')')), "2023-10-19")
-
     def test_extract_attributes(self):
         self.assertEqual(extract_attributes('<e x="y">'), {'x': 'y'})
         self.assertEqual(extract_attributes("<e x='y'>"), {'x': 'y'})
@@ -1806,9 +1676,6 @@ Line 1
         self.assertEqual(list(get_elements_text_and_html_by_attribute('class', 'foo', html)), [])
         self.assertEqual(list(get_elements_text_and_html_by_attribute('class', 'no-such-foo', html)), [])
 
-        self.assertEqual(list(get_elements_text_and_html_by_attribute(
-            'class', 'foo', '<a class="foo">nice</a><span class="foo">nice</span>', tag='a')), [('nice', '<a class="foo">nice</a>')])
-
     GET_ELEMENT_BY_TAG_TEST_STRING = '''
     random text lorem ipsum</p>
     <div>
@@ -1866,8 +1733,6 @@ Line 1
     def test_clean_podcast_url(self):
         self.assertEqual(clean_podcast_url('https://www.podtrac.com/pts/redirect.mp3/chtbl.com/track/5899E/traffic.megaphone.fm/HSW7835899191.mp3'), 'https://traffic.megaphone.fm/HSW7835899191.mp3')
         self.assertEqual(clean_podcast_url('https://play.podtrac.com/npr-344098539/edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3'), 'https://edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3')
-        self.assertEqual(clean_podcast_url('https://pdst.fm/e/2.gum.fm/chtbl.com/track/chrt.fm/track/34D33/pscrb.fm/rss/p/traffic.megaphone.fm/ITLLC7765286967.mp3?updated=1687282661'), 'https://traffic.megaphone.fm/ITLLC7765286967.mp3?updated=1687282661')
-        self.assertEqual(clean_podcast_url('https://pdst.fm/e/https://mgln.ai/e/441/www.buzzsprout.com/1121972/13019085-ep-252-the-deep-life-stack.mp3'), 'https://www.buzzsprout.com/1121972/13019085-ep-252-the-deep-life-stack.mp3')
 
     def test_LazyList(self):
         it = list(range(10))
@@ -1997,8 +1862,6 @@ Line 1
             vcodecs=[None], acodecs=[None], vexts=['webm'], aexts=['m4a']), 'mkv')
         self.assertEqual(get_compatible_ext(
             vcodecs=[None], acodecs=[None], vexts=['webm'], aexts=['webm']), 'webm')
-        self.assertEqual(get_compatible_ext(
-            vcodecs=[None], acodecs=[None], vexts=['webm'], aexts=['weba']), 'webm')
 
         self.assertEqual(get_compatible_ext(
             vcodecs=['h264'], acodecs=['mp4a'], vexts=['mov'], aexts=['m4a']), 'mp4')
@@ -2010,406 +1873,6 @@ Line 1
         self.assertEqual(get_compatible_ext(
             vcodecs=['av1'], acodecs=['mp4a'], vexts=['webm'], aexts=['m4a'], preferences=('webm', 'mkv')), 'mkv')
 
-    def test_try_call(self):
-        def total(*x, **kwargs):
-            return sum(x) + sum(kwargs.values())
-
-        self.assertEqual(try_call(None), None,
-                         msg='not a fn should give None')
-        self.assertEqual(try_call(lambda: 1), 1,
-                         msg='int fn with no expected_type should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=int), 1,
-                         msg='int fn with expected_type int should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with wrong expected_type should give None')
-        self.assertEqual(try_call(total, args=(0, 1, 0, ), expected_type=int), 1,
-                         msg='fn should accept arglist')
-        self.assertEqual(try_call(total, kwargs={'a': 0, 'b': 1, 'c': 0}, expected_type=int), 1,
-                         msg='fn should accept kwargs')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with no expected_type should give None')
-        self.assertEqual(try_call(lambda x: {}, total, args=(42, ), expected_type=int), 42,
-                         msg='expect first int result with expected_type int')
-
-    def test_variadic(self):
-        self.assertEqual(variadic(None), (None, ))
-        self.assertEqual(variadic('spam'), ('spam', ))
-        self.assertEqual(variadic('spam', allowed_types=dict), 'spam')
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore')
-            self.assertEqual(variadic('spam', allowed_types=[dict]), 'spam')
-
-    def test_traverse_obj(self):
-        _TEST_DATA = {
-            100: 100,
-            1.2: 1.2,
-            'str': 'str',
-            'None': None,
-            '...': ...,
-            'urls': [
-                {'index': 0, 'url': 'https://www.example.com/0'},
-                {'index': 1, 'url': 'https://www.example.com/1'},
-            ],
-            'data': (
-                {'index': 2},
-                {'index': 3},
-            ),
-            'dict': {},
-        }
-
-        # Test base functionality
-        self.assertEqual(traverse_obj(_TEST_DATA, ('str',)), 'str',
-                         msg='allow tuple path')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['str']), 'str',
-                         msg='allow list path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (value for value in ("str",))), 'str',
-                         msg='allow iterable path')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str'), 'str',
-                         msg='single items should be treated as a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, None), _TEST_DATA)
-        self.assertEqual(traverse_obj(_TEST_DATA, 100), 100)
-        self.assertEqual(traverse_obj(_TEST_DATA, 1.2), 1.2)
-
-        # Test Ellipsis behavior
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ...),
-                              (item for item in _TEST_DATA.values() if item not in (None, {})),
-                              msg='`...` should give all non discarded values')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, ...)), _TEST_DATA['urls'][0].values(),
-                              msg='`...` selection for dicts should select all values')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., ..., 'url')),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='nested `...` queries should work')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, (..., ..., 'index')), range(4),
-                              msg='`...` query result should be flattened')
-        self.assertEqual(traverse_obj(iter(range(4)), ...), list(range(4)),
-                         msg='`...` should accept iterables')
-
-        # Test function as key
-        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
-                         [_TEST_DATA['urls']],
-                         msg='function as query key should perform a filter based on (key, value)')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), {'str'},
-                              msg='exceptions in the query function should be catched')
-        self.assertEqual(traverse_obj(iter(range(4)), lambda _, x: x % 2 == 0), [0, 2],
-                         msg='function key should accept iterables')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a: ...)
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a, b, c: ...)
-
-        # Test set as key (transformation/type, like `expected_type`)
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str.upper}, )), ['STR'],
-                         msg='Function in set should be a transformation')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str})), ['str'],
-                         msg='Type in set should be a type filter')
-        self.assertEqual(traverse_obj(_TEST_DATA, {dict}), _TEST_DATA,
-                         msg='A single set should be wrapped into a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str.upper})), ['STR'],
-                         msg='Transformation function should not raise')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., {str_or_none})),
-                         [item for item in map(str_or_none, _TEST_DATA.values()) if item is not None],
-                         msg='Function in set should be a transformation')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set())
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, {str.upper, str})
-
-        # Test `slice` as a key
-        _SLICE_DATA = [0, 1, 2, 3, 4]
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', slice(1))), None,
-                         msg='slice on a dictionary should not throw')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1)), _SLICE_DATA[:1],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 2)), _SLICE_DATA[1:2],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 4, 2)), _SLICE_DATA[1:4:2],
-                         msg='slice key should apply slice to sequence')
-
-        # Test alternative paths
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
-                         msg='multiple `paths` should be treated as alternative paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str', 100), 'str',
-                         msg='alternatives should exit early')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'fail'), None,
-                         msg='alternatives should return `default` if exhausted')
-        self.assertEqual(traverse_obj(_TEST_DATA, (..., 'fail'), 100), 100,
-                         msg='alternatives should track their own branching return')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', ...), ('data', ...)), list(_TEST_DATA['data']),
-                         msg='alternatives on empty objects should search further')
-
-        # Test branch and path nesting
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')), ['https://www.example.com/0'],
-                         msg='tuple as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')), ['https://www.example.com/0'],
-                         msg='list as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))), ['https://www.example.com/0'],
-                         msg='double nesting in path should be treated as paths')
-        self.assertEqual(traverse_obj(['0', [1, 2]], [(0, 1), 0]), [1],
-                         msg='do not fail early on branching')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', ((1, ('fail', 'url')), (0, 'url')))),
-                              ['https://www.example.com/0', 'https://www.example.com/1'],
-                              msg='tripple nesting in path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ('fail', (..., 'url')))),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='ellipsis as branch path start gets flattened')
-
-        # Test dictionary as key
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}), {0: 100, 1: 1.2},
-                         msg='dict key should result in a dict with the same keys')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}),
-                         {0: 'https://www.example.com/0'},
-                         msg='dict key should allow paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}),
-                         {0: ['https://www.example.com/0']},
-                         msg='tuple in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}),
-                         {0: ['https://www.example.com/0']},
-                         msg='double nesting in dict path should be treated as paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}),
-                         {0: ['https://www.example.com/1', 'https://www.example.com/0']},
-                         msg='tripple nesting in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}), {},
-                         msg='remove `None` values when top level dict key fails')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}, default=...), {0: ...},
-                         msg='use `default` if key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}), {},
-                         msg='remove empty values when dict key')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}, default=...), {0: ...},
-                         msg='use `default` when dict key and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}), {},
-                         msg='remove empty values when nested dict key fails')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}), {},
-                         msg='default to dict if pruned')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}, default=...), {0: ...},
-                         msg='default to dict if pruned and default is given')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=...), {0: {0: ...}},
-                         msg='use nested `default` when nested dict key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('dict', ...)}), {},
-                         msg='remove key if branch in dict key not successful')
-
-        # Testing default parameter behavior
-        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail'), None,
-                         msg='default value should be `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=...), ...,
-                         msg='chained fails should result in default')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', 'int'), 0,
-                         msg='should not short cirquit on `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', default=1), 1,
-                         msg='invalid dict key should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', default=1), 1,
-                         msg='`None` is a deliberate sentinel and should become `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', 10)), None,
-                         msg='`IndexError` should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=1), 1,
-                         msg='if branched but not successful return `default` if defined, not `[]`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail'), default=None), None,
-                         msg='if branched but not successful return `default` even if `default` is `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (..., 'fail')), [],
-                         msg='if branched but not successful return `[]`, not `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', ...)), [],
-                         msg='if branched but object is empty return `[]`, not `default`')
-        self.assertEqual(traverse_obj(None, ...), [],
-                         msg='if branched but object is `None` return `[]`, not `default`')
-        self.assertEqual(traverse_obj({0: None}, (0, ...)), [],
-                         msg='if branched but state is `None` return `[]`, not `default`')
-
-        branching_paths = [
-            ('fail', ...),
-            (..., 'fail'),
-            100 * ('fail',) + (...,),
-            (...,) + 100 * ('fail',),
-        ]
-        for branching_path in branching_paths:
-            self.assertEqual(traverse_obj({}, branching_path), [],
-                             msg='if branched but state is `None`, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({}, 'fail', branching_path), [],
-                             msg='if branching in last alternative and previous did not match, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({0: 'x'}, 0, branching_path), 'x',
-                             msg='if branching in last alternative and previous did match, return single value')
-            self.assertEqual(traverse_obj({0: 'x'}, branching_path, 0), 'x',
-                             msg='if branching in first alternative and non-branching path does match, return single value')
-            self.assertEqual(traverse_obj({}, branching_path, 'fail'), None,
-                             msg='if branching in first alternative and non-branching path does not match, return `default`')
-
-        # Testing expected_type behavior
-        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str),
-                         'str', msg='accept matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int),
-                         None, msg='reject non matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)),
-                         '0', msg='transform type using type function')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0),
-                         None, msg='wrap expected_type fuction in try_call')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, ..., expected_type=str),
-                         ['str'], msg='eliminate items that expected_type fails on')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int),
-                         {0: 100}, msg='type as expected_type should filter dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none),
-                         {0: '100', 1: '1.2'}, msg='function as expected_type should transform dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, ({0: 1.2}, 0, {int_or_none}), expected_type=int),
-                         1, msg='expected_type should not filter non final dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int),
-                         {0: {0: 100}}, msg='expected_type should transform deep dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(...)),
-                         [{0: ...}, {0: ...}], msg='expected_type should transform branched dict values')
-        self.assertEqual(traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int),
-                         [4], msg='expected_type regression for type matching in tuple branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['data', ...], expected_type=int),
-                         [], msg='expected_type regression for type matching in dict result')
-
-        # Test get_all behavior
-        _GET_ALL_DATA = {'key': [0, 1, 2]}
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ('key', ...), get_all=False), 0,
-                         msg='if not `get_all`, return only first matching value')
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ..., get_all=False), [0, 1, 2],
-                         msg='do not overflatten if not `get_all`')
-
-        # Test casesense behavior
-        _CASESENSE_DATA = {
-            'KeY': 'value0',
-            0: {
-                'KeY': 'value1',
-                0: {'KeY': 'value2'},
-            },
-        }
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'key'), None,
-                         msg='dict keys should be case sensitive unless `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'keY',
-                                      casesense=False), 'value0',
-                         msg='allow non matching key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ('keY',)),
-                                      casesense=False), ['value1'],
-                         msg='allow non matching key case in branch if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ((0, 'keY'),)),
-                                      casesense=False), ['value2'],
-                         msg='allow non matching key case in branch path if `casesense`')
-
-        # Test traverse_string behavior
-        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)), None,
-                         msg='do not traverse into string if not `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0),
-                                      traverse_string=True), 's',
-                         msg='traverse into string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1),
-                                      traverse_string=True), '.',
-                         msg='traverse into converted data if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', ...),
-                                      traverse_string=True), 'str',
-                         msg='`...` should result in string (same value) if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)),
-                                      traverse_string=True), 'sr',
-                         msg='`slice` should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == "s"),
-                                      traverse_string=True), 'str',
-                         msg='function should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
-                                      traverse_string=True), ['s', 'r'],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, ...), traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, lambda x, y: True), traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, slice(1)), traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-
-        # Test is_user_input behavior
-        _IS_USER_INPUT_DATA = {'range8': list(range(8))}
-        self.assertEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', '3'),
-                                      is_user_input=True), 3,
-                         msg='allow for string indexing if `is_user_input`')
-        self.assertCountEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', '3:'),
-                                           is_user_input=True), tuple(range(8))[3:],
-                              msg='allow for string slice if `is_user_input`')
-        self.assertCountEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', ':4:2'),
-                                           is_user_input=True), tuple(range(8))[:4:2],
-                              msg='allow step in string slice if `is_user_input`')
-        self.assertCountEqual(traverse_obj(_IS_USER_INPUT_DATA, ('range8', ':'),
-                                           is_user_input=True), range(8),
-                              msg='`:` should be treated as `...` if `is_user_input`')
-        with self.assertRaises(TypeError, msg='too many params should result in error'):
-            traverse_obj(_IS_USER_INPUT_DATA, ('range8', ':::'), is_user_input=True)
-
-        # Test re.Match as input obj
-        mobj = re.fullmatch(r'0(12)(?P<group>3)(4)?', '0123')
-        self.assertEqual(traverse_obj(mobj, ...), [x for x in mobj.groups() if x is not None],
-                         msg='`...` on a `re.Match` should give its `groups()`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 2)), ['0123', '3'],
-                         msg='function on a `re.Match` should give groupno, value starting at 0')
-        self.assertEqual(traverse_obj(mobj, 'group'), '3',
-                         msg='str key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 2), '3',
-                         msg='int key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 'gRoUp', casesense=False), '3',
-                         msg='str key on a `re.Match` should respect casesense')
-        self.assertEqual(traverse_obj(mobj, 'fail'), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 'gRoUpS', casesense=False), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 8), None,
-                         msg='failing int key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 'group')), ['0123', '3'],
-                         msg='function on a `re.Match` should give group name as well')
-
-    def test_http_header_dict(self):
-        headers = HTTPHeaderDict()
-        headers['ytdl-test'] = b'0'
-        self.assertEqual(list(headers.items()), [('Ytdl-Test', '0')])
-        headers['ytdl-test'] = 1
-        self.assertEqual(list(headers.items()), [('Ytdl-Test', '1')])
-        headers['Ytdl-test'] = '2'
-        self.assertEqual(list(headers.items()), [('Ytdl-Test', '2')])
-        self.assertTrue('ytDl-Test' in headers)
-        self.assertEqual(str(headers), str(dict(headers)))
-        self.assertEqual(repr(headers), str(dict(headers)))
-
-        headers.update({'X-dlp': 'data'})
-        self.assertEqual(set(headers.items()), {('Ytdl-Test', '2'), ('X-Dlp', 'data')})
-        self.assertEqual(dict(headers), {'Ytdl-Test': '2', 'X-Dlp': 'data'})
-        self.assertEqual(len(headers), 2)
-        self.assertEqual(headers.copy(), headers)
-        headers2 = HTTPHeaderDict({'X-dlp': 'data3'}, **headers, **{'X-dlp': 'data2'})
-        self.assertEqual(set(headers2.items()), {('Ytdl-Test', '2'), ('X-Dlp', 'data2')})
-        self.assertEqual(len(headers2), 2)
-        headers2.clear()
-        self.assertEqual(len(headers2), 0)
-
-        # ensure we prefer latter headers
-        headers3 = HTTPHeaderDict({'Ytdl-TeSt': 1}, {'Ytdl-test': 2})
-        self.assertEqual(set(headers3.items()), {('Ytdl-Test', '2')})
-        del headers3['ytdl-tesT']
-        self.assertEqual(dict(headers3), {})
-
-        headers4 = HTTPHeaderDict({'ytdl-test': 'data;'})
-        self.assertEqual(set(headers4.items()), {('Ytdl-Test', 'data;')})
-
-    def test_extract_basic_auth(self):
-        assert extract_basic_auth('http://:foo.bar') == ('http://:foo.bar', None)
-        assert extract_basic_auth('http://foo.bar') == ('http://foo.bar', None)
-        assert extract_basic_auth('http://@foo.bar') == ('http://foo.bar', 'Basic Og==')
-        assert extract_basic_auth('http://:pass@foo.bar') == ('http://foo.bar', 'Basic OnBhc3M=')
-        assert extract_basic_auth('http://user:@foo.bar') == ('http://foo.bar', 'Basic dXNlcjo=')
-        assert extract_basic_auth('http://user:pass@foo.bar') == ('http://foo.bar', 'Basic dXNlcjpwYXNz')
-
-    @unittest.skipUnless(compat_os_name == 'nt', 'Only relevant on Windows')
-    def test_Popen_windows_escaping(self):
-        def run_shell(args):
-            stdout, stderr, error = Popen.run(
-                args, text=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            assert not stderr
-            assert not error
-            return stdout
-
-        # Test escaping
-        assert run_shell(['echo', 'test"&']) == '"test""&"\n'
-        # Test if delayed expansion is disabled
-        assert run_shell(['echo', '^!']) == '"^!"\n'
-        assert run_shell('echo "^!"') == '"^!"\n'
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_youtube_lists.py

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

test/test_youtube_signature.py

@@ -62,19 +62,10 @@ _SIG_TESTS = [
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js',
         '312AA52209E3623129A412D56A40F11CB0AF14AE.3EE09501CB14E3BCDC3B2AE808BF3F1D14E7FBF12',
         '112AA5220913623229A412D56A40F11CB0AF14AE.3EE0950FCB14EEBCDC3B2AE808BF331D14E7FBF3',
-    ),
-    (
-        'https://www.youtube.com/s/player/6ed0d907/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'AOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL2QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
+    )
 ]
 
 _NSIG_TESTS = [
-    (
-        'https://www.youtube.com/s/player/7862ca1f/player_ias.vflset/en_US/base.js',
-        'X_LCxVDjAavgE5t', 'yxJ1dM6iz5ogUg',
-    ),
     (
         'https://www.youtube.com/s/player/9216d1f7/player_ias.vflset/en_US/base.js',
         'SLp9F5bwjAdhE9F-', 'gWnb9IK2DJ8Q1w',
@@ -119,50 +110,6 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/1f7d5369/player_ias.vflset/en_US/base.js',
         'batNX7sYqIJdkJ', 'IhOkL_zxbkOZBw',
     ),
-    (
-        'https://www.youtube.com/s/player/009f1d77/player_ias.vflset/en_US/base.js',
-        '5dwFHw8aFWQUQtffRq', 'audescmLUzI3jw',
-    ),
-    (
-        'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js',
-        'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg',
-    ),
-    (
-        'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
-        'M92UUMHa8PdvPd3wyM', '3hPqLJsiNZx7yA',
-    ),
-    (
-        'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
-        'B2j7f_UPT4rfje85Lu_e', 'm5DmNymaGQ5RdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/7a062b77/player_ias.vflset/en_US/base.js',
-        'NRcE3y3mVtm_cV-W', 'VbsCYUATvqlt5w',
-    ),
-    (
-        'https://www.youtube.com/s/player/dac945fd/player_ias.vflset/en_US/base.js',
-        'o8BkRxXhuYsBCWi6RplPdP', '3Lx32v_hmzTm6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/6f20102c/player_ias.vflset/en_US/base.js',
-        'lE8DhoDmKqnmJJ', 'pJTTX6XyJP2BYw',
-    ),
-    (
-        'https://www.youtube.com/s/player/cfa9e7cb/player_ias.vflset/en_US/base.js',
-        'aCi3iElgd2kq0bxVbQ', 'QX1y8jGb2IbZ0w',
-    ),
-    (
-        'https://www.youtube.com/s/player/8c7583ff/player_ias.vflset/en_US/base.js',
-        '1wWCVpRR96eAmMI87L', 'KSkWAVv1ZQxC3A',
-    ),
-    (
-        'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
-        '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
-    ),
 ]
 
 
@@ -239,7 +186,7 @@ def n_sig(jscode, sig_input):
 
 
 make_sig_test = t_factory(
-    'signature', signature, re.compile(r'.*(?:-|/player/)(?P<id>[a-zA-Z0-9_-]+)(?:/.+\.js|(?:/watch_as3|/html5player)?\.[a-z]+)$'))
+    'signature', signature, re.compile(r'.*-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$'))
 for test_spec in _SIG_TESTS:
     make_sig_test(*test_spec)
 

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

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

test/testdata/yt_dlp_plugins/extractor/_ignore.py

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

test/testdata/yt_dlp_plugins/extractor/ignore.py

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

test/testdata/yt_dlp_plugins/extractor/normal.py

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

test/testdata/yt_dlp_plugins/postprocessor/normal.py

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

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

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

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

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

test/versions.json

@@ -0,0 +1,34 @@
+{
+    "latest": "2013.01.06", 
+    "signature": "72158cdba391628569ffdbea259afbcf279bbe3d8aeb7492690735dc1cfa6afa754f55c61196f3871d429599ab22f2667f1fec98865527b32632e7f4b3675a7ef0f0fbe084d359256ae4bba68f0d33854e531a70754712f244be71d4b92e664302aa99653ee4df19800d955b6c4149cd2b3f24288d6e4b40b16126e01f4c8ce6", 
+    "versions": {
+        "2013.01.02": {
+            "bin": [
+                "http://youtube-dl.org/downloads/2013.01.02/youtube-dl", 
+                "f5b502f8aaa77675c4884938b1e4871ebca2611813a0c0e74f60c0fbd6dcca6b"
+            ], 
+            "exe": [
+                "http://youtube-dl.org/downloads/2013.01.02/youtube-dl.exe", 
+                "75fa89d2ce297d102ff27675aa9d92545bbc91013f52ec52868c069f4f9f0422"
+            ], 
+            "tar": [
+                "http://youtube-dl.org/downloads/2013.01.02/youtube-dl-2013.01.02.tar.gz", 
+                "6a66d022ac8e1c13da284036288a133ec8dba003b7bd3a5179d0c0daca8c8196"
+            ]
+        }, 
+        "2013.01.06": {
+            "bin": [
+                "http://youtube-dl.org/downloads/2013.01.06/youtube-dl", 
+                "64b6ed8865735c6302e836d4d832577321b4519aa02640dc508580c1ee824049"
+            ], 
+            "exe": [
+                "http://youtube-dl.org/downloads/2013.01.06/youtube-dl.exe", 
+                "58609baf91e4389d36e3ba586e21dab882daaaee537e4448b1265392ae86ff84"
+            ], 
+            "tar": [
+                "http://youtube-dl.org/downloads/2013.01.06/youtube-dl-2013.01.06.tar.gz", 
+                "fe77ab20a95d980ed17a659aa67e371fdd4d656d19c4c7950e7b720b0c2f1a86"
+            ]
+        }
+    }
+}

yt_dlp/__init__.py

@@ -1,8 +1,4 @@
-try:
-    import contextvars  # noqa: F401
-except Exception:
-    raise Exception(
-        f'You are using an unsupported version of Python. Only Python versions 3.7 and above are supported by yt-dlp')  # noqa: F541
+f'You are using an unsupported version of Python. Only Python versions 3.6 and above are supported by yt-dlp'  # noqa: F541
 
 __license__ = 'Public Domain'
 
@@ -13,18 +9,18 @@ import optparse
 import os
 import re
 import sys
-import traceback
 
 from .compat import compat_shlex_quote
 from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS
+from .downloader import FileDownloader
 from .downloader.external import get_external_downloader
 from .extractor import list_extractor_classes
 from .extractor.adobepass import MSO_INFO
+from .extractor.common import InfoExtractor
 from .options import parseOpts
 from .postprocessor import (
     FFmpegExtractAudioPP,
     FFmpegMergerPP,
-    FFmpegPostProcessor,
     FFmpegSubtitlesConvertorPP,
     FFmpegThumbnailsConvertorPP,
     FFmpegVideoConvertorPP,
@@ -39,7 +35,6 @@ from .utils import (
     DateRange,
     DownloadCancelled,
     DownloadError,
-    FormatSorter,
     GeoUtils,
     PlaylistEntries,
     SameFileError,
@@ -50,22 +45,19 @@ from .utils import (
     format_field,
     int_or_none,
     match_filter_func,
-    parse_bytes,
     parse_duration,
     preferredencoding,
     read_batch_urls,
     read_stdin,
     render_table,
     setproctitle,
+    std_headers,
     traverse_obj,
     variadic,
     write_string,
 )
-from .utils.networking import std_headers
 from .YoutubeDL import YoutubeDL
 
-_IN_CLI = False
-
 
 def _exit(status=0, *args):
     for msg in args:
@@ -92,11 +84,12 @@ def get_urls(urls, batchfile, verbose):
 
 
 def print_extractor_information(opts, urls):
+    # Importing GenericIE is currently slow since it imports other extractors
+    # TODO: Move this back to module level after generalization of embed detection
+    from .extractor.generic import GenericIE
+
     out = ''
     if opts.list_extractors:
-        # Importing GenericIE is currently slow since it imports YoutubeIE
-        from .extractor.generic import GenericIE
-
         urls = dict.fromkeys(urls, False)
         for ie in list_extractor_classes(opts.age_limit):
             out += ie.IE_NAME + (' (CURRENTLY BROKEN)' if not ie.working() else '') + '\n'
@@ -152,7 +145,7 @@ def set_compat_opts(opts):
         else:
             opts.embed_infojson = False
     if 'format-sort' in opts.compat_opts:
-        opts.format_sort.extend(FormatSorter.ytdl_default)
+        opts.format_sort.extend(InfoExtractor.FormatSort.ytdl_default)
     _video_multistreams_set = set_default_compat('multistreams', 'allow_multiple_video_streams', False, remove_compat=False)
     _audio_multistreams_set = set_default_compat('multistreams', 'allow_multiple_audio_streams', False, remove_compat=False)
     if _video_multistreams_set is False and _audio_multistreams_set is False:
@@ -188,8 +181,8 @@ def validate_options(opts):
         raise ValueError(f'{max_name} "{max_val}" must be must be greater than or equal to {min_name} "{min_val}"')
 
     # Usernames and passwords
-    validate(sum(map(bool, (opts.usenetrc, opts.netrc_cmd, opts.username))) <= 1, '.netrc',
-             msg='{name}, netrc command and username/password are mutually exclusive options')
+    validate(not opts.usenetrc or (opts.username is None and opts.password is None),
+             '.netrc', msg='using {name} conflicts with giving username/password')
     validate(opts.password is None or opts.username is not None, 'account username', msg='{name} missing')
     validate(opts.ap_password is None or opts.ap_username is not None,
              'TV Provider account username', msg='{name} missing')
@@ -227,7 +220,7 @@ def validate_options(opts):
 
     # Format sort
     for f in opts.format_sort:
-        validate_regex('format sorting', f, FormatSorter.regex)
+        validate_regex('format sorting', f, InfoExtractor.FormatSort.regex)
 
     # Postprocessor formats
     validate_regex('merge output format', opts.merge_output_format,
@@ -281,19 +274,19 @@ def validate_options(opts):
             raise ValueError(f'invalid {key} retry sleep expression {expr!r}')
 
     # Bytes
-    def validate_bytes(name, value):
+    def parse_bytes(name, value):
         if value is None:
             return None
-        numeric_limit = parse_bytes(value)
+        numeric_limit = FileDownloader.parse_bytes(value)
         validate(numeric_limit is not None, 'rate limit', value)
         return numeric_limit
 
-    opts.ratelimit = validate_bytes('rate limit', opts.ratelimit)
-    opts.throttledratelimit = validate_bytes('throttled rate limit', opts.throttledratelimit)
-    opts.min_filesize = validate_bytes('min filesize', opts.min_filesize)
-    opts.max_filesize = validate_bytes('max filesize', opts.max_filesize)
-    opts.buffersize = validate_bytes('buffer size', opts.buffersize)
-    opts.http_chunk_size = validate_bytes('http chunk size', opts.http_chunk_size)
+    opts.ratelimit = parse_bytes('rate limit', opts.ratelimit)
+    opts.throttledratelimit = parse_bytes('throttled rate limit', opts.throttledratelimit)
+    opts.min_filesize = parse_bytes('min filesize', opts.min_filesize)
+    opts.max_filesize = parse_bytes('max filesize', opts.max_filesize)
+    opts.buffersize = parse_bytes('buffer size', opts.buffersize)
+    opts.http_chunk_size = parse_bytes('http chunk size', opts.http_chunk_size)
 
     # Output templates
     def validate_outtmpl(tmpl, msg):
@@ -319,63 +312,37 @@ def validate_options(opts):
     if outtmpl_default == '':
         opts.skip_download = None
         del opts.outtmpl['default']
+    if outtmpl_default and not os.path.splitext(outtmpl_default)[1] and opts.extractaudio:
+        raise ValueError(
+            'Cannot download a video and extract audio into the same file! '
+            f'Use "{outtmpl_default}.%(ext)s" instead of "{outtmpl_default}" as the output template')
 
-    def parse_chapters(name, value, advanced=False):
-        parse_timestamp = lambda x: float('inf') if x in ('inf', 'infinite') else parse_duration(x)
-        TIMESTAMP_RE = r'''(?x)(?:
-            (?P<start_sign>-?)(?P<start>[^-]+)
-        )?\s*-\s*(?:
-            (?P<end_sign>-?)(?P<end>[^-]+)
-        )?'''
-
-        chapters, ranges, from_url = [], [], False
+    def parse_chapters(name, value):
+        chapters, ranges = [], []
         for regex in value or []:
-            if advanced and regex == '*from-url':
-                from_url = True
-                continue
-            elif not regex.startswith('*'):
-                try:
-                    chapters.append(re.compile(regex))
-                except re.error as err:
-                    raise ValueError(f'invalid {name} regex "{regex}" - {err}')
+            if regex.startswith('*'):
+                for range in regex[1:].split(','):
+                    dur = tuple(map(parse_duration, range.strip().split('-')))
+                    if len(dur) == 2 and all(t is not None for t in dur):
+                        ranges.append(dur)
+                    else:
+                        raise ValueError(f'invalid {name} time range "{regex}". Must be of the form *start-end')
                 continue
+            try:
+                chapters.append(re.compile(regex))
+            except re.error as err:
+                raise ValueError(f'invalid {name} regex "{regex}" - {err}')
+        return chapters, ranges
 
-            for range_ in map(str.strip, regex[1:].split(',')):
-                mobj = range_ != '-' and re.fullmatch(TIMESTAMP_RE, range_)
-                dur = mobj and [parse_timestamp(mobj.group('start') or '0'), parse_timestamp(mobj.group('end') or 'inf')]
-                signs = mobj and (mobj.group('start_sign'), mobj.group('end_sign'))
-
-                err = None
-                if None in (dur or [None]):
-                    err = 'Must be of the form "*start-end"'
-                elif not advanced and any(signs):
-                    err = 'Negative timestamps are not allowed'
-                else:
-                    dur[0] *= -1 if signs[0] else 1
-                    dur[1] *= -1 if signs[1] else 1
-                    if dur[1] == float('-inf'):
-                        err = '"-inf" is not a valid end'
-                if err:
-                    raise ValueError(f'invalid {name} time range "{regex}". {err}')
-                ranges.append(dur)
-
-        return chapters, ranges, from_url
-
-    opts.remove_chapters, opts.remove_ranges, _ = parse_chapters('--remove-chapters', opts.remove_chapters)
-    opts.download_ranges = download_range_func(*parse_chapters('--download-sections', opts.download_ranges, True))
+    opts.remove_chapters, opts.remove_ranges = parse_chapters('--remove-chapters', opts.remove_chapters)
+    opts.download_ranges = download_range_func(*parse_chapters('--download-sections', opts.download_ranges))
 
     # Cookies from browser
     if opts.cookiesfrombrowser:
-        container = None
-        mobj = re.fullmatch(r'''(?x)
-            (?P<name>[^+:]+)
-            (?:\s*\+\s*(?P<keyring>[^:]+))?
-            (?:\s*:\s*(?!:)(?P<profile>.+?))?
-            (?:\s*::\s*(?P<container>.+))?
-        ''', opts.cookiesfrombrowser)
+        mobj = re.match(r'(?P<name>[^+:]+)(\s*\+\s*(?P<keyring>[^:]+))?(\s*:(?P<profile>.+))?', opts.cookiesfrombrowser)
         if mobj is None:
             raise ValueError(f'invalid cookies from browser arguments: {opts.cookiesfrombrowser}')
-        browser_name, keyring, profile, container = mobj.group('name', 'keyring', 'profile', 'container')
+        browser_name, keyring, profile = mobj.group('name', 'keyring', 'profile')
         browser_name = browser_name.lower()
         if browser_name not in SUPPORTED_BROWSERS:
             raise ValueError(f'unsupported browser specified for cookies: "{browser_name}". '
@@ -385,7 +352,7 @@ def validate_options(opts):
             if keyring not in SUPPORTED_KEYRINGS:
                 raise ValueError(f'unsupported keyring specified for cookies: "{keyring}". '
                                  f'Supported keyrings are: {", ".join(sorted(SUPPORTED_KEYRINGS))}')
-        opts.cookiesfrombrowser = (browser_name, profile, keyring, container)
+        opts.cookiesfrombrowser = (browser_name, profile, keyring)
 
     # MetadataParser
     def metadataparser_actions(f):
@@ -406,12 +373,10 @@ def validate_options(opts):
                 raise ValueError(f'{cmd} is invalid; {err}')
             yield action
 
+    parse_metadata = opts.parse_metadata or []
     if opts.metafromtitle is not None:
-        opts.parse_metadata.setdefault('pre_process', []).append('title:%s' % opts.metafromtitle)
-    opts.parse_metadata = {
-        k: list(itertools.chain(*map(metadataparser_actions, v)))
-        for k, v in opts.parse_metadata.items()
-    }
+        parse_metadata.append('title:%s' % opts.metafromtitle)
+    opts.parse_metadata = list(itertools.chain(*map(metadataparser_actions, parse_metadata)))
 
     # Other options
     if opts.playlist_items is not None:
@@ -420,26 +385,18 @@ def validate_options(opts):
         except Exception as err:
             raise ValueError(f'Invalid playlist-items {opts.playlist_items!r}: {err}')
 
-    opts.geo_bypass_country, opts.geo_bypass_ip_block = None, None
-    if opts.geo_bypass.lower() not in ('default', 'never'):
+    geo_bypass_code = opts.geo_bypass_ip_block or opts.geo_bypass_country
+    if geo_bypass_code is not None:
         try:
-            GeoUtils.random_ipv4(opts.geo_bypass)
+            GeoUtils.random_ipv4(geo_bypass_code)
         except Exception:
-            raise ValueError(f'Unsupported --xff "{opts.geo_bypass}"')
-        if len(opts.geo_bypass) == 2:
-            opts.geo_bypass_country = opts.geo_bypass
-        else:
-            opts.geo_bypass_ip_block = opts.geo_bypass
-    opts.geo_bypass = opts.geo_bypass.lower() != 'never'
+            raise ValueError('unsupported geo-bypass country or ip-block')
 
-    opts.match_filter = match_filter_func(opts.match_filter, opts.breaking_match_filter)
+    opts.match_filter = match_filter_func(opts.match_filter)
 
     if opts.download_archive is not None:
         opts.download_archive = expand_path(opts.download_archive)
 
-    if opts.ffmpeg_location is not None:
-        opts.ffmpeg_location = expand_path(opts.ffmpeg_location)
-
     if opts.user_agent is not None:
         opts.headers.setdefault('User-Agent', opts.user_agent)
     if opts.referer is not None:
@@ -459,10 +416,6 @@ def validate_options(opts):
         elif ed and proto == 'default':
             default_downloader = ed.get_basename()
 
-    for policy in opts.color.values():
-        if policy not in ('always', 'auto', 'no_color', 'never'):
-            raise ValueError(f'"{policy}" is not a valid color policy')
-
     warnings, deprecation_warnings = [], []
 
     # Common mistake: -f best
@@ -519,7 +472,7 @@ def validate_options(opts):
                     val1=opts.sponskrub and opts.sponskrub_cut)
 
     # Conflicts with --allow-unplayable-formats
-    report_conflict('--embed-metadata', 'addmetadata')
+    report_conflict('--add-metadata', 'addmetadata')
     report_conflict('--embed-chapters', 'addchapters')
     report_conflict('--embed-info-json', 'embed_infojson')
     report_conflict('--embed-subs', 'embedsubtitles')
@@ -592,11 +545,11 @@ def validate_options(opts):
 def get_postprocessors(opts):
     yield from opts.add_postprocessors
 
-    for when, actions in opts.parse_metadata.items():
+    if opts.parse_metadata:
         yield {
             'key': 'MetadataParser',
-            'actions': actions,
-            'when': when
+            'actions': opts.parse_metadata,
+            'when': 'pre_process'
         }
     sponsorblock_query = opts.sponsorblock_mark | opts.sponsorblock_remove
     if sponsorblock_query:
@@ -732,13 +685,11 @@ def parse_options(argv=None):
 
     postprocessors = list(get_postprocessors(opts))
 
-    print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[3:])
+    print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[2:])
     any_getting = any(getattr(opts, k) for k in (
         'dumpjson', 'dump_single_json', 'getdescription', 'getduration', 'getfilename',
         'getformat', 'getid', 'getthumbnail', 'gettitle', 'geturl'
     ))
-    if opts.quiet is None:
-        opts.quiet = any_getting or opts.print_json or bool(opts.forceprint)
 
     playlist_pps = [pp for pp in postprocessors if pp.get('when') == 'playlist']
     write_playlist_infojson = (opts.writeinfojson and not opts.clean_infojson
@@ -764,7 +715,6 @@ def parse_options(argv=None):
     return ParsedOptions(parser, opts, urls, {
         'usenetrc': opts.usenetrc,
         'netrc_location': opts.netrc_location,
-        'netrc_cmd': opts.netrc_cmd,
         'username': opts.username,
         'password': opts.password,
         'twofactor': opts.twofactor,
@@ -775,7 +725,7 @@ def parse_options(argv=None):
         'client_certificate': opts.client_certificate,
         'client_certificate_key': opts.client_certificate_key,
         'client_certificate_password': opts.client_certificate_password,
-        'quiet': opts.quiet,
+        'quiet': opts.quiet or any_getting or opts.print_json or bool(opts.forceprint),
         'no_warnings': opts.no_warnings,
         'forceurl': opts.geturl,
         'forcetitle': opts.gettitle,
@@ -811,7 +761,6 @@ def parse_options(argv=None):
         'windowsfilenames': opts.windowsfilenames,
         'ignoreerrors': opts.ignoreerrors,
         'force_generic_extractor': opts.force_generic_extractor,
-        'allowed_extractors': opts.allowed_extractors or ['default'],
         'ratelimit': opts.ratelimit,
         'throttledratelimit': opts.throttledratelimit,
         'overwrites': opts.overwrites,
@@ -887,7 +836,6 @@ def parse_options(argv=None):
         'legacyserverconnect': opts.legacy_server_connect,
         'nocheckcertificate': opts.no_check_certificate,
         'prefer_insecure': opts.prefer_insecure,
-        'enable_file_urls': opts.enable_file_urls,
         'http_headers': opts.headers,
         'proxy': opts.proxy,
         'socket_timeout': opts.socket_timeout,
@@ -922,7 +870,7 @@ def parse_options(argv=None):
         'playlist_items': opts.playlist_items,
         'xattr_set_filesize': opts.xattr_set_filesize,
         'match_filter': opts.match_filter,
-        'color': opts.color,
+        'no_color': opts.no_color,
         'ffmpeg_location': opts.ffmpeg_location,
         'hls_prefer_native': opts.hls_prefer_native,
         'hls_use_mpegts': opts.hls_use_mpegts,
@@ -954,11 +902,6 @@ def _real_main(argv=None):
     if print_extractor_information(opts, all_urls):
         return
 
-    # We may need ffmpeg_location without having access to the YoutubeDL instance
-    # See https://github.com/yt-dlp/yt-dlp/issues/2191
-    if opts.ffmpeg_location:
-        FFmpegPostProcessor._ffmpeg_location.set(opts.ffmpeg_location)
-
     with YoutubeDL(ydl_opts) as ydl:
         pre_process = opts.update_self or opts.rm_cachedir
         actual_use = all_urls or opts.load_info_filename
@@ -966,18 +909,14 @@ def _real_main(argv=None):
         if opts.rm_cachedir:
             ydl.cache.remove()
 
-        try:
-            updater = Updater(ydl, opts.update_self)
-            if opts.update_self and updater.update() and actual_use:
-                if updater.cmd:
-                    return updater.restart()
-                # This code is reachable only for zip variant in py < 3.10
-                # It makes sense to exit here, but the old behavior is to continue
-                ydl.report_warning('Restart yt-dlp to use the updated version')
-                # return 100, 'ERROR: The program must exit for the update to complete'
-        except Exception:
-            traceback.print_exc()
-            ydl._download_retcode = 100
+        updater = Updater(ydl)
+        if opts.update_self and updater.update() and actual_use:
+            if updater.cmd:
+                return updater.restart()
+            # This code is reachable only for zip variant in py < 3.10
+            # It makes sense to exit here, but the old behavior is to continue
+            ydl.report_warning('Restart yt-dlp to use the updated version')
+            # return 100, 'ERROR: The program must exit for the update to complete'
 
         if not actual_use:
             if pre_process:
@@ -991,8 +930,6 @@ def _real_main(argv=None):
         parser.destroy()
         try:
             if opts.load_info_filename is not None:
-                if all_urls:
-                    ydl.report_warning('URLs are ignored due to --load-info-json')
                 return ydl.download_with_info_file(expand_path(opts.load_info_filename))
             else:
                 return ydl.download(all_urls)
@@ -1002,8 +939,6 @@ def _real_main(argv=None):
 
 
 def main(argv=None):
-    global _IN_CLI
-    _IN_CLI = True
     try:
         _exit(*variadic(_real_main(argv)))
     except DownloadError:

yt_dlp/__main__.py

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

yt_dlp/__pyinstaller/__init__.py

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

yt_dlp/__pyinstaller/hook-yt_dlp.py

@@ -1,34 +0,0 @@
-import sys
-
-from PyInstaller.utils.hooks import collect_submodules
-
-
-def pycryptodome_module():
-    try:
-        import Cryptodome  # noqa: F401
-    except ImportError:
-        try:
-            import Crypto  # noqa: F401
-            print('WARNING: Using Crypto since Cryptodome is not available. '
-                  'Install with: pip install pycryptodomex', file=sys.stderr)
-            return 'Crypto'
-        except ImportError:
-            pass
-    return 'Cryptodome'
-
-
-def get_hidden_imports():
-    yield from ('yt_dlp.compat._legacy', 'yt_dlp.compat._deprecated')
-    yield from ('yt_dlp.utils._legacy', 'yt_dlp.utils._deprecated')
-    yield pycryptodome_module()
-    # Only `websockets` is required, others are collected just in case
-    for module in ('websockets', 'requests', 'urllib3'):
-        yield from collect_submodules(module)
-    # These are auto-detected, but explicitly add them just in case
-    yield from ('mutagen', 'brotli', 'certifi', 'secretstorage')
-
-
-hiddenimports = list(get_hidden_imports())
-print(f'Adding imports: {hiddenimports}')
-
-excludedimports = ['youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts']

yt_dlp/aes.py

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

yt_dlp/cache.py

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

yt_dlp/casefold.py

@@ -1,5 +0,0 @@
-import warnings
-
-warnings.warn(DeprecationWarning(f'{__name__} is deprecated'))
-
-casefold = str.casefold

yt_dlp/compat/__init__.py

@@ -1,17 +1,21 @@
 import os
 import sys
+import warnings
 import xml.etree.ElementTree as etree
 
+from . import re
+from ._deprecated import *  # noqa: F401, F403
 from .compat_utils import passthrough_module
 
-passthrough_module(__name__, '._deprecated')
-del passthrough_module
+# XXX: Implement this the same way as other DeprecationWarnings without circular import
+passthrough_module(__name__, '._legacy', callback=lambda attr: warnings.warn(
+    DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=3))
 
 
 # HTMLParseError has been deprecated in Python 3.3 and removed in
 # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
 # and uniform cross-version exception handling
-class compat_HTMLParseError(ValueError):
+class compat_HTMLParseError(Exception):
     pass
 
 
@@ -29,8 +33,7 @@ compat_os_name = os._name if os.name == 'java' else os.name
 
 if compat_os_name == 'nt':
     def compat_shlex_quote(s):
-        import re
-        return s if re.match(r'^[-_\w./]+$', s) else s.replace('"', '""').join('""')
+        return s if re.match(r'^[-_\w./]+$', s) else '"%s"' % s.replace('"', '\\"')
 else:
     from shlex import quote as compat_shlex_quote  # noqa: F401
 
@@ -69,11 +72,7 @@ else:
     compat_expanduser = os.path.expanduser
 
 
-def urllib_req_to_req(urllib_request):
-    """Convert urllib Request to a networking Request"""
-    from ..networking import Request
-    from ..utils.networking import HTTPHeaderDict
-    return Request(
-        urllib_request.get_full_url(), data=urllib_request.data, method=urllib_request.get_method(),
-        headers=HTTPHeaderDict(urllib_request.headers, urllib_request.unredirected_hdrs),
-        extensions={'timeout': urllib_request.timeout} if hasattr(urllib_request, 'timeout') else None)
+# NB: Add modules that are imported dynamically here so that PyInstaller can find them
+# See https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/438
+if False:
+    from . import _legacy  # noqa: F401

yt_dlp/compat/_deprecated.py

@@ -1,12 +1,4 @@
 """Deprecated - New code should avoid these"""
-import warnings
-
-from .compat_utils import passthrough_module
-
-# XXX: Implement this the same way as other DeprecationWarnings without circular import
-passthrough_module(__name__, '.._legacy', callback=lambda attr: warnings.warn(
-    DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=6))
-del passthrough_module
 
 import base64
 import urllib.error
@@ -16,6 +8,7 @@ compat_str = str
 
 compat_b64decode = base64.b64decode
 
+compat_HTTPError = urllib.error.HTTPError
 compat_urlparse = urllib.parse
 compat_parse_qs = urllib.parse.parse_qs
 compat_urllib_parse_unquote = urllib.parse.unquote

yt_dlp/compat/_legacy.py

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

yt_dlp/compat/asyncio.py

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

yt_dlp/compat/compat_utils.py

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

yt_dlp/compat/re.py

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

yt_dlp/compat/shutil.py

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

yt_dlp/compat/types.py

@@ -1,13 +0,0 @@
-# flake8: noqa: F405
-from types import *  # noqa: F403
-
-from .compat_utils import passthrough_module
-
-passthrough_module(__name__, 'types')
-del passthrough_module
-
-try:
-    # NB: pypy has builtin NoneType, so checking NameError won't work
-    from types import NoneType  # >= 3.10
-except ImportError:
-    NoneType = type(None)

yt_dlp/compat/urllib/__init__.py

@@ -1,10 +0,0 @@
-# flake8: noqa: F405
-from urllib import *  # noqa: F403
-
-del request  # noqa: F821
-from . import request  # noqa: F401
-
-from ..compat_utils import passthrough_module
-
-passthrough_module(__name__, 'urllib')
-del passthrough_module

yt_dlp/compat/urllib/request.py

@@ -1,40 +0,0 @@
-# flake8: noqa: F405
-from urllib.request import *  # noqa: F403
-
-from ..compat_utils import passthrough_module
-
-passthrough_module(__name__, 'urllib.request')
-del passthrough_module
-
-
-from .. import compat_os_name
-
-if compat_os_name == 'nt':
-    # On older python versions, proxies are extracted from Windows registry erroneously. [1]
-    # If the https proxy in the registry does not have a scheme, urllib will incorrectly add https:// to it. [2]
-    # It is unlikely that the user has actually set it to be https, so we should be fine to safely downgrade
-    # it to http on these older python versions to avoid issues
-    # This also applies for ftp proxy type, as ftp:// proxy scheme is not supported.
-    # 1: https://github.com/python/cpython/issues/86793
-    # 2: https://github.com/python/cpython/blob/51f1ae5ceb0673316c4e4b0175384e892e33cc6e/Lib/urllib/request.py#L2683-L2698
-    import sys
-    from urllib.request import getproxies_environment, getproxies_registry
-
-    def getproxies_registry_patched():
-        proxies = getproxies_registry()
-        if (
-            sys.version_info >= (3, 10, 5)  # https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-5-final
-            or (3, 9, 13) <= sys.version_info < (3, 10)  # https://docs.python.org/3.9/whatsnew/changelog.html#python-3-9-13-final
-        ):
-            return proxies
-
-        for scheme in ('https', 'ftp'):
-            if scheme in proxies and proxies[scheme].startswith(f'{scheme}://'):
-                proxies[scheme] = 'http' + proxies[scheme][len(scheme):]
-
-        return proxies
-
-    def getproxies():
-        return getproxies_environment() or getproxies_registry_patched()
-
-del compat_os_name