[version] update

Created by: pukkandan :ci skip all :ci run dl
Release 2022.10.04
2026-08-10 22:28:37 +03:00 · 2022-10-04 04:50:32 +00:00 · 2022-10-04 10:17:45 +05:30 · 2022-10-04 09:53:11 +05:30 · 2022-10-04 09:49:51 +05:30 · 2022-10-04 09:44:57 +05:30
333 changed files with 13054 additions and 7384 deletions
@@ -2,6 +2,13 @@ name: Broken site
 description: Report broken or misfunctioning site
 labels: [triage, site-bug]
 body:
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
          required: true
  - type: checkboxes
    id: checklist
    attributes:
@@ -11,11 +18,11 @@ body:
      options:
        - label: I'm reporting a broken site
          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.07.18** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.10.04** ([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/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)
+        - 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)
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -55,7 +62,7 @@ body:
        [debug] Command-line config: ['-vU', 'test:youtube']
        [debug] Portable config "yt-dlp.conf": ['-i']
        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.07.18 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.10.04 [9d339c4] (win32_exe)
        [debug] Python 3.8.10 (CPython 64bit) - Windows-10-10.0.22000-SP0
        [debug] Checking exe version: ffmpeg -bsfs
        [debug] Checking exe version: ffprobe -bsfs
@@ -63,8 +70,8 @@ body:
        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
        [debug] Proxy map: {}
        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.07.18, Current version: 2022.07.18
+        Latest version: 2022.10.04, Current version: 2022.10.04
-        yt-dlp is up to date (2022.07.18)
+        yt-dlp is up to date (2022.10.04)
        <more lines>
      render: shell
    validations:
@@ -2,6 +2,13 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
          required: true
  - type: checkboxes
    id: checklist
    attributes:
@@ -11,11 +18,11 @@ body:
      options:
        - label: I'm reporting a new site support request
          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.07.18** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.10.04** ([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/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
+        - 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
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -67,7 +74,7 @@ body:
        [debug] Command-line config: ['-vU', 'test:youtube']
        [debug] Portable config "yt-dlp.conf": ['-i']
        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.07.18 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.10.04 [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
@@ -75,8 +82,8 @@ body:
        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
        [debug] Proxy map: {}
        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.07.18, Current version: 2022.07.18
+        Latest version: 2022.10.04, Current version: 2022.10.04
-        yt-dlp is up to date (2022.07.18)
+        yt-dlp is up to date (2022.10.04)
        <more lines>
      render: shell
    validations:
@@ -2,6 +2,13 @@ name: Site feature request
 description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
          required: true
  - type: checkboxes
    id: checklist
    attributes:
@@ -11,7 +18,7 @@ body:
      options:
        - label: I'm requesting a site-specific feature
          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.07.18** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.10.04** ([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
@@ -63,7 +70,7 @@ body:
        [debug] Command-line config: ['-vU', 'test:youtube']
        [debug] Portable config "yt-dlp.conf": ['-i']
        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.07.18 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.10.04 [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
@@ -71,8 +78,8 @@ body:
        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
        [debug] Proxy map: {}
        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.07.18, Current version: 2022.07.18
+        Latest version: 2022.10.04, Current version: 2022.10.04
-        yt-dlp is up to date (2022.07.18)
+        yt-dlp is up to date (2022.10.04)
        <more lines>
      render: shell
    validations:
@@ -2,6 +2,13 @@ name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
          required: true
  - type: checkboxes
    id: checklist
    attributes:
@@ -11,11 +18,11 @@ body:
      options:
        - label: I'm reporting a bug unrelated to a specific site
          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.07.18** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.10.04** ([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/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)
+        - 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)
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -29,7 +36,7 @@ body:
      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
    validations:
      required: true
-    - type: checkboxes
+  - type: checkboxes
    id: verbose
    attributes:
      label: Provide verbose output that clearly demonstrates the problem
@@ -48,7 +55,7 @@ body:
        [debug] Command-line config: ['-vU', 'test:youtube']
        [debug] Portable config "yt-dlp.conf": ['-i']
        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.07.18 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.10.04 [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
@@ -56,8 +63,8 @@ body:
        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
        [debug] Proxy map: {}
        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.07.18, Current version: 2022.07.18
+        Latest version: 2022.10.04, Current version: 2022.10.04
-        yt-dlp is up to date (2022.07.18)
+        yt-dlp is up to date (2022.10.04)
        <more lines>
      render: shell
    validations:
@@ -2,6 +2,13 @@ name: Feature request
 description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
          required: true
  - type: checkboxes
    id: checklist
    attributes:
@@ -13,7 +20,7 @@ body:
          required: true
        - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.07.18** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.10.04** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -44,7 +51,7 @@ body:
        [debug] Command-line config: ['-vU', 'test:youtube']
        [debug] Portable config "yt-dlp.conf": ['-i']
        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.07.18 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.10.04 [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
@@ -52,7 +59,7 @@ body:
        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
        [debug] Proxy map: {}
        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.07.18, Current version: 2022.07.18
+        Latest version: 2022.10.04, Current version: 2022.10.04
-        yt-dlp is up to date (2022.07.18)
+        yt-dlp is up to date (2022.10.04)
        <more lines>
      render: shell
@@ -2,12 +2,19 @@ name: Ask question
 description: Ask yt-dlp related question
 labels: [question]
 body:
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\* field
          required: true
  - type: markdown
    attributes:
      value: |
        ### Make sure you are **only** asking a question and not reporting a bug or requesting a feature.
        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt whether this is the right template, **use another template**!
+        If you are in doubt whether this is the right template, **USE ANOTHER TEMPLATE**!
  - type: checkboxes
    id: checklist
    attributes:
@@ -19,7 +26,7 @@ body:
          required: true
        - label: I've looked through the [README](https://github.com/yt-dlp/yt-dlp#readme)
          required: true
-        - label: I've verified that I'm running yt-dlp version **2022.07.18** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
+        - label: I've verified that I'm running yt-dlp version **2022.10.04** ([update instructions](https://github.com/yt-dlp/yt-dlp#update)) or later (specify commit)
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
          required: true
@@ -50,7 +57,7 @@ body:
        [debug] Command-line config: ['-vU', 'test:youtube']
        [debug] Portable config "yt-dlp.conf": ['-i']
        [debug] Encodings: locale cp65001, fs utf-8, pref cp65001, out utf-8, error utf-8, screen utf-8
-        [debug] yt-dlp version 2022.07.18 [9d339c4] (win32_exe)
+        [debug] yt-dlp version 2022.10.04 [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
@@ -58,7 +65,7 @@ body:
        [debug] Optional libraries: Cryptodome-3.15.0, brotli-1.0.9, certifi-2022.06.15, mutagen-1.45.1, sqlite3-2.6.0, websockets-10.3
        [debug] Proxy map: {}
        [debug] Fetching release info: https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest
-        Latest version: 2022.07.18, Current version: 2022.07.18
+        Latest version: 2022.10.04, Current version: 2022.10.04
-        yt-dlp is up to date (2022.07.18)
+        yt-dlp is up to date (2022.10.04)
        <more lines>
      render: shell
@@ -2,6 +2,7 @@ name: Broken site
 description: Report broken or misfunctioning site
 labels: [triage, site-bug]
 body:
  %(no_skip)s
  - type: checkboxes
    id: checklist
    attributes:
@@ -15,7 +16,7 @@ body:
          required: true
        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
          required: true
-        - label: I've 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)
+        - 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)
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -2,6 +2,7 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
  %(no_skip)s
  - type: checkboxes
    id: checklist
    attributes:
@@ -15,7 +16,7 @@ body:
          required: true
        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
          required: true
-        - label: I've 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
+        - 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
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -2,6 +2,7 @@ name: Site feature request
 description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
  %(no_skip)s
  - type: checkboxes
    id: checklist
    attributes:
@@ -2,6 +2,7 @@ name: Bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
  %(no_skip)s
  - type: checkboxes
    id: checklist
    attributes:
@@ -15,7 +16,7 @@ body:
          required: true
        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
          required: true
-        - label: I've 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)
+        - 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)
          required: true
        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
          required: true
@@ -29,4 +30,4 @@ body:
      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
    validations:
      required: true
-    %(verbose)s
+  %(verbose)s
@@ -2,6 +2,7 @@ name: Feature request
 description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
  %(no_skip)s
  - type: checkboxes
    id: checklist
    attributes:
@@ -2,12 +2,13 @@ name: Ask question
 description: Ask yt-dlp related question
 labels: [question]
 body:
  %(no_skip)s
  - type: markdown
    attributes:
      value: |
        ### Make sure you are **only** asking a question and not reporting a bug or requesting a feature.
        If your question contains "isn't working" or "can you add", this is most likely the wrong template.
-        If you are in doubt whether this is the right template, **use another template**!
+        If you are in doubt whether this is the right template, **USE ANOTHER TEMPLATE**!
  - type: checkboxes
    id: checklist
    attributes:
@@ -1,3 +1,20 @@
 **IMPORTANT**: PRs without the template will be CLOSED
 ### 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
 -->
 ADD DESCRIPTION HERE
 Fixes #
 <details open><summary>Template</summary> <!-- OPEN is intentional -->
 <!--
@@ -24,17 +41,3 @@
 - [ ] 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))
 ### 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
 -->
 DESCRIPTION
 Fixes #
@@ -2,18 +2,17 @@ name: Build
 on: workflow_dispatch
 jobs:
-  create_release:
+  prepare:
    runs-on: ubuntu-latest
    outputs:
      version_suffix: ${{ steps.version_suffix.outputs.version_suffix }}
      ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }}
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      head_sha: ${{ steps.push_release.outputs.head_sha }}
      release_id: ${{ steps.create_release.outputs.id }}
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        fetch-depth: 0
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
      with:
          python-version: '3.10'
@@ -43,53 +42,15 @@ jobs:
        PUSH_VERSION_COMMIT: ${{ secrets.PUSH_VERSION_COMMIT }}
      if: "env.PUSH_VERSION_COMMIT != ''"
      run: git push origin ${{ github.event.ref }}
    - name: Get Changelog
      run: |
        changelog=$(grep -oPz '(?s)(?<=### ${{ steps.bump_version.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: Create Release
      id: create_release
      uses: actions/create-release@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        tag_name: ${{ steps.bump_version.outputs.ytdlp_version }}
        release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlp_version }}
        commitish: ${{ steps.push_release.outputs.head_sha }}
        draft: true
        prerelease: false
        body: |
          #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
          ---
          <details open><summary><h3>Changelog</summary>
          <p>
          ${{ env.changelog }}
          </p>
          </details>
  build_unix:
-    needs: create_release
+    needs: prepare
    runs-on: ubuntu-18.04  # Standalone executable should be built on minimum supported OS
    outputs:
      sha256_bin: ${{ steps.get_sha.outputs.sha256_bin }}
      sha512_bin: ${{ steps.get_sha.outputs.sha512_bin }}
      sha256_tar: ${{ steps.get_sha.outputs.sha256_tar }}
      sha512_tar: ${{ steps.get_sha.outputs.sha512_tar }}
      sha256_linux: ${{ steps.get_sha.outputs.sha256_linux }}
      sha512_linux: ${{ steps.get_sha.outputs.sha512_linux }}
      sha256_linux_zip: ${{ steps.get_sha.outputs.sha256_linux_zip }}
      sha512_linux_zip: ${{ steps.get_sha.outputs.sha512_linux_zip }}
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
      with:
          python-version: '3.10'
    - name: Install Requirements
@@ -100,7 +61,7 @@ jobs:
    - name: Prepare
      run: |
-          python devscripts/update-version.py ${{ needs.create_release.outputs.version_suffix }}
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
          python devscripts/make_lazy_extractors.py
    - name: Build Unix executables
      run: |
@@ -111,51 +72,15 @@ jobs:
    - name: Get SHA2-SUMS
      id: get_sha
      run: |
          echo "::set-output name=sha256_bin::$(sha256sum yt-dlp | awk '{print $1}')"
          echo "::set-output name=sha512_bin::$(sha512sum yt-dlp | awk '{print $1}')"
          echo "::set-output name=sha256_tar::$(sha256sum yt-dlp.tar.gz | awk '{print $1}')"
          echo "::set-output name=sha512_tar::$(sha512sum yt-dlp.tar.gz | awk '{print $1}')"
          echo "::set-output name=sha256_linux::$(sha256sum dist/yt-dlp_linux | awk '{print $1}')"
          echo "::set-output name=sha512_linux::$(sha512sum dist/yt-dlp_linux | awk '{print $1}')"
          echo "::set-output name=sha256_linux_zip::$(sha256sum dist/yt-dlp_linux.zip | awk '{print $1}')"
          echo "::set-output name=sha512_linux_zip::$(sha512sum dist/yt-dlp_linux.zip | awk '{print $1}')"
-    - name: Upload zip binary
+    - name: Upload artifacts
-      uses: actions/upload-release-asset@v1
+      uses: actions/upload-artifact@v3
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        path: |
-        asset_path: ./yt-dlp
+          yt-dlp
-        asset_name: yt-dlp
+          yt-dlp.tar.gz
-        asset_content_type: application/octet-stream
+          dist/yt-dlp_linux
-    - name: Upload Source tar
+          dist/yt-dlp_linux.zip
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./yt-dlp.tar.gz
        asset_name: yt-dlp.tar.gz
        asset_content_type: application/gzip
    - name: Upload standalone binary
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./dist/yt-dlp_linux
        asset_name: yt-dlp_linux
        asset_content_type: application/octet-stream
    - name: Upload onedir binary
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./dist/yt-dlp_linux.zip
        asset_name: yt-dlp_linux.zip
        asset_content_type: application/zip
    - name: Build and publish on PyPi
      env:
@@ -164,6 +89,7 @@ jobs:
      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/*
@@ -180,24 +106,19 @@ jobs:
      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.create_release.outputs.ytdlp_version }}"
+        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.create_release.outputs.ytdlp_version }}'
+        git -C taps/ commit -am 'yt-dlp: ${{ needs.prepare.outputs.ytdlp_version }}'
        git -C taps/ push
  build_macos:
    runs-on: macos-11
-    needs: create_release
+    needs: prepare
    outputs:
      sha256_macos: ${{ steps.get_sha.outputs.sha256_macos }}
      sha512_macos: ${{ steps.get_sha.outputs.sha512_macos }}
      sha256_macos_zip: ${{ steps.get_sha.outputs.sha256_macos_zip }}
      sha512_macos_zip: ${{ steps.get_sha.outputs.sha512_macos_zip }}
    steps:
-    - uses: actions/checkout@v2
+    - 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: |
@@ -206,50 +127,28 @@ jobs:
    - name: Prepare
      run: |
-          /usr/bin/python3 devscripts/update-version.py ${{ needs.create_release.outputs.version_suffix }}
+          /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 .)
          /usr/bin/python3 pyinst.py --target-architecture universal2
    - name: Get SHA2-SUMS
      id: get_sha
      run: |
          echo "::set-output name=sha256_macos::$(sha256sum dist/yt-dlp_macos | awk '{print $1}')"
          echo "::set-output name=sha512_macos::$(sha512sum dist/yt-dlp_macos | awk '{print $1}')"
          echo "::set-output name=sha256_macos_zip::$(sha256sum dist/yt-dlp_macos.zip | awk '{print $1}')"
          echo "::set-output name=sha512_macos_zip::$(sha512sum dist/yt-dlp_macos.zip | awk '{print $1}')"
-    - name: Upload standalone binary
+    - name: Upload artifacts
-      uses: actions/upload-release-asset@v1
+      uses: actions/upload-artifact@v3
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        path: |
-        asset_path: ./dist/yt-dlp_macos
+          dist/yt-dlp_macos
-        asset_name: yt-dlp_macos
+          dist/yt-dlp_macos.zip
        asset_content_type: application/octet-stream
    - name: Upload onedir binary
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./dist/yt-dlp_macos.zip
        asset_name: yt-dlp_macos.zip
        asset_content_type: application/zip
  build_macos_legacy:
    runs-on: macos-latest
-    needs: create_release
+    needs: prepare
    outputs:
      sha256_macos_legacy: ${{ steps.get_sha.outputs.sha256_macos_legacy }}
      sha512_macos_legacy: ${{ steps.get_sha.outputs.sha512_macos_legacy }}
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Install Python
      # We need the official Python, because the GA ones only support newer macOS versions
      env:
@@ -269,52 +168,37 @@ jobs:
    - name: Prepare
      run: |
-          python3 devscripts/update-version.py ${{ needs.create_release.outputs.version_suffix }}
+          python3 devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
          python3 devscripts/make_lazy_extractors.py
    - name: Build
      run: |
          python3 pyinst.py
-    - name: Get SHA2-SUMS
+          mv dist/yt-dlp_macos dist/yt-dlp_macos_legacy
      id: get_sha
      run: |
          echo "::set-output name=sha256_macos_legacy::$(sha256sum dist/yt-dlp_macos | awk '{print $1}')"
          echo "::set-output name=sha512_macos_legacy::$(sha512sum dist/yt-dlp_macos | awk '{print $1}')"
-    - name: Upload standalone binary
+    - name: Upload artifacts
-      uses: actions/upload-release-asset@v1
+      uses: actions/upload-artifact@v3
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        path: |
-        asset_path: ./dist/yt-dlp_macos
+          dist/yt-dlp_macos_legacy
        asset_name: yt-dlp_macos_legacy
        asset_content_type: application/octet-stream
  build_windows:
    runs-on: windows-latest
-    needs: create_release
+    needs: prepare
    outputs:
      sha256_win: ${{ steps.get_sha.outputs.sha256_win }}
      sha512_win: ${{ steps.get_sha.outputs.sha512_win }}
      sha256_py2exe: ${{ steps.get_sha.outputs.sha256_py2exe }}
      sha512_py2exe: ${{ steps.get_sha.outputs.sha512_py2exe }}
      sha256_win_zip: ${{ steps.get_sha.outputs.sha256_win_zip }}
      sha512_win_zip: ${{ steps.get_sha.outputs.sha512_win_zip }}
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v2
+    - 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-4.10-py3-none-any.whl" -r requirements.txt
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-5.3-py3-none-any.whl" -r requirements.txt
    - name: Prepare
      run: |
-          python devscripts/update-version.py ${{ needs.create_release.outputs.version_suffix }}
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
          python devscripts/make_lazy_extractors.py
    - name: Build
      run: |
@@ -323,154 +207,118 @@ jobs:
          python pyinst.py
          python pyinst.py --onedir
          Compress-Archive -Path ./dist/yt-dlp/* -DestinationPath ./dist/yt-dlp_win.zip
    - name: Get SHA2-SUMS
      id: get_sha
      run: |
          echo "::set-output name=sha256_py2exe::$((Get-FileHash dist\yt-dlp_min.exe -Algorithm SHA256).Hash.ToLower())"
          echo "::set-output name=sha512_py2exe::$((Get-FileHash dist\yt-dlp_min.exe -Algorithm SHA512).Hash.ToLower())"
          echo "::set-output name=sha256_win::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())"
          echo "::set-output name=sha512_win::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA512).Hash.ToLower())"
          echo "::set-output name=sha256_win_zip::$((Get-FileHash dist\yt-dlp_win.zip -Algorithm SHA256).Hash.ToLower())"
          echo "::set-output name=sha512_win_zip::$((Get-FileHash dist\yt-dlp_win.zip -Algorithm SHA512).Hash.ToLower())"
-    - name: Upload py2exe binary
+    - name: Upload artifacts
-      uses: actions/upload-release-asset@v1
+      uses: actions/upload-artifact@v3
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        path: |
-        asset_path: ./dist/yt-dlp_min.exe
+          dist/yt-dlp.exe
-        asset_name: yt-dlp_min.exe
+          dist/yt-dlp_min.exe
-        asset_content_type: application/vnd.microsoft.portable-executable
+          dist/yt-dlp_win.zip
    - name: Upload standalone binary
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./dist/yt-dlp.exe
        asset_name: yt-dlp.exe
        asset_content_type: application/vnd.microsoft.portable-executable
    - name: Upload onedir binary
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./dist/yt-dlp_win.zip
        asset_name: yt-dlp_win.zip
        asset_content_type: application/zip
  build_windows32:
    runs-on: windows-latest
-    needs: create_release
+    needs: prepare
    outputs:
      sha256_win32: ${{ steps.get_sha.outputs.sha256_win32 }}
      sha512_win32: ${{ steps.get_sha.outputs.sha512_win32 }}
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v2
+    - 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-4.10-py3-none-any.whl" -r requirements.txt
+          pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-5.3-py3-none-any.whl" -r requirements.txt
    - name: Prepare
      run: |
-          python devscripts/update-version.py ${{ needs.create_release.outputs.version_suffix }}
+          python devscripts/update-version.py ${{ needs.prepare.outputs.version_suffix }}
          python devscripts/make_lazy_extractors.py
    - name: Build
      run: |
          python pyinst.py
    - name: Get SHA2-SUMS
      id: get_sha
      run: |
          echo "::set-output name=sha256_win32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())"
          echo "::set-output name=sha512_win32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA512).Hash.ToLower())"
-    - name: Upload standalone binary
+    - name: Upload artifacts
-      uses: actions/upload-release-asset@v1
+      uses: actions/upload-artifact@v3
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        path: |
-        asset_path: ./dist/yt-dlp_x86.exe
+          dist/yt-dlp_x86.exe
        asset_name: yt-dlp_x86.exe
        asset_content_type: application/vnd.microsoft.portable-executable
-  finish:
+  publish_release:
    runs-on: ubuntu-latest
-    needs: [create_release, build_unix, build_windows, build_windows32, build_macos, build_macos_legacy]
+    needs: [prepare, build_unix, build_windows, build_windows32, build_macos, build_macos_legacy]
    steps:
-    - name: Make SHA2-SUMS files
+    - uses: actions/checkout@v3
    - uses: actions/download-artifact@v3
    - name: Get Changelog
      run: |
-        echo "${{ needs.build_unix.outputs.sha256_bin }}  yt-dlp" >> SHA2-256SUMS
+        changelog=$(grep -oPz '(?s)(?<=### ${{ needs.prepare.outputs.ytdlp_version }}\n{2}).+?(?=\n{2,3}###)' Changelog.md) || true
-        echo "${{ needs.build_unix.outputs.sha256_tar }}  yt-dlp.tar.gz" >> SHA2-256SUMS
+        echo "changelog<<EOF" >> $GITHUB_ENV
-        echo "${{ needs.build_unix.outputs.sha256_linux }}  yt-dlp_linux" >> SHA2-256SUMS
+        echo "$changelog" >> $GITHUB_ENV
-        echo "${{ needs.build_unix.outputs.sha256_linux_zip }}  yt-dlp_linux.zip" >> SHA2-256SUMS
+        echo "EOF" >> $GITHUB_ENV
        echo "${{ needs.build_windows.outputs.sha256_win }}  yt-dlp.exe" >> SHA2-256SUMS
        echo "${{ needs.build_windows.outputs.sha256_py2exe }}  yt-dlp_min.exe" >> SHA2-256SUMS
        echo "${{ needs.build_windows32.outputs.sha256_win32 }}  yt-dlp_x86.exe" >> SHA2-256SUMS
        echo "${{ needs.build_windows.outputs.sha256_win_zip }}  yt-dlp_win.zip" >> SHA2-256SUMS
        echo "${{ needs.build_macos.outputs.sha256_macos }}  yt-dlp_macos" >> SHA2-256SUMS
        echo "${{ needs.build_macos.outputs.sha256_macos_zip }}  yt-dlp_macos.zip" >> SHA2-256SUMS
        echo "${{ needs.build_macos_legacy.outputs.sha256_macos_legacy }}  yt-dlp_macos_legacy" >> SHA2-256SUMS
        echo "${{ needs.build_unix.outputs.sha512_bin }}  yt-dlp" >> SHA2-512SUMS
        echo "${{ needs.build_unix.outputs.sha512_tar }}  yt-dlp.tar.gz" >> SHA2-512SUMS
        echo "${{ needs.build_unix.outputs.sha512_linux }}  yt-dlp_linux" >> SHA2-512SUMS
        echo "${{ needs.build_unix.outputs.sha512_linux_zip }}  yt-dlp_linux.zip" >> SHA2-512SUMS
        echo "${{ needs.build_windows.outputs.sha512_win }}  yt-dlp.exe" >> SHA2-512SUMS
        echo "${{ needs.build_windows.outputs.sha512_py2exe }}  yt-dlp_min.exe" >> SHA2-512SUMS
        echo "${{ needs.build_windows32.outputs.sha512_win32 }}  yt-dlp_x86.exe" >> SHA2-512SUMS
        echo "${{ needs.build_windows.outputs.sha512_win_zip }}  yt-dlp_win.zip" >> SHA2-512SUMS
        echo "${{ needs.build_macos.outputs.sha512_macos }}  yt-dlp_macos" >> SHA2-512SUMS
        echo "${{ needs.build_macos.outputs.sha512_macos_zip }}  yt-dlp_macos.zip" >> SHA2-512SUMS
        echo "${{ needs.build_macos_legacy.outputs.sha512_macos_legacy }}  yt-dlp_macos_legacy" >> SHA2-512SUMS
    - name: Upload SHA2-256SUMS file
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./SHA2-256SUMS
        asset_name: SHA2-256SUMS
        asset_content_type: text/plain
    - name: Upload SHA2-512SUMS file
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./SHA2-512SUMS
        asset_name: SHA2-512SUMS
        asset_content_type: text/plain
    - name: Make Update spec
      run: |
        echo "# This file is used for regulating self-update" >> _update_spec
        echo "lock 2022.07.18 .+ Python 3.6" >> _update_spec
-    - name: Upload update spec
+    - name: Make SHA2-SUMS files
      uses: actions/upload-release-asset@v1
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ needs.create_release.outputs.upload_url }}
        asset_path: ./_update_spec
        asset_name: _update_spec
        asset_content_type: text/plain
    - name: Finalize release
      env:
        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      run: |
-        gh api -X PATCH -H "Accept: application/vnd.github.v3+json" \
+          sha256sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-256SUMS
-          /repos/${{ github.repository }}/releases/${{ needs.create_release.outputs.release_id }} \
+          sha256sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-256SUMS
-          -F draft=false
+          sha256sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-256SUMS
          sha256sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-256SUMS
          sha256sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-256SUMS
          sha256sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-256SUMS
          sha256sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-256SUMS
          sha256sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-256SUMS
          sha256sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-256SUMS
          sha256sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-256SUMS
          sha256sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-256SUMS
          sha512sum artifact/yt-dlp | awk '{print $1 "  yt-dlp"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp.tar.gz | awk '{print $1 "  yt-dlp.tar.gz"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp.exe | awk '{print $1 "  yt-dlp.exe"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp_win.zip | awk '{print $1 "  yt-dlp_win.zip"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp_min.exe | awk '{print $1 "  yt-dlp_min.exe"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp_x86.exe | awk '{print $1 "  yt-dlp_x86.exe"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp_macos | awk '{print $1 "  yt-dlp_macos"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp_macos.zip | awk '{print $1 "  yt-dlp_macos.zip"}' >> SHA2-512SUMS
          sha512sum artifact/yt-dlp_macos_legacy | awk '{print $1 "  yt-dlp_macos_legacy"}' >> SHA2-512SUMS
          sha512sum artifact/dist/yt-dlp_linux | awk '{print $1 "  yt-dlp_linux"}' >> SHA2-512SUMS
          sha512sum artifact/dist/yt-dlp_linux.zip | awk '{print $1 "  yt-dlp_linux.zip"}' >> SHA2-512SUMS
    - name: Publish Release
      uses: yt-dlp/action-gh-release@v1
      with:
        tag_name: ${{ needs.prepare.outputs.ytdlp_version }}
        name: yt-dlp ${{ needs.prepare.outputs.ytdlp_version }}
        target_commitish: ${{ needs.prepare.outputs.head_sha }}
        body: |
          #### [A description of the various files]((https://github.com/yt-dlp/yt-dlp#release-files)) are in the README
          ---
          <details open><summary><h3>Changelog</summary>
          <p>
          ${{ env.changelog }}
          </p>
          </details>
        files: |
          SHA2-256SUMS
          SHA2-512SUMS
          artifact/yt-dlp
          artifact/yt-dlp.tar.gz
          artifact/yt-dlp.exe
          artifact/yt-dlp_win.zip
          artifact/yt-dlp_min.exe
          artifact/yt-dlp_x86.exe
          artifact/yt-dlp_macos
          artifact/yt-dlp_macos.zip
          artifact/yt-dlp_macos_legacy
          artifact/dist/yt-dlp_linux
          artifact/dist/yt-dlp_linux.zip
          _update_spec
@@ -10,7 +10,7 @@ jobs:
      matrix:
        os: [ubuntu-latest]
        # 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]
+        python-version: ['3.7', '3.10', 3.11-dev, pypy-3.7, pypy-3.8]
        run-tests-ext: [sh]
        include:
        # atleast one of each CPython/PyPy tests must be in windows
@@ -21,9 +21,9 @@ jobs:
          python-version: pypy-3.9
          run-tests-ext: bat
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
      with:
        python-version: ${{ matrix.python-version }}
    - name: Install pytest
@@ -6,9 +6,9 @@ jobs:
    if: "contains(github.event.head_commit.message, 'ci run dl')"
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
      with:
        python-version: 3.9
    - name: Install test requirements
@@ -25,7 +25,7 @@ jobs:
      fail-fast: true
      matrix:
        os: [ubuntu-latest]
-        python-version: ['3.6', '3.7', '3.10', 3.11-dev, pypy-3.6, pypy-3.7, pypy-3.8]
+        python-version: ['3.7', '3.10', 3.11-dev, pypy-3.7, pypy-3.8]
        run-tests-ext: [sh]
        include:
        # atleast one of each CPython/PyPy tests must be in windows
@@ -36,9 +36,9 @@ jobs:
          python-version: pypy-3.9
          run-tests-ext: bat
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
      with:
        python-version: ${{ matrix.python-version }}
    - name: Install pytest
@@ -6,9 +6,9 @@ jobs:
    if: "!contains(github.event.head_commit.message, 'ci skip all')"
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
      with:
        python-version: 3.9
    - name: Install test requirements
@@ -20,9 +20,9 @@ jobs:
    if: "!contains(github.event.head_commit.message, 'ci skip all')"
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
      with:
        python-version: 3.9
    - name: Install flake8
@@ -33,13 +33,14 @@ cookies
 *.jpeg
 *.jpg
 *.m4a
 *.mpga
 *.m4v
 *.mhtml
 *.mkv
 *.mov
 *.mp3
 *.mp4
 *.mpga
 *.oga
 *.ogg
 *.opus
 *.png
@@ -47,6 +48,7 @@ cookies
 *.srt
 *.swf
 *.swp
 *.tt
 *.ttml
 *.url
 *.vtt
@@ -85,6 +87,7 @@ updates_key.pem
 .tox
 *.class
 *.isorted
 *.stackdump
 # Generated
 AUTHORS
@@ -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](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**.
+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**.
 After you have ensured this site is distributing its content legally, you can follow this quick list (assuming your service is called `yourextractor`):
@@ -195,7 +195,7 @@ After you have ensured this site is distributing its content legally, you can fo
                # * A value
                # * MD5 checksum; start the string with md5:
                # * A regular expression; start the string with re:
-                # * Any Python type (for example int or float)
+                # * Any Python type, e.g. int or float
            }
        }]
@@ -222,7 +222,7 @@ After you have ensured this site is distributing its content legally, you can fo
        $ flake8 yt_dlp/extractor/yourextractor.py
-1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.6 and above. Backward compatibility is not required for even older versions of Python.
+1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.7 and above. Backward compatibility is not required for even older versions of Python.
 1. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files, [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
        $ git add yt_dlp/extractor/_extractors.py
@@ -261,7 +261,7 @@ The aforementioned metafields are the critical data that the extraction does not
 For pornographic sites, appropriate `age_limit` must also be returned.
-The extractor is allowed to return the info dict without url or formats in some special cases if it allows the user to extract usefull information with `--ignore-no-formats-error` - Eg: when the video is a live stream that has not started yet.
+The extractor is allowed to return the info dict without url or formats in some special cases if it allows the user to extract usefull information with `--ignore-no-formats-error` - e.g. when the video is a live stream that has not started yet.
 [Any field](yt_dlp/extractor/common.py#219-L426) apart from the aforementioned ones are considered **optional**. That means that extraction should be **tolerant** to situations when sources for these fields can potentially be unavailable (even if they are always available at the moment) and **future-proof** in order not to break the extraction of general purpose mandatory fields.
@@ -285,3 +285,49 @@ odo2063
 pritam20ps05
 scy
 sheerluck
 AxiosDeminence
 DjesonPV
 eren-kemer
 freezboltz
 Galiley
 haobinliang
 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
 Grub4K
 itachi-19
 jeroenj
 josanabr
 LiviaMedeiros
 nikita-moor
 snapdgn
 SuperSonicHub1
 tannertechnology
 Timendum
 tobi1805
 TokyoBlackHole
@@ -11,6 +11,293 @@
 -->
 ### 2022.10.04
 * Allow a `set` to be passed as `download_archive` by [pukkandan](https://github.com/pukkandan), [bashonly](https://github.com/bashonly)
 * Allow open ranges for time ranges by [Lesmiscore](https://github.com/Lesmiscore)
 * Allow plugin extractors to replace the built-in ones
 * Don't download entire video when no matching `--download-sections`
 * Fix `--config-location -`
 * Improve [5736d79](https://github.com/yt-dlp/yt-dlp/pull/5044/commits/5736d79172c47ff84740d5720467370a560febad)
 * Fix for when playlists don't have `webpage_url`
 * Support environment variables in `--ffmpeg-location`
 * Workaround `libc_ver` not be available on Windows Store version of Python
 * [outtmpl] Curly braces to filter keys by [pukkandan](https://github.com/pukkandan)
 * [outtmpl] Make `%s` work in strfformat for all systems
 * [jsinterp] Workaround operator associativity issue
 * [cookies] Let `_get_mac_keyring_password` fail gracefully
 * [cookies] Parse cookies leniently by [Grub4K](https://github.com/Grub4K)
 * [phantomjs] Fix bug in [587021c](https://github.com/yt-dlp/yt-dlp/commit/587021cd9f717181b44e881941aca3f8d753758b) by [elyse0](https://github.com/elyse0)
 * [downloader/aria2c] Fix filename containing leading whitespace by [std-move](https://github.com/std-move)
 * [downloader/ism] Support ec-3 codec by [nixxo](https://github.com/nixxo)
 * [extractor] Fix `fatal=False` in `RetryManager`
 * [extractor] Improve json-ld extraction
 * [extractor] Make `_search_json` able to parse lists
 * [extractor] Escape `%` in `representation_id` of m3u8
 * [extractor/generic] Pass through referer from json-ld
 * [utils] `base_url`: URL paths can contain `&` by [elyse0](https://github.com/elyse0)
 * [utils] `js_to_json`: Improve
 * [utils] `Popen.run`: Fix default return in binary mode
 * [utils] `traverse_obj`: Rewrite, document and add tests by [Grub4K](https://github.com/Grub4K)
 * [devscripts] `make_lazy_extractors`: Fix for Docker by [josanabr](https://github.com/josanabr)
 * [docs] Misc Improvements
 * [cleanup] Misc fixes and cleanup by [pukkandan](https://github.com/pukkandan), [gamer191](https://github.com/gamer191)
 * [extractor/24tv.ua] Add extractors by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/BerufeTV] Add extractor by [Fabi019](https://github.com/Fabi019)
 * [extractor/booyah] Add extractor by [HobbyistDev](https://github.com/HobbyistDev), [elyse0](https://github.com/elyse0)
 * [extractor/bundesliga] Add extractor by [Fabi019](https://github.com/Fabi019)
 * [extractor/GoPlay] Add extractor by [CNugteren](https://github.com/CNugteren), [basrieter](https://github.com/basrieter), [jeroenj](https://github.com/jeroenj)
 * [extractor/iltalehti] Add extractor by [tpikonen](https://github.com/tpikonen)
 * [extractor/IsraelNationalNews] Add extractor by [Bobscorn](https://github.com/Bobscorn)
 * [extractor/mediaworksnzvod] Add extractor by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/MicrosoftEmbed] Add extractor by [DoubleCouponDay](https://github.com/DoubleCouponDay)
 * [extractor/nbc] Add NBCStations extractor by [bashonly](https://github.com/bashonly)
 * [extractor/onenewsnz] Add extractor by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/prankcast] Add extractor by [HobbyistDev](https://github.com/HobbyistDev), [columndeeply](https://github.com/columndeeply)
 * [extractor/Smotrim] Add extractor by [Lesmiscore](https://github.com/Lesmiscore), [nikita-moor](https://github.com/nikita-moor)
 * [extractor/tencent] Add Iflix extractor by [elyse0](https://github.com/elyse0)
 * [extractor/unscripted] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/adobepass] Add MSO AlticeOne (Optimum TV) by [CplPwnies](https://github.com/CplPwnies)
 * [extractor/youtube] **Download `post_live` videos from start** by [Lesmiscore](https://github.com/Lesmiscore), [pukkandan](https://github.com/pukkandan)
 * [extractor/youtube] Add support for Shorts audio pivot feed by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * [extractor/youtube] Detect `lazy-load-for-videos` embeds
 * [extractor/youtube] Do not warn on duplicate chapters
 * [extractor/youtube] Fix video like count extraction by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/youtube] Support changing extraction language by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/youtube:tab] Improve continuation items extraction
 * [extractor/youtube:tab] Support `reporthistory` page
 * [extractor/amazonstore] Fix JSON extraction by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * [extractor/amazonstore] Retry to avoid captcha page by [Lesmiscore](https://github.com/Lesmiscore)
 * [extractor/animeondemand] Remove extractor by [TokyoBlackHole](https://github.com/TokyoBlackHole)
 * [extractor/anvato] Fix extractor and refactor by [bashonly](https://github.com/bashonly)
 * [extractor/artetv] Remove duplicate stream urls by [Grub4K](https://github.com/Grub4K)
 * [extractor/audioboom] Support direct URLs and refactor by [pukkandan](https://github.com/pukkandan), [tpikonen](https://github.com/tpikonen)
 * [extractor/bandcamp] Extract `uploader_url`
 * [extractor/bilibili] Add space.bilibili extractors by [lockmatrix](https://github.com/lockmatrix)
 * [extractor/BilibiliSpace] Fix extractor and better error message by [lockmatrix](https://github.com/lockmatrix)
 * [extractor/BiliIntl] Support uppercase lang in `_VALID_URL` by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/BiliIntlSeries] Fix `_VALID_URL`
 * [extractor/bongacams] Update `_VALID_URL` by [0xGodspeed](https://github.com/0xGodspeed)
 * [extractor/crunchyroll:beta] Improve handling of hardsubs by [Grub4K](https://github.com/Grub4K)
 * [extractor/detik] Generalize extractors by [HobbyistDev](https://github.com/HobbyistDev), [coletdjnz](https://github.com/coletdjnz)
 * [extractor/dplay:italy] Add default authentication by [Timendum](https://github.com/Timendum)
 * [extractor/heise] Fix extractor by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/holodex] Fix `_VALID_URL` by [LiviaMedeiros](https://github.com/LiviaMedeiros)
 * [extractor/hrfensehen] Fix extractor by [snapdgn](https://github.com/snapdgn)
 * [extractor/hungama] Add subtitle by [GautamMKGarg](https://github.com/GautamMKGarg), [pukkandan](https://github.com/pukkandan)
 * [extractor/instagram] Extract more metadata by [pritam20ps05](https://github.com/pritam20ps05)
 * [extractor/JWPlatform] Fix extractor by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/malltv] Fix video_id extraction by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/MLBTV] Detect live streams
 * [extractor/motorsport] Support native embeds
 * [extractor/Mxplayer] Fix extractor by [itachi-19](https://github.com/itachi-19)
 * [extractor/nebula] Add nebula.tv by [tannertechnology](https://github.com/tannertechnology)
 * [extractor/nfl] Fix extractor by [bashonly](https://github.com/bashonly)
 * [extractor/ondemandkorea] Update `jw_config` regex by [julien-hadleyjack](https://github.com/julien-hadleyjack)
 * [extractor/paramountplus] Better DRM detection by [bashonly](https://github.com/bashonly)
 * [extractor/patreon] Sort formats
 * [extractor/rcs] Fix embed extraction by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/redgifs] Fix extractor by [jhwgh1968](https://github.com/jhwgh1968)
 * [extractor/rutube] Fix `_EMBED_REGEX` by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/RUTV] Fix warnings for livestreams by [Lesmiscore](https://github.com/Lesmiscore)
 * [extractor/soundcloud:search] More metadata in `--flat-playlist` by [SuperSonicHub1](https://github.com/SuperSonicHub1)
 * [extractor/telegraaf] Use mobile GraphQL API endpoint by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/tennistv] Fix timestamp by [zenerdi0de](https://github.com/zenerdi0de)
 * [extractor/tiktok] Fix TikTokIE by [bashonly](https://github.com/bashonly)
 * [extractor/triller] Fix auth token by [bashonly](https://github.com/bashonly)
 * [extractor/trovo] Fix extractors by [Mehavoid](https://github.com/Mehavoid)
 * [extractor/tv2] Support new url format by [tobi1805](https://github.com/tobi1805)
 * [extractor/web.archive:youtube] Fix `_YT_INITIAL_PLAYER_RESPONSE_RE`
 * [extractor/wistia] Add support for channels by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/wistia] Match IDs in embed URLs by [bashonly](https://github.com/bashonly)
 * [extractor/wordpress:playlist] Add generic embed extractor by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/yandexvideopreview] Update `_VALID_URL` by [Grub4K](https://github.com/Grub4K)
 * [extractor/zee5] Fix `_VALID_URL` by [m4tu4g](https://github.com/m4tu4g)
 * [extractor/zee5] Generate device ids by [freezboltz](https://github.com/freezboltz)
 ### 2022.09.01
 * Add option `--use-extractors`
 * Merge youtube-dl: Upto [commit/ed5c44e](https://github.com/ytdl-org/youtube-dl/commit/ed5c44e7)
 * Add yt-dlp version to infojson
 * Fix `--break-per-url --max-downloads`
 * Fix bug in `--alias`
 * [cookies] Support firefox container in `--cookies-from-browser` by [bashonly](https://github.com/bashonly), [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * [downloader/external] Smarter detection of executable
 * [extractor/generic] Don't return JW player without formats
 * [FormatSort] Fix `aext` for `--prefer-free-formats`
 * [jsinterp] Various improvements by [pukkandan](https://github.com/pukkandan), [dirkf](https://github.com/dirkf), [elyse0](https://github.com/elyse0)
 * [cache] Mechanism to invalidate old cache
 * [utils] Add `deprecation_warning`
 * [utils] Add `orderedSet_from_options`
 * [utils] `Popen`: Restore `LD_LIBRARY_PATH` when using PyInstaller by [Lesmiscore](https://github.com/Lesmiscore)
 * [build] `make tar` should not follow `DESTDIR` by [satan1st](https://github.com/satan1st)
 * [build] Update pyinstaller by [shirt-dev](https://github.com/shirt-dev)
 * [test] Fix `test_youtube_signature`
 * [cleanup] Misc fixes and cleanup by [DavidH-2022](https://github.com/DavidH-2022), [MrRawes](https://github.com/MrRawes), [pukkandan](https://github.com/pukkandan)
 * [extractor/epoch] Add extractor by [tejasa97](https://github.com/tejasa97)
 * [extractor/eurosport] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/IslamChannel] Add extractors by [Lesmiscore](https://github.com/Lesmiscore)
 * [extractor/newspicks] Add extractor by [Lesmiscore](https://github.com/Lesmiscore)
 * [extractor/triller] Add extractor by [bashonly](https://github.com/bashonly)
 * [extractor/VQQ] Add extractors by [elyse0](https://github.com/elyse0)
 * [extractor/youtube] Improvements to nsig extraction
 * [extractor/youtube] Fix bug in format sorting
 * [extractor/youtube] Update iOS Innertube clients by [SamantazFox](https://github.com/SamantazFox)
 * [extractor/youtube] Use device-specific user agent by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/youtube] Add `--compat-option no-youtube-prefer-utc-upload-date` by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/arte] Bug fix by [cgrigis](https://github.com/cgrigis)
 * [extractor/bilibili] Extract `flac` with premium account by [jackyyf](https://github.com/jackyyf)
 * [extractor/BiliBiliSearch] Don't sort by date
 * [extractor/BiliBiliSearch] Fix infinite loop
 * [extractor/bitchute] Mark errors as expected
 * [extractor/crunchyroll:beta] Use anonymous access by [tejing1](https://github.com/tejing1)
 * [extractor/huya] Fix stream extraction by [ohaiibuzzle](https://github.com/ohaiibuzzle)
 * [extractor/medaltv] Fix extraction by [xenova](https://github.com/xenova)
 * [extractor/mediaset] Fix embed extraction
 * [extractor/mixcloud] All formats are audio-only
 * [extractor/rtbf] Fix jwt extraction by [elyse0](https://github.com/elyse0)
 * [extractor/screencastomatic] Support `--video-password` by [shreyasminocha](https://github.com/shreyasminocha)
 * [extractor/stripchat] Don't modify input URL by [dfaker](https://github.com/dfaker)
 * [extractor/uktv] Improve `_VALID_URL` by [dirkf](https://github.com/dirkf)
 * [extractor/vimeo:user] Fix `_VALID_URL`
 ### 2022.08.19
 * Fix bug in `--download-archive`
 * [jsinterp] **Fix for new youtube players** and related improvements by [dirkf](https://github.com/dirkf), [pukkandan](https://github.com/pukkandan)
 * [phantomjs] Add function to execute JS without a DOM by [MinePlayersPE](https://github.com/MinePlayersPE), [pukkandan](https://github.com/pukkandan)
 * [build] Exclude devscripts from installs by [Lesmiscore](https://github.com/Lesmiscore)
 * [cleanup] Misc fixes and cleanup
 * [extractor/youtube] **Add fallback to phantomjs** for nsig
 * [extractor/youtube] Fix error reporting of "Incomplete data"
 * [extractor/youtube] Improve format sorting for IOS formats
 * [extractor/youtube] Improve signature caching
 * [extractor/instagram] Fix extraction by [bashonly](https://github.com/bashonly), [pritam20ps05](https://github.com/pritam20ps05)
 * [extractor/rai] Minor fix by [nixxo](https://github.com/nixxo)
 * [extractor/rtbf] Fix stream extractor by [elyse0](https://github.com/elyse0)
 * [extractor/SovietsCloset] Fix extractor by [ChillingPepper](https://github.com/ChillingPepper)
 * [extractor/zattoo] Fix Zattoo resellers by [goggle](https://github.com/goggle)
 ### 2022.08.14
 * Merge youtube-dl: Upto [commit/d231b56](https://github.com/ytdl-org/youtube-dl/commit/d231b56)
 * [jsinterp] Handle **new youtube signature functions**
 * [jsinterp] Truncate error messages
 * [extractor] Fix format sorting of `channels`
 * [ffmpeg] Disable avconv unless `--prefer-avconv`
 * [ffmpeg] Smarter detection of ffprobe filename
 * [embedthumbnail] Detect `libatomicparsley.so`
 * [ThumbnailsConvertor] Fix conversion after `fixup_webp`
 * [utils] Fix `get_compatible_ext`
 * [build] Fix changelog
 * [update] Set executable bit-mask by [pukkandan](https://github.com/pukkandan), [Lesmiscore](https://github.com/Lesmiscore)
 * [devscripts] Fix import
 * [docs] Consistent use of `e.g.` by [Lesmiscore](https://github.com/Lesmiscore)
 * [cleanup] Misc fixes and cleanup
 * [extractor/moview] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/parler] Add extractor by [palewire](https://github.com/palewire)
 * [extractor/patreon] Ignore erroneous media attachments by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/truth] Add extractor by [palewire](https://github.com/palewire)
 * [extractor/aenetworks] Add formats parameter by [jacobtruman](https://github.com/jacobtruman)
 * [extractor/crunchyroll] Improve `_VALID_URL`s
 * [extractor/doodstream] Add `wf` domain by [aldoridhoni](https://github.com/aldoridhoni)
 * [extractor/facebook] Add reel support by [bashonly](https://github.com/bashonly)
 * [extractor/MLB] New extractor by [ischmidt20](https://github.com/ischmidt20)
 * [extractor/rai] Misc fixes by [nixxo](https://github.com/nixxo)
 * [extractor/toggo] Improve `_VALID_URL` by [masta79](https://github.com/masta79)
 * [extractor/tubitv] Extract additional formats by [shirt-dev](https://github.com/shirt-dev)
 * [extractor/zattoo] Potential fix for resellers
 ### 2022.08.08
 * **Remove Python 3.6 support**
 * Determine merge container better by [pukkandan](https://github.com/pukkandan), [selfisekai](https://github.com/selfisekai)
 * Framework for embed detection by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * Merge youtube-dl: Upto [commit/adb5294](https://github.com/ytdl-org/youtube-dl/commit/adb5294)
 * `--compat-option no-live-chat` should disable danmaku
 * Fix misleading DRM message
 * Import ctypes only when necessary
 * Minor bugfixes
 * Reject entire playlists faster with `--match-filter`
 * Remove filtered entries from `-J`
 * Standardize retry mechanism
 * Validate `--merge-output-format`
 * [downloader] Add average speed to final progress line
 * [extractor] Add field `audio_channels`
 * [extractor] Support multiple archive ids for one video
 * [ffmpeg] Set `ffmpeg_location` in a contextvar
 * [FFmpegThumbnailsConvertor] Fix conversion from GIF
 * [MetadataParser] Don't set `None` when the field didn't match
 * [outtmpl] Smarter replacing of unsupported characters
 * [outtmpl] Treat empty values as None in filenames
 * [utils] sanitize_open: Allow any IO stream as stdout
 * [build, devscripts] Add devscript to set a build variant
 * [build] Improve build process by [shirt-dev](https://github.com/shirt-dev)
 * [build] Update pyinstaller
 * [devscripts] Create `utils` and refactor
 * [docs] Clarify `best*`
 * [docs] Fix bug report issue template
 * [docs] Fix capitalization in references by [christoph-heinrich](https://github.com/christoph-heinrich)
 * [cleanup, mhtml] Use imghdr
 * [cleanup, utils] Consolidate known media extensions
 * [cleanup] Misc fixes and cleanup
 * [extractor/angel] Add extractor by [AxiosDeminence](https://github.com/AxiosDeminence)
 * [extractor/dplay] Add MotorTrend extractor by [Sipherdrakon](https://github.com/Sipherdrakon)
 * [extractor/harpodeon] Add extractor by [eren-kemer](https://github.com/eren-kemer)
 * [extractor/holodex] Add extractor by [pukkandan](https://github.com/pukkandan), [sqrtNOT](https://github.com/sqrtNOT)
 * [extractor/kompas] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/rai] Add raisudtirol extractor by [nixxo](https://github.com/nixxo)
 * [extractor/tempo] Add extractor by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/youtube] **Fixes for third party client detection** by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/youtube] Add `live_status=post_live` by [lazypete365](https://github.com/lazypete365)
 * [extractor/youtube] Extract more format info
 * [extractor/youtube] Parse translated subtitles only when requested
 * [extractor/youtube, extractor/twitch] Allow waiting for channels to become live
 * [extractor/youtube, webvtt] Extract auto-subs from livestream VODs by [fstirlitz](https://github.com/fstirlitz), [pukkandan](https://github.com/pukkandan)
 * [extractor/AbemaTVTitle] Implement paging by [Lesmiscore](https://github.com/Lesmiscore)
 * [extractor/archiveorg] Improve handling of formats by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * [extractor/arte] Fix title extraction
 * [extractor/arte] **Move to v2 API** by [fstirlitz](https://github.com/fstirlitz), [pukkandan](https://github.com/pukkandan)
 * [extractor/bbc] Fix news articles by [ajj8](https://github.com/ajj8)
 * [extractor/camtasia] Separate into own extractor by [coletdjnz](https://github.com/coletdjnz)
 * [extractor/cloudflarestream] Fix video_id padding by [haobinliang](https://github.com/haobinliang)
 * [extractor/crunchyroll] Fix conversion of thumbnail from GIF
 * [extractor/crunchyroll] Handle missing metadata correctly by [Burve](https://github.com/Burve), [pukkandan](https://github.com/pukkandan)
 * [extractor/crunchyroll:beta] Extract timestamp and fix tests by [tejing1](https://github.com/tejing1)
 * [extractor/crunchyroll:beta] Use streams API by [tejing1](https://github.com/tejing1)
 * [extractor/doodstream] Support more domains by [Galiley](https://github.com/Galiley)
 * [extractor/ESPN] Extract duration by [ischmidt20](https://github.com/ischmidt20)
 * [extractor/FIFA] Change API endpoint by [Bricio](https://github.com/Bricio), [yashkc2025](https://github.com/yashkc2025)
 * [extractor/globo:article] Remove false positives by [Bricio](https://github.com/Bricio)
 * [extractor/Go] Extract timestamp by [ischmidt20](https://github.com/ischmidt20)
 * [extractor/hidive] Fix cookie login when netrc is also given by [winterbird-code](https://github.com/winterbird-code)
 * [extractor/html5] Separate into own extractor by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * [extractor/ina] Improve extractor by [elyse0](https://github.com/elyse0)
 * [extractor/NaverNow] Change endpoint by [ping](https://github.com/ping)
 * [extractor/ninegag] Extract uploader by [DjesonPV](https://github.com/DjesonPV)
 * [extractor/NovaPlay] Fix extractor by [Bojidarist](https://github.com/Bojidarist)
 * [extractor/orf:radio] Rewrite extractors
 * [extractor/patreon] Fix and improve extractors by [coletdjnz](https://github.com/coletdjnz), [pukkandan](https://github.com/pukkandan)
 * [extractor/rai] Fix RaiNews extraction by [nixxo](https://github.com/nixxo)
 * [extractor/redbee] Unify and update extractors by [elyse0](https://github.com/elyse0)
 * [extractor/stripchat] Fix _VALID_URL by [freezboltz](https://github.com/freezboltz)
 * [extractor/tubi] Exclude playlists from playlist entries by [sqrtNOT](https://github.com/sqrtNOT)
 * [extractor/tviplayer] Improve `_VALID_URL` by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/twitch] Extract chapters for single chapter VODs by [mpeter50](https://github.com/mpeter50)
 * [extractor/vgtv] Support tv.vg.no by [sqrtNOT](https://github.com/sqrtNOT)
 * [extractor/vidio] Support embed link by [HobbyistDev](https://github.com/HobbyistDev)
 * [extractor/vk] Fix extractor by [Mehavoid](https://github.com/Mehavoid)
 * [extractor/WASDTV:record] Fix `_VALID_URL`
 * [extractor/xfileshare] Add Referer by [Galiley](https://github.com/Galiley)
 * [extractor/YahooJapanNews] Fix extractor by [Lesmiscore](https://github.com/Lesmiscore)
 * [extractor/yandexmusic] Extract higher quality format
 * [extractor/zee5] Update Device ID by [m4tu4g](https://github.com/m4tu4g)
 ### 2022.07.18
 * Allow users to specify encoding in each config files by [Lesmiscore](https://github.com/Lesmiscore)
@@ -125,7 +412,7 @@
 * [**Deprecate support for Python 3.6**](https://github.com/yt-dlp/yt-dlp/issues/3764#issuecomment-1154051119)
 * **Add option `--download-sections` to download video partially**
-    * Chapter regex and time ranges are accepted (Eg: `--download-sections *1:10-2:20`)
+    * Chapter regex and time ranges are accepted, e.g. `--download-sections *1:10-2:20`
 * Add option `--alias`
 * Add option `--lazy-playlist` to process entries as they are received
 * Add option `--retry-sleep`
@@ -1289,7 +1576,7 @@
 * Add new option `--netrc-location`
 * [outtmpl] Allow alternate fields using `,`
-* [outtmpl] Add format type `B` to treat the value as bytes (eg: to limit the filename to a certain number of bytes)
+* [outtmpl] Add format type `B` to treat the value as bytes, e.g. to limit the filename to a certain number of bytes
 * Separate the options `--ignore-errors` and `--no-abort-on-error`
 * Basic framework for simultaneous download of multiple formats by [nao20010128nao](https://github.com/nao20010128nao)
 * [17live] Add 17.live extractor by [nao20010128nao](https://github.com/nao20010128nao)
@@ -1679,7 +1966,7 @@
 * Merge youtube-dl: Upto [commit/a803582](https://github.com/ytdl-org/youtube-dl/commit/a8035827177d6b59aca03bd717acb6a9bdd75ada)
 * Add `--extractor-args` to pass some extractor-specific arguments. See [readme](https://github.com/yt-dlp/yt-dlp#extractor-arguments)
-    * Add extractor option `skip` for `youtube`. Eg: `--extractor-args youtube:skip=hls,dash`
+    * Add extractor option `skip` for `youtube`, e.g. `--extractor-args youtube:skip=hls,dash`
    * Deprecates `--youtube-skip-dash-manifest`, `--youtube-skip-hls-manifest`, `--youtube-include-dash-manifest`, `--youtube-include-hls-manifest`
 * Allow `--list...` options to work with `--print`, `--quiet` and other `--list...` options
 * [youtube] Use `player` API for additional video extraction requests by [coletdjnz](https://github.com/coletdjnz)
@@ -28,12 +28,12 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 [![gh-sponsor](https://img.shields.io/badge/_-Sponsor-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz)
 * YouTube improvements including: age-gate bypass, private playlists, multiple-clients (to avoid throttling) and a lot of under-the-hood improvements
-* Added support for downloading YoutubeWebArchive videos
+* Added support for new websites YoutubeWebArchive, MainStreaming, PRX, nzherald, Mediaklikk, StarTV etc
-* Added support for new websites MainStreaming, PRX, nzherald, etc
+* Improved/fixed support for Patreon, panopto, gfycat, itv, pbs, SouthParkDE etc
-## [Ashish0804](https://github.com/Ashish0804)
+## [Ashish0804](https://github.com/Ashish0804) <sub><sup>[Inactive]</sup></sub>
 [![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804)
@@ -48,4 +48,5 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho
 **Monacoin**: mona1q3tf7dzvshrhfe3md379xtvt2n22duhglv5dskr
 * Download live from start to end for YouTube
-* Added support for new websites mildom, PixivSketch, skeb, radiko, voicy, mirrativ, openrec, whowatch, damtomo, 17.live, mixch etc
+* 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
@@ -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 *.jpeg *.jpg *.m4a *.mpga *.m4v *.mhtml *.mkv *.mov \
+	*.3gp *.ape *.ass *.avi *.desktop *.f4v *.flac *.flv *.jpeg *.jpg *.m4a *.m4v *.mhtml *.mkv *.mov *.mp3 *.mp4 \
-	*.mp3 *.mp4 *.ogg *.opus *.png *.sbv *.srt *.swf *.swp *.ttml *.url *.vtt *.wav *.webloc *.webm *.webp
+	*.mpga *.oga *.ogg *.opus *.png *.sbv *.srt *.swf *.swp *.tt *.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,7 +33,6 @@ 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
@@ -75,17 +74,16 @@ 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 \
+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 zip/yt_dlp/*/*/*.py
+	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py
 	mv zip/yt_dlp/__main__.py zip/
-	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py yt_dlp/*/*/*.py __main__.py
+	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
 	rm -rf zip
 	echo '#!$(PYTHON)' > yt-dlp
 	cat yt-dlp.zip >> yt-dlp
@@ -134,7 +132,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 $(DESTDIR)/yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
+	@tar -czf yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \
 		--exclude '*.DS_Store' \
 		--exclude '*.kate-swp' \
 		--exclude '*.pyc' \
@@ -0,0 +1 @@
 # Empty file needed to make devscripts.utils properly importable from outside
@@ -9,14 +9,19 @@ from ..utils import (
    write_string,
 )
 # These bloat the lazy_extractors, so allow them to passthrough silently
 ALLOWED_CLASSMETHODS = {'get_testcases', 'extract_from_webpage'}
 _WARNED = False
 class LazyLoadMetaClass(type):
    def __getattr__(cls, name):
-        # "_TESTS" bloat the lazy_extractors
+        global _WARNED
-        if '_real_class' not in cls.__dict__ and name != 'get_testcases':
+        if ('_real_class' not in cls.__dict__
-            write_string(
+                and name not in ALLOWED_CLASSMETHODS and not _WARNED):
-                'WARNING: Falling back to normal extractor since lazy extractor '
+            _WARNED = True
-                f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
+            write_string('WARNING: Falling back to normal extractor since lazy extractor '
                         f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n')
        return getattr(cls.real_class, name)
@@ -7,20 +7,14 @@ import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import optparse
 import re
-
+from devscripts.utils import (
-def read(fname):
+    get_filename_args,
-    with open(fname, encoding='utf-8') as f:
+    read_file,
-        return f.read()
+    read_version,
-
+    write_file,
-
+)
 # Get the version without importing the package
 def read_version(fname):
    exec(compile(read(fname), fname, 'exec'))
    return locals()['__version__']
 VERBOSE_TMPL = '''
  - type: checkboxes
@@ -58,20 +52,24 @@ VERBOSE_TMPL = '''
      required: true
 '''.strip()
 NO_SKIP = '''
  - type: checkboxes
    attributes:
      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
      description: Fill all fields even if you think it is irrelevant for the issue
      options:
        - label: I understand that I will be **blocked** if I remove or skip any mandatory\\* field
          required: true
 '''.strip()
 def main():
-    parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
+    fields = {'version': read_version(), 'no_skip': NO_SKIP}
    _, args = parser.parse_args()
    if len(args) != 2:
        parser.error('Expected an input and an output filename')
    fields = {'version': read_version('yt_dlp/version.py')}
    fields['verbose'] = VERBOSE_TMPL % fields
    fields['verbose_optional'] = re.sub(r'(\n\s+validations:)?\n\s+required: true', '', fields['verbose'])
-    infile, outfile = args
+    infile, outfile = get_filename_args(has_infile=True)
-    with open(outfile, 'w', encoding='utf-8') as outf:
+    write_file(outfile, read_file(infile) % fields)
        outf.write(read(infile) % fields)
 if __name__ == '__main__':
@@ -2,16 +2,20 @@
 # Allow direct execution
 import os
 import shutil
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import optparse
 from inspect import getsource
 from devscripts.utils import get_filename_args, read_file, write_file
 NO_ATTR = object()
-STATIC_CLASS_PROPERTIES = ['IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_WORKING', '_NETRC_MACHINE', 'age_limit']
+STATIC_CLASS_PROPERTIES = [
    'IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_VALID_URL', '_WORKING', '_ENABLED', '_NETRC_MACHINE', 'age_limit'
 ]
 CLASS_METHODS = [
    'ie_key', 'working', 'description', 'suitable', '_match_valid_url', '_match_id', 'get_temp_id', 'is_suitable'
 ]
@@ -19,17 +23,11 @@ IE_TEMPLATE = '''
 class {name}({bases}):
    _module = {module!r}
 '''
-with open('devscripts/lazy_load_template.py', encoding='utf-8') as f:
+MODULE_TEMPLATE = read_file('devscripts/lazy_load_template.py')
    MODULE_TEMPLATE = f.read()
 def main():
-    parser = optparse.OptionParser(usage='%prog [OUTFILE.py]')
+    lazy_extractors_filename = get_filename_args(default_outfile='yt_dlp/extractor/lazy_extractors.py')
    args = parser.parse_args()[1] or ['yt_dlp/extractor/lazy_extractors.py']
    if len(args) != 1:
        parser.error('Expected only an output filename')
    lazy_extractors_filename = args[0]
    if os.path.exists(lazy_extractors_filename):
        os.remove(lazy_extractors_filename)
@@ -46,20 +44,20 @@ def main():
        *build_ies(_ALL_CLASSES, (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
    ))
-    with open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
+    write_file(lazy_extractors_filename, f'{module_src}\n')
        f.write(f'{module_src}\n')
 def get_all_ies():
    PLUGINS_DIRNAME = 'ytdlp_plugins'
    BLOCKED_DIRNAME = f'{PLUGINS_DIRNAME}_blocked'
    if os.path.exists(PLUGINS_DIRNAME):
-        os.rename(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
+        # 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)
    try:
        from yt_dlp.extractor.extractors import _ALL_CLASSES
    finally:
        if os.path.exists(BLOCKED_DIRNAME):
-            os.rename(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
+            shutil.move(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
    return _ALL_CLASSES
@@ -116,11 +114,6 @@ def build_lazy_ie(ie, name, attr_base):
    }.get(base.__name__, base.__name__) for base in ie.__bases__)
    s = IE_TEMPLATE.format(name=name, module=ie.__module__, bases=bases)
    valid_url = getattr(ie, '_VALID_URL', None)
    if not valid_url and hasattr(ie, '_make_valid_url'):
        valid_url = ie._make_valid_url()
    if valid_url:
        s += f'    _VALID_URL = {valid_url!r}\n'
    return s + '\n'.join(extra_ie_code(ie, attr_base))
@@ -5,10 +5,17 @@ yt-dlp --help | make_readme.py
 This must be run in a console of correct width
 """
 # Allow direct execution
 import os
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import functools
 import re
-import sys
+
 from devscripts.utils import read_file, write_file
 README_FILE = 'README.md'
@@ -38,6 +45,10 @@ switch_col_width = len(re.search(r'(?m)^\s{5,}', options).group())
 delim = f'\n{" " * switch_col_width}'
 PATCHES = (
    (   # Standardize update message
        r'(?m)^(    -U, --update\s+).+(\n    \s.+)*$',
        r'\1Update this program to the latest version',
    ),
    (  # Headings
        r'(?m)^  (\w.+\n)(    (?=\w))?',
        r'## \1'
@@ -63,12 +74,10 @@ PATCHES = (
    ),
 )
-with open(README_FILE, encoding='utf-8') as f:
+readme = read_file(README_FILE)
    readme = f.read()
-with open(README_FILE, 'w', encoding='utf-8') as f:
+write_file(README_FILE, ''.join((
-    f.write(''.join((
+    take_section(readme, end=f'## {OPTIONS_START}'),
-        take_section(readme, end=f'## {OPTIONS_START}'),
+    functools.reduce(apply_patch, PATCHES, options),
-        functools.reduce(apply_patch, PATCHES, options),
+    take_section(readme, f'# {OPTIONS_END}'),
-        take_section(readme, f'# {OPTIONS_END}'),
+)))
    )))
@@ -7,21 +7,13 @@ import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import optparse
+from devscripts.utils import get_filename_args, write_file
 from yt_dlp.extractor import list_extractor_classes
 def main():
    parser = optparse.OptionParser(usage='%prog OUTFILE.md')
    _, args = parser.parse_args()
    if len(args) != 1:
        parser.error('Expected an output filename')
    out = '\n'.join(ie.description() for ie in list_extractor_classes() if ie.IE_DESC is not False)
-
+    write_file(get_filename_args(), f'# Supported sites\n{out}\n')
    with open(args[0], 'w', encoding='utf-8') as outf:
        outf.write(f'# Supported sites\n{out}\n')
 if __name__ == '__main__':
@@ -1,9 +1,22 @@
 #!/usr/bin/env python3
-import optparse
+# Allow direct execution
 import os
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import os.path
 import re
 from devscripts.utils import (
    compose_functions,
    get_filename_args,
    read_file,
    write_file,
 )
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
@@ -22,25 +35,6 @@ yt\-dlp \- A youtube-dl fork with additional features and patches
 '''
 def main():
    parser = optparse.OptionParser(usage='%prog OUTFILE.md')
    _, args = parser.parse_args()
    if len(args) != 1:
        parser.error('Expected an output filename')
    outfile, = args
    with open(README_FILE, encoding='utf-8') as f:
        readme = f.read()
    readme = filter_excluded_sections(readme)
    readme = move_sections(readme)
    readme = filter_options(readme)
    with open(outfile, 'w', encoding='utf-8') as outf:
        outf.write(PREFIX + readme)
 def filter_excluded_sections(readme):
    EXCLUDED_SECTION_BEGIN_STRING = re.escape('<!-- MANPAGE: BEGIN EXCLUDED SECTION -->')
    EXCLUDED_SECTION_END_STRING = re.escape('<!-- MANPAGE: END EXCLUDED SECTION -->')
@@ -92,5 +86,12 @@ def filter_options(readme):
    return readme.replace(section, options, 1)
 TRANSFORM = compose_functions(filter_excluded_sections, move_sections, filter_options)
 def main():
    write_file(get_filename_args(), PREFIX + TRANSFORM(read_file(README_FILE)))
 if __name__ == '__main__':
    main()
@@ -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
@@ -0,0 +1,36 @@
 #!/usr/bin/env python3
 # Allow direct execution
 import os
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import argparse
 import functools
 import re
 from devscripts.utils import compose_functions, read_file, write_file
 VERSION_FILE = 'yt_dlp/version.py'
 def parse_options():
    parser = argparse.ArgumentParser(description='Set the build variant of the package')
    parser.add_argument('variant', help='Name of the variant')
    parser.add_argument('-M', '--update-message', default=None, help='Message to show in -U')
    return parser.parse_args()
 def property_setter(name, value):
    return functools.partial(re.sub, rf'(?m)^{name}\s*=\s*.+$', f'{name} = {value!r}')
 opts = parse_options()
 transform = compose_functions(
    property_setter('VARIANT', opts.variant),
    property_setter('UPDATE_HINT', opts.update_message)
 )
 write_file(VERSION_FILE, transform(read_file(VERSION_FILE)))
@@ -1,5 +1,10 @@
 #!/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
@@ -11,8 +16,7 @@ import json
 import re
 import urllib.request
-# usage: python3 ./devscripts/update-formulae.py <path-to-formulae-rb> <version>
+from devscripts.utils import read_file, write_file
 # version can be either 0-aligned (yt-dlp version) or normalized (PyPl version)
 filename, version = sys.argv[1:]
@@ -27,11 +31,9 @@ tarball_file = next(x for x in pypi_release['urls'] if x['filename'].endswith('.
 sha256sum = tarball_file['digests']['sha256']
 url = tarball_file['url']
-with open(filename) as r:
+formulae_text = read_file(filename)
    formulae_text = r.read()
 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)
-with open(filename, 'w') as w:
+write_file(filename, formulae_text)
    w.write(formulae_text)
@@ -7,32 +7,35 @@ import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import contextlib
 import subprocess
 import sys
 from datetime import datetime
-with open('yt_dlp/version.py') as f:
+from devscripts.utils import read_version, write_file
    exec(compile(f.read(), 'yt_dlp/version.py', 'exec'))
 old_version = locals()['__version__']
 old_version_list = old_version.split('.')
-old_ver = '.'.join(old_version_list[:3])
+def get_new_version(revision):
-old_rev = old_version_list[3] if len(old_version_list) > 3 else ''
+    version = datetime.utcnow().strftime('%Y.%m.%d')
-ver = datetime.utcnow().strftime("%Y.%m.%d")
+    if revision:
        assert revision.isdigit(), 'Revision must be a number'
    else:
        old_version = read_version().split('.')
        if version.split('.') == old_version[:3]:
            revision = str(int((old_version + [0])[3]) + 1)
-rev = (sys.argv[1:] or [''])[0]  # Use first argument, if present as revision number
+    return f'{version}.{revision}' if revision else version
 if not rev:
    rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
 VERSION = '.'.join((ver, rev)) if rev else ver
-try:
+def get_git_head():
-    sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
+    with contextlib.suppress(Exception):
-    GIT_HEAD = sp.communicate()[0].decode().strip() or None
+        sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
-except Exception:
+        return sp.communicate()[0].decode().strip() or None
-    GIT_HEAD = None
+
 VERSION = get_new_version((sys.argv + [''])[1])
 GIT_HEAD = get_git_head()
 VERSION_FILE = f'''\
 # Autogenerated by devscripts/update-version.py
@@ -40,10 +43,12 @@ VERSION_FILE = f'''\
 __version__ = {VERSION!r}
 RELEASE_GIT_HEAD = {GIT_HEAD!r}
 VARIANT = None
 UPDATE_HINT = None
 '''
-with open('yt_dlp/version.py', 'wt') as f:
+write_file('yt_dlp/version.py', VERSION_FILE)
-    f.write(VERSION_FILE)
+print(f'::set-output name=ytdlp_version::{VERSION}')
 print('::set-output name=ytdlp_version::' + VERSION)
 print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')
@@ -0,0 +1,35 @@
 import argparse
 import functools
 def read_file(fname):
    with open(fname, encoding='utf-8') as f:
        return f.read()
 def write_file(fname, content):
    with open(fname, 'w', encoding='utf-8') as f:
        return f.write(content)
 # 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):
    parser = argparse.ArgumentParser()
    if has_infile:
        parser.add_argument('infile', help='Input file')
    kwargs = {'nargs': '?', 'default': default_outfile} if default_outfile else {}
    parser.add_argument('outfile', **kwargs, help='Output file')
    opts = parser.parse_args()
    if has_infile:
        return opts.infile, opts.outfile
    return opts.outfile
 def compose_functions(*functions):
    return lambda x: functools.reduce(lambda y, f: f(y), functions, x)
@@ -1,11 +1,17 @@
 #!/usr/bin/env python3
 # Allow direct execution
 import os
 import platform
 import sys
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 import platform
 from PyInstaller.__main__ import run as run_pyinstaller
 from devscripts.utils import read_version
 OS_NAME, MACHINE, ARCH = sys.platform, platform.machine(), 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
@@ -13,8 +19,7 @@ if MACHINE in ('x86_64', 'AMD64') or ('i' in MACHINE and '86' in MACHINE):
 def main():
-    opts = parse_options()
+    opts, version = parse_options(), read_version()
    version = read_version('yt_dlp/version.py')
    onedir = '--onedir' in opts or '-D' in opts
    if not onedir and '-F' not in opts and '--onefile' not in opts:
@@ -53,13 +58,6 @@ def parse_options():
    return opts
 # Get the version from yt_dlp/version.py without importing the package
 def read_version(fname):
    with open(fname, encoding='utf-8') as f:
        exec(compile(f.read(), fname, 'exec'))
        return locals()['__version__']
 def exe(onedir):
    """@returns (name, path)"""
    name = '_'.join(filter(None, (
@@ -83,7 +81,7 @@ def version_to_list(version):
 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 = ['test', 'ytdlp_plugins', 'youtube_dl', 'youtube_dlc']
+    excluded_modules = ('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts')
    yield from (f'--hidden-import={module}' for module in dependencies)
    yield '--collect-submodules=websockets'
@@ -10,6 +10,14 @@ 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 =
@@ -31,7 +39,7 @@ setenv =
 [isort]
-py_version = 36
+py_version = 37
 multi_line_output = VERTICAL_HANGING_INDENT
 line_length = 80
 reverse_relative = true
@@ -12,37 +12,26 @@ except ImportError:
    from distutils.core import Command, setup
    setuptools_available = False
 from devscripts.utils import read_file, read_version
-def read(fname):
+VERSION = read_version()
    with open(fname, encoding='utf-8') as f:
        return f.read()
 # Get the version from yt_dlp/version.py without importing the package
 def read_version(fname):
    exec(compile(read(fname), fname, 'exec'))
    return locals()['__version__']
 VERSION = read_version('yt_dlp/version.py')
 DESCRIPTION = 'A youtube-dl fork with additional features and patches'
 LONG_DESCRIPTION = '\n\n'.join((
    'Official repository: <https://github.com/yt-dlp/yt-dlp>',
    '**PS**: Some links in this document will not work since this is a copy of the README.md from Github',
-    read('README.md')))
+    read_file('README.md')))
-REQUIREMENTS = read('requirements.txt').splitlines()
+REQUIREMENTS = read_file('requirements.txt').splitlines()
 def packages():
    if setuptools_available:
-        return find_packages(exclude=('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins'))
+        return find_packages(exclude=('youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts'))
    return [
        'yt_dlp', 'yt_dlp.extractor', 'yt_dlp.downloader', 'yt_dlp.postprocessor', 'yt_dlp.compat',
        'yt_dlp.extractor.anvato_token_generator',
    ]
@@ -121,7 +110,7 @@ class build_lazy_extractors(Command):
        if self.dry_run:
            print('Skipping build of lazy extractors in dry run mode')
            return
-        subprocess.run([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'])
+        subprocess.run([sys.executable, 'devscripts/make_lazy_extractors.py'])
 params = py2exe_params() if sys.argv[1:2] == ['py2exe'] else build_params()
@@ -136,7 +125,7 @@ setup(
    url='https://github.com/yt-dlp/yt-dlp',
    packages=packages(),
    install_requires=REQUIREMENTS,
-    python_requires='>=3.6',
+    python_requires='>=3.7',
    project_urls={
        'Documentation': 'https://github.com/yt-dlp/yt-dlp#readme',
        'Source': 'https://github.com/yt-dlp/yt-dlp',
@@ -148,7 +137,6 @@ setup(
        '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',
@@ -3,11 +3,12 @@
 - **0000studio:clip**
 - **17live**
 - **17live:clip**
 - **1News**: 1news.co.nz article videos
 - **1tv**: Первый канал
 - **20.detik.com**
 - **20min**
 - **23video**
 - **247sports**
 - **24tv.ua**
 - **24video**
 - **3qsdn**: 3Q SDN
 - **3sat**
@@ -18,7 +19,7 @@
 - **8tracks**
 - **91porn**
 - **9c9media**
- - **9gag**
+ - **9gag**: 9GAG
 - **9now.com.au**
 - **abc.net.au**
 - **abc.net.au:iview**
@@ -64,8 +65,8 @@
 - **AmericasTestKitchenSeason**
 - **AmHistoryChannel**
 - **anderetijden**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
 - **Angel**
 - **AnimalPlanet**
 - **AnimeOnDemand**: [<abbr title="netrc machine"><em>animeondemand</em></abbr>]
 - **ant1newsgr:article**: ant1news.gr articles
 - **ant1newsgr:embed**: ant1news.gr embedded videos
 - **ant1newsgr:watch**: ant1news.gr videos
@@ -127,11 +128,14 @@
 - **bbc.co.uk:iplayer:group**
 - **bbc.co.uk:playlist**
 - **BBVTV**: [<abbr title="netrc machine"><em>bbvtv</em></abbr>]
 - **BBVTVLive**: [<abbr title="netrc machine"><em>bbvtv</em></abbr>]
 - **BBVTVRecordings**: [<abbr title="netrc machine"><em>bbvtv</em></abbr>]
 - **Beatport**
 - **Beeg**
 - **BehindKink**
 - **Bellator**
 - **BellMedia**
 - **BerufeTV**
 - **Bet**
 - **bfi:player**
 - **bfmtv**
@@ -145,9 +149,11 @@
 - **Bilibili category extractor**
 - **BilibiliAudio**
 - **BilibiliAudioAlbum**
 - **BilibiliChannel**
 - **BiliBiliPlayer**
 - **BiliBiliSearch**: Bilibili video search; "bilisearch:" prefix
 - **BilibiliSpaceAudio**
 - **BilibiliSpacePlaylist**
 - **BilibiliSpaceVideo**
 - **BiliIntl**: [<abbr title="netrc machine"><em>biliintl</em></abbr>]
 - **BiliIntlSeries**: [<abbr title="netrc machine"><em>biliintl</em></abbr>]
 - **BiliLive**
@@ -165,6 +171,7 @@
 - **Bloomberg**
 - **BokeCC**
 - **BongaCams**
 - **BooyahClips**
 - **BostonGlobe**
 - **Box**
 - **Bpb**: Bundeszentrale für politische Bildung
@@ -177,6 +184,7 @@
 - **BRMediathek**: Bayerischer Rundfunk Mediathek
 - **bt:article**: Bergens Tidende Articles
 - **bt:vestlendingen**: Bergens Tidende - Vestlendingen
 - **Bundesliga**
 - **BusinessInsider**
 - **BuzzFeed**
 - **BYUtv**
@@ -187,6 +195,7 @@
 - **Camdemy**
 - **CamdemyFolder**
 - **CamModels**
 - **CamtasiaEmbed**
 - **CamWithHer**
 - **CanalAlpha**
 - **canalc2.tv**
@@ -232,6 +241,7 @@
 - **Clippit**
 - **ClipRs**
 - **Clipsyndicate**
 - **ClipYouEmbed**
 - **CloserToTruth**
 - **CloudflareStream**
 - **Cloudy**
@@ -243,6 +253,7 @@
 - **CNN**
 - **CNNArticle**
 - **CNNBlogs**
 - **CNNIndonesia**
 - **ComedyCentral**
 - **ComedyCentralTV**
 - **CondeNast**: Condé Nast media group: Allure, Architectural Digest, Ars Technica, Bon Appétit, Brides, Condé Nast, Condé Nast Traveler, Details, Epicurious, GQ, Glamour, Golf Digest, SELF, Teen Vogue, The New Yorker, Vanity Fair, Vogue, W Magazine, WIRED
@@ -299,6 +310,7 @@
 - **defense.gouv.fr**
 - **democracynow**
 - **DestinationAmerica**
 - **DetikEmbed**
 - **DHM**: Filmarchiv - Deutsches Historisches Museum
 - **Digg**
 - **DigitalConcertHall**: [<abbr title="netrc machine"><em>digitalconcerthall</em></abbr>] DigitalConcertHall extractor
@@ -345,6 +357,8 @@
 - **ehftv**
 - **eHow**
 - **EinsUndEinsTV**: [<abbr title="netrc machine"><em>1und1tv</em></abbr>]
 - **EinsUndEinsTVLive**: [<abbr title="netrc machine"><em>1und1tv</em></abbr>]
 - **EinsUndEinsTVRecordings**: [<abbr title="netrc machine"><em>1und1tv</em></abbr>]
 - **Einthusan**
 - **eitb.tv**
 - **EllenTube**
@@ -357,6 +371,7 @@
 - **Engadget**
 - **Epicon**
 - **EpiconSeries**
 - **Epoch**
 - **Eporner**
 - **EroProfile**: [<abbr title="netrc machine"><em>eroprofile</em></abbr>]
 - **EroProfile:album**
@@ -370,13 +385,17 @@
 - **EsriVideo**
 - **Europa**
 - **EuropeanTour**
 - **Eurosport**
 - **EUScreen**
 - **EWETV**: [<abbr title="netrc machine"><em>ewetv</em></abbr>]
 - **EWETVLive**: [<abbr title="netrc machine"><em>ewetv</em></abbr>]
 - **EWETVRecordings**: [<abbr title="netrc machine"><em>ewetv</em></abbr>]
 - **ExpoTV**
 - **Expressen**
 - **ExtremeTube**
 - **EyedoTV**
 - **facebook**: [<abbr title="netrc machine"><em>facebook</em></abbr>]
 - **facebook:reel**
 - **FacebookPluginsVideo**
 - **fancode:live**: [<abbr title="netrc machine"><em>fancode</em></abbr>]
 - **fancode:vod**: [<abbr title="netrc machine"><em>fancode</em></abbr>]
@@ -450,6 +469,8 @@
 - **GiantBomb**
 - **Giga**
 - **GlattvisionTV**: [<abbr title="netrc machine"><em>glattvisiontv</em></abbr>]
 - **GlattvisionTVLive**: [<abbr title="netrc machine"><em>glattvisiontv</em></abbr>]
 - **GlattvisionTVRecordings**: [<abbr title="netrc machine"><em>glattvisiontv</em></abbr>]
 - **Glide**: Glide mobile video messages (glide.me)
 - **Globo**: [<abbr title="netrc machine"><em>globo</em></abbr>]
 - **GloboArticle**
@@ -465,6 +486,7 @@
 - **google:podcasts:feed**
 - **GoogleDrive**
 - **GoogleDrive:Folder**
 - **GoPlay**: [<abbr title="netrc machine"><em>goplay</em></abbr>]
 - **GoPro**
 - **Goshgay**
 - **GoToStage**
@@ -473,6 +495,7 @@
 - **gronkh:feed**
 - **gronkh:vods**
 - **Groupon**
 - **Harpodeon**
 - **hbo**
 - **HearThisAt**
 - **Heise**
@@ -491,6 +514,7 @@
 - **hitbox:live**
 - **HitRecord**
 - **hketv**: 香港教育局教育電視 (HKETV) Educational Television, Hong Kong Educational Bureau
 - **Holodex**
 - **HotNewHipHop**
 - **hotstar**
 - **hotstar:playlist**
@@ -502,6 +526,7 @@
 - **HRTiPlaylist**: [<abbr title="netrc machine"><em>hrti</em></abbr>]
 - **HSEProduct**
 - **HSEShow**
 - **html5**
 - **Huajiao**: 花椒直播
 - **HuffPost**: Huffington Post
 - **Hungama**
@@ -511,11 +536,14 @@
 - **Hypem**
 - **Hytale**
 - **Icareus**
 - **iflix:episode**
 - **IflixSeries**
 - **ign.com**
 - **IGNArticle**
 - **IGNVideo**
 - **IHeartRadio**
 - **iheartradio:podcast**
 - **Iltalehti**
 - **imdb**: Internet Movie Database trailers
 - **imdb:list**: Internet Movie Database lists
 - **Imgur**
@@ -538,6 +566,9 @@
 - **iq.com**: International version of iQiyi
 - **iq.com:album**
 - **iqiyi**: [<abbr title="netrc machine"><em>iqiyi</em></abbr>] 爱奇艺
 - **IslamChannel**
 - **IslamChannelSeries**
 - **IsraelNationalNews**
 - **ITProTV**
 - **ITProTVCourse**
 - **ITTF**
@@ -573,6 +604,7 @@
 - **KickStarter**
 - **KinjaEmbed**
 - **KinoPoisk**
 - **KompasVideo**
 - **KonserthusetPlay**
 - **Koo**
 - **KrasView**: Красвью
@@ -669,6 +701,7 @@
 - **Mediasite**
 - **MediasiteCatalog**
 - **MediasiteNamedCatalog**
 - **MediaWorksNZVOD**
 - **Medici**
 - **megaphone.fm**: megaphone.fm embedded players
 - **megatvcom**: megatv.com videos
@@ -681,6 +714,7 @@
 - **mewatch**
 - **Mgoon**
 - **MiaoPai**
 - **MicrosoftEmbed**
 - **microsoftstream**: Microsoft Stream
 - **mildom**: Record ongoing live by specific user in Mildom
 - **mildom:clip**: Clip in Mildom
@@ -702,10 +736,13 @@
 - **mixcloud:playlist**
 - **mixcloud:user**
 - **MLB**
 - **MLBTV**: [<abbr title="netrc machine"><em>mlb</em></abbr>]
 - **MLBVideo**
 - **MLSSoccer**
 - **Mnet**
 - **MNetTV**: [<abbr title="netrc machine"><em>mnettv</em></abbr>]
 - **MNetTVLive**: [<abbr title="netrc machine"><em>mnettv</em></abbr>]
 - **MNetTVRecordings**: [<abbr title="netrc machine"><em>mnettv</em></abbr>]
 - **MochaVideo**
 - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
 - **Mofosex**
@@ -715,9 +752,11 @@
 - **Motherless**
 - **MotherlessGroup**
 - **Motorsport**: motorsport.com
 - **MotorTrend**
 - **MovieClips**
 - **MovieFap**
 - **Moviepilot**
 - **MoviewPlay**
 - **Moviezine**
 - **MovingImage**
 - **MSN**
@@ -775,6 +814,7 @@
 - **NBCSports**
 - **NBCSportsStream**
 - **NBCSportsVPlayer**
 - **NBCStations**
 - **ndr**: NDR.de - Norddeutscher Rundfunk
 - **ndr:embed**
 - **ndr:embed:base**
@@ -790,13 +830,16 @@
 - **netease:program**: 网易云音乐 - 电台节目
 - **netease:singer**: 网易云音乐 - 歌手
 - **netease:song**: 网易云音乐
- - **NetPlus**: [<abbr title="netrc machine"><em>netplus</em></abbr>]
+ - **NetPlusTV**: [<abbr title="netrc machine"><em>netplus</em></abbr>]
 - **NetPlusTVLive**: [<abbr title="netrc machine"><em>netplus</em></abbr>]
 - **NetPlusTVRecordings**: [<abbr title="netrc machine"><em>netplus</em></abbr>]
 - **Netverse**
 - **NetversePlaylist**
 - **Netzkino**
 - **Newgrounds**
 - **Newgrounds:playlist**
 - **Newgrounds:user**
 - **NewsPicks**
 - **Newstube**
 - **Newsy**
 - **NextMedia**: 蘋果日報
@@ -806,8 +849,8 @@
 - **NexxEmbed**
 - **NFB**
 - **NFHSNetwork**
- - **nfl.com**: (**Currently broken**)
+ - **nfl.com**
- - **nfl.com:article**: (**Currently broken**)
+ - **nfl.com:article**
 - **NhkForSchoolBangumi**
 - **NhkForSchoolProgramList**
 - **NhkForSchoolSubject**: Portal page for each school subjects, like Japanese (kokugo, 国語) or math (sansuu/suugaku or 算数・数学)
@@ -890,22 +933,13 @@
 - **openrec:capture**
 - **openrec:movie**
 - **OraTV**
 - **orf:burgenland**: Radio Burgenland
 - **orf:fm4**: radio FM4
 - **orf:fm4:story**: fm4.orf.at stories
 - **orf:iptv**: iptv.ORF.at
- - **orf:kaernten**: Radio Kärnten
+ - **orf:radio**
 - **orf:noe**: Radio Niederösterreich
 - **orf:oberoesterreich**: Radio Oberösterreich
 - **orf:oe1**: Radio Österreich 1
 - **orf:oe3**: Radio Österreich 3
 - **orf:salzburg**: Radio Salzburg
 - **orf:steiermark**: Radio Steiermark
 - **orf:tirol**: Radio Tirol
 - **orf:tvthek**: ORF TVthek
 - **orf:vorarlberg**: Radio Vorarlberg
 - **orf:wien**: Radio Wien
 - **OsnatelTV**: [<abbr title="netrc machine"><em>osnateltv</em></abbr>]
 - **OsnatelTVLive**: [<abbr title="netrc machine"><em>osnateltv</em></abbr>]
 - **OsnatelTVRecordings**: [<abbr title="netrc machine"><em>osnateltv</em></abbr>]
 - **OutsideTV**
 - **PacktPub**: [<abbr title="netrc machine"><em>packtpub</em></abbr>]
 - **PacktPubCourse**
@@ -919,10 +953,11 @@
 - **ParamountNetwork**
 - **ParamountPlus**
 - **ParamountPlusSeries**
 - **Parler**: Posts on parler.com
 - **parliamentlive.tv**: UK parliament videos
 - **Parlview**
 - **Patreon**
- - **PatreonUser**
+ - **PatreonCampaign**
 - **pbs**: Public Broadcasting Service (PBS) and member stations: PBS: Public Broadcasting Service, APT - Alabama Public Television (WBIQ), GPB/Georgia Public Broadcasting (WGTV), Mississippi Public Broadcasting (WMPN), Nashville Public Television (WNPT), WFSU-TV (WFSU), WSRE (WSRE), WTCI (WTCI), WPBA/Channel 30 (WPBA), Alaska Public Media (KAKM), Arizona PBS (KAET), KNME-TV/Channel 5 (KNME), Vegas PBS (KLVX), AETN/ARKANSAS ETV NETWORK (KETS), KET (WKLE), WKNO/Channel 10 (WKNO), LPB/LOUISIANA PUBLIC BROADCASTING (WLPB), OETA (KETA), Ozarks Public Television (KOZK), WSIU Public Broadcasting (WSIU), KEET TV (KEET), KIXE/Channel 9 (KIXE), KPBS San Diego (KPBS), KQED (KQED), KVIE Public Television (KVIE), PBS SoCal/KOCE (KOCE), ValleyPBS (KVPT), CONNECTICUT PUBLIC TELEVISION (WEDH), KNPB Channel 5 (KNPB), SOPTV (KSYS), Rocky Mountain PBS (KRMA), KENW-TV3 (KENW), KUED Channel 7 (KUED), Wyoming PBS (KCWC), Colorado Public Television / KBDI 12 (KBDI), KBYU-TV (KBYU), Thirteen/WNET New York (WNET), WGBH/Channel 2 (WGBH), WGBY (WGBY), NJTV Public Media NJ (WNJT), WLIW21 (WLIW), mpt/Maryland Public Television (WMPB), WETA Television and Radio (WETA), WHYY (WHYY), PBS 39 (WLVT), WVPT - Your Source for PBS and More! (WVPT), Howard University Television (WHUT), WEDU PBS (WEDU), WGCU Public Media (WGCU), WPBT2 (WPBT), WUCF TV (WUCF), WUFT/Channel 5 (WUFT), WXEL/Channel 42 (WXEL), WLRN/Channel 17 (WLRN), WUSF Public Broadcasting (WUSF), ETV (WRLK), UNC-TV (WUNC), PBS Hawaii - Oceanic Cable Channel 10 (KHET), Idaho Public Television (KAID), KSPS (KSPS), OPB (KOPB), KWSU/Channel 10 & KTNW/Channel 31 (KWSU), WILL-TV (WILL), Network Knowledge - WSEC/Springfield (WSEC), WTTW11 (WTTW), Iowa Public Television/IPTV (KDIN), Nine Network (KETC), PBS39 Fort Wayne (WFWA), WFYI Indianapolis (WFYI), Milwaukee Public Television (WMVS), WNIN (WNIN), WNIT Public Television (WNIT), WPT (WPNE), WVUT/Channel 22 (WVUT), WEIU/Channel 51 (WEIU), WQPT-TV (WQPT), WYCC PBS Chicago (WYCC), WIPB-TV (WIPB), WTIU (WTIU), CET  (WCET), ThinkTVNetwork (WPTD), WBGU-TV (WBGU), WGVU TV (WGVU), NET1 (KUON), Pioneer Public Television (KWCM), SDPB Television (KUSD), TPT (KTCA), KSMQ (KSMQ), KPTS/Channel 8 (KPTS), KTWU/Channel 11 (KTWU), East Tennessee PBS (WSJK), WCTE-TV (WCTE), WLJT, Channel 11 (WLJT), WOSU TV (WOSU), WOUB/WOUC (WOUB), WVPB (WVPB), WKYU-PBS (WKYU), KERA 13 (KERA), MPBN (WCBB), Mountain Lake PBS (WCFE), NHPTV (WENH), Vermont PBS (WETK), witf (WITF), WQED Multimedia (WQED), WMHT Educational Telecommunications (WMHT), Q-TV (WDCQ), WTVS Detroit Public TV (WTVS), CMU Public Television (WCMU), WKAR-TV (WKAR), WNMU-TV Public TV 13 (WNMU), WDSE - WRPT (WDSE), WGTE TV (WGTE), Lakeland Public Television (KAWE), KMOS-TV - Channels 6.1, 6.2 and 6.3 (KMOS), MontanaPBS (KUSM), KRWG/Channel 22 (KRWG), KACV (KACV), KCOS/Channel 13 (KCOS), WCNY/Channel 24 (WCNY), WNED (WNED), WPBS (WPBS), WSKG Public TV (WSKG), WXXI (WXXI), WPSU (WPSU), WVIA Public Media Studios (WVIA), WTVI (WTVI), Western Reserve PBS (WNEO), WVIZ/PBS ideastream (WVIZ), KCTS 9 (KCTS), Basin PBS (KPBT), KUHT / Channel 8 (KUHT), KLRN (KLRN), KLRU (KLRU), WTJX Channel 12 (WTJX), WCVE PBS (WCVE), KBTC Public Television (KBTC)
 - **PearVideo**
 - **PeekVids**
@@ -993,6 +1028,7 @@
 - **PornoVoisines**
 - **PornoXO**
 - **PornTube**
 - **PrankCast**
 - **PremiershipRugby**
 - **PressTV**
 - **ProjectVeritas**
@@ -1012,6 +1048,8 @@
 - **qqmusic:singer**: QQ音乐 - 歌手
 - **qqmusic:toplist**: QQ音乐 - 排行榜
 - **QuantumTV**: [<abbr title="netrc machine"><em>quantumtv</em></abbr>]
 - **QuantumTVLive**: [<abbr title="netrc machine"><em>quantumtv</em></abbr>]
 - **QuantumTVRecordings**: [<abbr title="netrc machine"><em>quantumtv</em></abbr>]
 - **Qub**
 - **R7**
 - **R7Article**
@@ -1030,12 +1068,14 @@
 - **radlive:channel**
 - **radlive:season**
 - **Rai**
 - **RaiNews**
 - **RaiPlay**
 - **RaiPlayLive**
 - **RaiPlayPlaylist**
 - **RaiPlaySound**
 - **RaiPlaySoundLive**
 - **RaiPlaySoundPlaylist**
 - **RaiSudtirol**
 - **RayWenderlich**
 - **RayWenderlichCourse**
 - **RBMARadio**
@@ -1072,7 +1112,7 @@
 - **RoosterTeethSeries**: [<abbr title="netrc machine"><em>roosterteeth</em></abbr>]
 - **RottenTomatoes**
 - **Rozhlas**
- - **RTBF**
+ - **RTBF**: [<abbr title="netrc machine"><em>rtbf</em></abbr>]
 - **RTDocumentry**
 - **RTDocumentryPlaylist**
 - **rte**: Raidió Teilifís Éireann TV
@@ -1118,7 +1158,11 @@
 - **safari:course**: [<abbr title="netrc machine"><em>safari</em></abbr>] safaribooksonline.com online courses
 - **Saitosan**
 - **SAKTV**: [<abbr title="netrc machine"><em>saktv</em></abbr>]
 - **SAKTVLive**: [<abbr title="netrc machine"><em>saktv</em></abbr>]
 - **SAKTVRecordings**: [<abbr title="netrc machine"><em>saktv</em></abbr>]
 - **SaltTV**: [<abbr title="netrc machine"><em>salttv</em></abbr>]
 - **SaltTVLive**: [<abbr title="netrc machine"><em>salttv</em></abbr>]
 - **SaltTVRecordings**: [<abbr title="netrc machine"><em>salttv</em></abbr>]
 - **SampleFocus**
 - **Sapo**: SAPO Vídeos
 - **savefrom.net**
@@ -1144,6 +1188,7 @@
 - **Shahid**: [<abbr title="netrc machine"><em>shahid</em></abbr>]
 - **ShahidShow**
 - **Shared**: shared.sx
 - **ShareVideosEmbed**
 - **ShemarooMe**
 - **ShowRoomLive**
 - **simplecast**
@@ -1164,6 +1209,7 @@
 - **Slideshare**
 - **SlidesLive**
 - **Slutload**
 - **Smotrim**
 - **Snotr**
 - **Sohu**
 - **SonyLIV**: [<abbr title="netrc machine"><em>sonyliv</em></abbr>]
@@ -1193,8 +1239,8 @@
 - **Sport5**
 - **SportBox**
 - **SportDeutschland**
- - **spotify**: Spotify episodes
+ - **spotify**: Spotify episodes (**Currently broken**)
- - **spotify:show**: Spotify shows
+ - **spotify:show**: Spotify shows (**Currently broken**)
 - **Spreaker**
 - **SpreakerPage**
 - **SpreakerShow**
@@ -1268,6 +1314,7 @@
 - **TeleQuebecVideo**
 - **TeleTask**
 - **Telewebion**
 - **Tempo**
 - **TennisTV**: [<abbr title="netrc machine"><em>tennistv</em></abbr>]
 - **TenPlay**: [<abbr title="netrc machine"><em>10play</em></abbr>]
 - **TF1**
@@ -1287,10 +1334,10 @@
 - **ThreeSpeak**
 - **ThreeSpeakUser**
 - **TikTok**
- - **tiktok:effect**
+ - **tiktok:effect**: (**Currently broken**)
- - **tiktok:sound**
+ - **tiktok:sound**: (**Currently broken**)
- - **tiktok:tag**
+ - **tiktok:tag**: (**Currently broken**)
- - **tiktok:user**
+ - **tiktok:user**: (**Currently broken**)
 - **tinypic**: tinypic.com videos
 - **TLC**
 - **TMZ**
@@ -1306,6 +1353,8 @@
 - **ToypicsUser**: Toypics user profile
 - **TrailerAddict**: (**Currently broken**)
 - **TravelChannel**
 - **Triller**: [<abbr title="netrc machine"><em>triller</em></abbr>]
 - **TrillerUser**: [<abbr title="netrc machine"><em>triller</em></abbr>]
 - **Trilulilu**
 - **Trovo**
 - **TrovoChannelClip**: All Clips of a trovo.live channel; "trovoclip:" prefix
@@ -1313,6 +1362,7 @@
 - **TrovoVod**
 - **TrueID**
 - **TruNews**
 - **Truth**
 - **TruTV**
 - **Tube8**
 - **TubeTuGraz**: [<abbr title="netrc machine"><em>tubetugraz</em></abbr>] tube.tugraz.at
@@ -1328,6 +1378,7 @@
 - **Turbo**
 - **tv.dfb.de**
 - **TV2**
 - **TV24UAGenericPassthrough**
 - **TV2Article**
 - **TV2DK**
 - **TV2DKBornholmPlay**
@@ -1390,6 +1441,7 @@
 - **umg:de**: Universal Music Deutschland
 - **Unistra**
 - **Unity**
 - **UnscriptedNewsVideo**
 - **uol.com.br**
 - **uplynk**
 - **uplynk:preplay**
@@ -1434,8 +1486,6 @@
 - **VidioLive**: [<abbr title="netrc machine"><em>vidio</em></abbr>]
 - **VidioPremier**: [<abbr title="netrc machine"><em>vidio</em></abbr>]
 - **VidLii**
 - **vier**: [<abbr title="netrc machine"><em>vier</em></abbr>] vier.be and vijf.be
 - **vier:videos**
 - **viewlift**
 - **viewlift:embed**
 - **Viidea**
@@ -1480,6 +1530,8 @@
 - **VoxMedia**
 - **VoxMediaVolume**
 - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
 - **vqq:series**
 - **vqq:video**
 - **Vrak**
 - **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
 - **VrtNU**: [<abbr title="netrc machine"><em>vrtnu</em></abbr>] VrtNU.be
@@ -1488,6 +1540,8 @@
 - **VShare**
 - **VTM**
 - **VTXTV**: [<abbr title="netrc machine"><em>vtxtv</em></abbr>]
 - **VTXTVLive**: [<abbr title="netrc machine"><em>vtxtv</em></abbr>]
 - **VTXTVRecordings**: [<abbr title="netrc machine"><em>vtxtv</em></abbr>]
 - **VuClip**
 - **Vupload**
 - **VVVVID**
@@ -1497,6 +1551,8 @@
 - **Wakanim**
 - **Walla**
 - **WalyTV**: [<abbr title="netrc machine"><em>walytv</em></abbr>]
 - **WalyTVLive**: [<abbr title="netrc machine"><em>walytv</em></abbr>]
 - **WalyTVRecordings**: [<abbr title="netrc machine"><em>walytv</em></abbr>]
 - **wasdtv:clip**
 - **wasdtv:record**
 - **wasdtv:stream**
@@ -1525,8 +1581,10 @@
 - **Willow**
 - **WimTV**
 - **Wistia**
 - **WistiaChannel**
 - **WistiaPlaylist**
 - **wnl**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
 - **wordpress:playlist**
 - **WorldStarHipHop**
 - **wppilot**
 - **wppilot:channels**
@@ -1583,13 +1641,14 @@
 - **youtube:clip**
 - **youtube:favorites**: YouTube liked videos; ":ytfav" keyword (requires cookies)
 - **youtube:history**: Youtube watch history; ":ythis" keyword (requires cookies)
- - **youtube:music:search_url**: YouTube music search URLs with selectable sections (Eg: #songs)
+ - **youtube:music:search_url**: YouTube music search URLs with selectable sections, e.g. #songs
 - **youtube:notif**: YouTube notifications; ":ytnotif" keyword (requires cookies)
 - **youtube:playlist**: YouTube playlists
 - **youtube:recommended**: YouTube recommended videos; ":ytrec" keyword
 - **youtube:search**: YouTube search; "ytsearch:" prefix
 - **youtube:search:date**: YouTube search, newest videos first; "ytsearchdate:" prefix
 - **youtube:search_url**: YouTube search URLs with sorting and filter support
 - **youtube:shorts:pivot:audio**: YouTube Shorts audio pivot (Shorts using audio of a given video)
 - **youtube:stories**: YouTube channel stories; "ytstories:" prefix
 - **youtube:subscriptions**: YouTube subscriptions feed; ":ytsubs" keyword (requires cookies)
 - **youtube:tab**: YouTube Tabs
@@ -92,6 +92,13 @@ def gettestcases(include_onlymatching=False):
        yield from ie.get_testcases(include_onlymatching)
 def getwebpagetestcases():
    for ie in yt_dlp.extractor.gen_extractors():
        for tc in ie.get_webpage_testcases():
            tc.setdefault('add_ie', []).append('Generic')
            yield tc
 md5 = lambda s: hashlib.md5(s.encode()).hexdigest()
@@ -1567,6 +1567,292 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                    ]
                },
            ),
            (
                'ec-3_test',
                'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                [{
                    'format_id': 'audio_deu_1-224',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'isma',
                    'tbr': 224,
                    'asr': 48000,
                    'vcodec': 'none',
                    'acodec': 'EC-3',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'audio',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 0,
                        'height': 0,
                        'fourcc': 'EC-3',
                        'language': 'deu',
                        'codec_private_data': '00063F000000AF87FBA7022DFB42A4D405CD93843BDD0700200F00',
                        'sampling_rate': 48000,
                        'channels': 6,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'audio_ext': 'isma',
                    'video_ext': 'none',
                    'abr': 224,
                }, {
                    'format_id': 'audio_deu-127',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'isma',
                    'tbr': 127,
                    'asr': 48000,
                    'vcodec': 'none',
                    'acodec': 'AACL',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'audio',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 0,
                        'height': 0,
                        'fourcc': 'AACL',
                        'language': 'deu',
                        'codec_private_data': '1190',
                        'sampling_rate': 48000,
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'audio_ext': 'isma',
                    'video_ext': 'none',
                    'abr': 127,
                }, {
                    'format_id': 'video_deu-23',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 384,
                    'height': 216,
                    'tbr': 23,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 384,
                        'height': 216,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '000000016742C00CDB06077E5C05A808080A00000300020000030009C0C02EE0177CC6300F142AE00000000168CA8DC8',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 23,
                }, {
                    'format_id': 'video_deu-403',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 400,
                    'height': 224,
                    'tbr': 403,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 400,
                        'height': 224,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D4014E98323B602D4040405000003000100000300320F1429380000000168EAECF2',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 403,
                }, {
                    'format_id': 'video_deu-680',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 640,
                    'height': 360,
                    'tbr': 680,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 640,
                        'height': 360,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 680,
                }, {
                    'format_id': 'video_deu-1253',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 640,
                    'height': 360,
                    'tbr': 1253,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 640,
                        'height': 360,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D401EE981405FF2E02D4040405000000300100000030320F162D3800000000168EAECF2',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 1253,
                }, {
                    'format_id': 'video_deu-2121',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 768,
                    'height': 432,
                    'tbr': 2121,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 768,
                        'height': 432,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D401EECA0601BD80B50101014000003000400000300C83C58B6580000000168E93B3C80',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 2121,
                }, {
                    'format_id': 'video_deu-3275',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 1280,
                    'height': 720,
                    'tbr': 3275,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 1280,
                        'height': 720,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D4020ECA02802DD80B501010140000003004000000C83C60C65800000000168E93B3C80',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 3275,
                }, {
                    'format_id': 'video_deu-5300',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 1920,
                    'height': 1080,
                    'tbr': 5300,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 1920,
                        'height': 1080,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 5300,
                }, {
                    'format_id': 'video_deu-8079',
                    'url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'manifest_url': 'https://smstr01.dmm.t-online.de/smooth24/smoothstream_m1/streaming/sony/9221438342941275747/636887760842957027/25_km_h-Trailer-9221571562372022953_deu_20_1300k_HD_H_264_ISMV.ism/Manifest',
                    'ext': 'ismv',
                    'width': 1920,
                    'height': 1080,
                    'tbr': 8079,
                    'vcodec': 'AVC1',
                    'acodec': 'none',
                    'protocol': 'ism',
                    '_download_params':
                    {
                        'stream_type': 'video',
                        'duration': 370000000,
                        'timescale': 10000000,
                        'width': 1920,
                        'height': 1080,
                        'fourcc': 'AVC1',
                        'language': 'deu',
                        'codec_private_data': '00000001674D4028ECA03C0113F2E02D4040405000000300100000030320F18319600000000168E93B3C80',
                        'channels': 2,
                        'bits_per_sample': 16,
                        'nal_unit_length_field': 4
                    },
                    'video_ext': 'ismv',
                    'audio_ext': 'none',
                    'vbr': 8079,
                }],
                {},
            ),
        ]
        for ism_file, ism_url, expected_formats, expected_subtitles in _TEST_CASES:
@@ -662,13 +662,17 @@ class TestYoutubeDL(unittest.TestCase):
        'playlist_autonumber': 2,
        '__last_playlist_index': 100,
        'n_entries': 10,
-        'formats': [{'id': 'id 1'}, {'id': 'id 2'}, {'id': 'id 3'}]
+        'formats': [
            {'id': 'id 1', 'height': 1080, 'width': 1920},
            {'id': 'id 2', 'height': 720},
            {'id': 'id 3'}
        ]
    }
    def test_prepare_outtmpl_and_filename(self):
        def test(tmpl, expected, *, info=None, **params):
            params['outtmpl'] = tmpl
-            ydl = YoutubeDL(params)
+            ydl = FakeYDL(params)
            ydl._num_downloads = 1
            self.assertEqual(ydl.validate_outtmpl(tmpl), None)
@@ -722,13 +726,14 @@ class TestYoutubeDL(unittest.TestCase):
        test('%(id)s', '-abcd', info={'id': '-abcd'})
        test('%(id)s', '.abcd', info={'id': '.abcd'})
        test('%(id)s', 'ab__cd', info={'id': 'ab__cd'})
-        test('%(id)s', ('ab:cd', 'ab -cd'), info={'id': 'ab:cd'})
+        test('%(id)s', ('ab:cd', 'ab：cd'), info={'id': 'ab:cd'})
        test('%(id.0)s', '-', info={'id': '--'})
        # Invalid templates
        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):
@@ -770,7 +775,7 @@ class TestYoutubeDL(unittest.TestCase):
        test('a%(width|)d', 'a', outtmpl_na_placeholder='none')
        FORMATS = self.outtmpl_info['formats']
-        sanitize = lambda x: x.replace(':', ' -').replace('"', "'").replace('\n', ' ')
+        sanitize = lambda x: x.replace(':', '：').replace('"', "＂").replace('\n', ' ')
        # Custom type casting
        test('%(formats.:.id)l', 'id 1, id 2, id 3')
@@ -788,13 +793,13 @@ class TestYoutubeDL(unittest.TestCase):
        test('%(filesize)#D', '1Ki')
        test('%(height)5.2D', ' 1.08k')
        test('%(title4)#S', 'foo_bar_test')
-        test('%(title4).10S', ('foo \'bar\' ', 'foo \'bar\'' + ('#' if compat_os_name == 'nt' else ' ')))
+        test('%(title4).10S', ('foo ＂bar＂ ', 'foo ＂bar＂' + ('#' if compat_os_name == 'nt' else ' ')))
        if compat_os_name == 'nt':
-            test('%(title4)q', ('"foo \\"bar\\" test"', "'foo _'bar_' test'"))
+            test('%(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.:.id)#q', ('"id 1" "id 2" "id 3"', '＂id 1＂ ＂id 2＂ ＂id 3＂'))
-            test('%(formats.0.id)#q', ('"id 1"', "'id 1'"))
+            test('%(formats.0.id)#q', ('"id 1"', '＂id 1＂'))
        else:
-            test('%(title4)q', ('\'foo "bar" test\'', "'foo 'bar' test'"))
+            test('%(title4)q', ('\'foo "bar" test\'', '\'foo ＂bar＂ test\''))
            test('%(formats.:.id)#q', "'id 1' 'id 2' 'id 3'")
            test('%(formats.0.id)#q', "'id 1'")
@@ -813,6 +818,12 @@ class TestYoutubeDL(unittest.TestCase):
        test('%(formats.:2:-1)r', repr(FORMATS[:2:-1]))
        test('%(formats.0.id.-1+id)f', '1235.000000')
        test('%(formats.0.id.-1+formats.1.id.-1)d', '3')
        out = json.dumps([{'id': f['id'], 'height.:2': str(f['height'])[:2]}
                          if 'height' in f else {'id': f['id']}
                          for f in FORMATS])
        test('%(formats.:.{id,height.:2})j', (out, sanitize(out)))
        test('%(formats.:.{id,height}.id)l', ', '.join(f['id'] for f in FORMATS))
        test('%(.{id,title})j', ('{"id": "1234"}', '{＂id＂： ＂1234＂}'))
        # Alternates
        test('%(title,id)s', '1234')
@@ -852,8 +863,8 @@ class TestYoutubeDL(unittest.TestCase):
        # Path expansion and escaping
        test('Hello %(title1)s', 'Hello $PATH')
        test('Hello %(title2)s', 'Hello %PATH%')
-        test('%(title3)s', ('foo/bar\\test', 'foo_bar_test'))
+        test('%(title3)s', ('foo/bar\\test', 'foo⧸bar⧹test'))
-        test('folder/%(title3)s', ('folder/foo/bar\\test', 'folder%sfoo_bar_test' % os.path.sep))
+        test('folder/%(title3)s', ('folder/foo/bar\\test', 'folder%sfoo⧸bar⧹test' % os.path.sep))
    def test_format_note(self):
        ydl = YoutubeDL()
@@ -28,7 +28,8 @@ class TestCompat(unittest.TestCase):
        with self.assertWarns(DeprecationWarning):
            compat.WINDOWS_VT_MODE
-        compat.asyncio.events  # Must not raise error
+        # TODO: Test submodule
        # compat.asyncio.events  # Must not raise error
    def test_compat_expanduser(self):
        old_home = os.environ.get('HOME')
@@ -3,6 +3,7 @@ from datetime import datetime, timezone
 from yt_dlp import cookies
 from yt_dlp.cookies import (
    LenientSimpleCookie,
    LinuxChromeCookieDecryptor,
    MacChromeCookieDecryptor,
    WindowsChromeCookieDecryptor,
@@ -137,3 +138,148 @@ 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"},
            ),
            (
                "Continue after non-flag attribute without value",
                "a=b; path; Version=1; c=d",
                {"a": "b", "c": "d"},
            ),
        )
@@ -8,6 +8,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import collections
 import hashlib
 import http.client
 import json
@@ -20,6 +21,7 @@ from test.helper import (
    expect_warnings,
    get_params,
    gettestcases,
    getwebpagetestcases,
    is_download_test,
    report_warning,
    try_rm,
@@ -32,6 +34,7 @@ from yt_dlp.utils import (
    ExtractorError,
    UnavailableVideoError,
    format_bytes,
    join_nonempty,
 )
 RETRIES = 3
@@ -57,7 +60,9 @@ def _file_md5(fn):
        return hashlib.md5(f.read()).hexdigest()
-defs = gettestcases()
+normal_test_cases = gettestcases()
 webpage_test_cases = getwebpagetestcases()
 tests_counter = collections.defaultdict(collections.Counter)
@is_download_test
@@ -72,24 +77,13 @@ class TestDownload(unittest.TestCase):
    def __str__(self):
        """Identify each test with the `add_ie` attribute, if available."""
        cls, add_ie = type(self), getattr(self, self._testMethodName).add_ie
        return f'{self._testMethodName} ({cls.__module__}.{cls.__name__}){f" [{add_ie}]" if add_ie else ""}:'
        def strclass(cls):
            """From 2.7's unittest; 2.6 had _strclass so we can't import it."""
            return f'{cls.__module__}.{cls.__name__}'
        add_ie = getattr(self, self._testMethodName).add_ie
        return '%s (%s)%s:' % (self._testMethodName,
                               strclass(self.__class__),
                               ' [%s]' % add_ie if add_ie else '')
    def setUp(self):
        self.defs = defs
 # Dynamically generate tests
 def generator(test_case, tname):
    def test_template(self):
        if self.COMPLETED_TESTS.get(tname):
            return
@@ -111,11 +105,11 @@ def generator(test_case, tname):
            info_dict = tc.get('info_dict', {})
            params = tc.get('params', {})
            if not info_dict.get('id'):
-                raise Exception('Test definition incorrect. \'id\' key is not present')
+                raise Exception(f'Test {tname} definition incorrect - "id" key is not present')
            elif not info_dict.get('ext'):
                if params.get('skip_download') and params.get('ignore_no_formats_error'):
                    continue
-                raise Exception('Test definition incorrect. The output file cannot be known. \'ext\' key is not present')
+                raise Exception(f'Test {tname} definition incorrect - "ext" key must be present to define the output file')
        if 'skip' in test_case:
            print_skipping(test_case['skip'])
@@ -167,7 +161,9 @@ 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 err.exc_info[0] 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):
+                    if (err.exc_info[0] not in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine)
                            or (err.exc_info[0] == urllib.error.HTTPError and err.exc_info[1].code == 503)):
                        err.msg = f'{getattr(err, "msg", err)} ({tname})'
                        raise
                    if try_num == RETRIES:
@@ -255,39 +251,43 @@ def generator(test_case, tname):
 # And add them to TestDownload
-tests_counter = {}
+def inject_tests(test_cases, label=''):
-for test_case in defs:
+    for test_case in test_cases:
-    name = test_case['name']
+        name = test_case['name']
-    i = tests_counter.get(name, 0)
+        tname = join_nonempty('test', name, label, tests_counter[name][label], delim='_')
-    tests_counter[name] = i + 1
+        tests_counter[name][label] += 1
-    tname = f'test_{name}_{i}' if i else f'test_{name}'
+
-    test_method = generator(test_case, tname)
+        test_method = generator(test_case, tname)
-    test_method.__name__ = str(tname)
+        test_method.__name__ = tname
-    ie_list = test_case.get('add_ie')
+        test_method.add_ie = ','.join(test_case.get('add_ie', []))
-    test_method.add_ie = ie_list and ','.join(ie_list)
+        setattr(TestDownload, test_method.__name__, test_method)
    setattr(TestDownload, test_method.__name__, test_method)
    del test_method
-def batch_generator(name, num_tests):
+inject_tests(normal_test_cases)
 # TODO: disable redirection to the IE to ensure we are actually testing the webpage extraction
 inject_tests(webpage_test_cases, 'webpage')
 def batch_generator(name):
    def test_template(self):
-        for i in range(num_tests):
+        for label, num_tests in tests_counter[name].items():
-            test_name = f'test_{name}_{i}' if i else f'test_{name}'
+            for i in range(num_tests):
-            try:
+                test_name = join_nonempty('test', name, label, i, delim='_')
-                getattr(self, test_name)()
+                try:
-            except unittest.SkipTest:
+                    getattr(self, test_name)()
-                print(f'Skipped {test_name}')
+                except unittest.SkipTest:
                    print(f'Skipped {test_name}')
    return test_template
-for name, num_tests in tests_counter.items():
+for name in tests_counter:
-    test_method = batch_generator(name, num_tests)
+    test_method = batch_generator(name)
    test_method.__name__ = f'test_{name}_all'
    test_method.add_ie = ''
    setattr(TestDownload, test_method.__name__, test_method)
-    del test_method
+del test_method
 if __name__ == '__main__':
@@ -95,8 +95,8 @@ class TestHttpFD(unittest.TestCase):
        try_rm(encodeFilename(filename))
        self.assertTrue(downloader.real_download(filename, {
            'url': 'http://127.0.0.1:%d/%s' % (self.port, ep),
-        }))
+        }), ep)
-        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
+        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE, ep)
        try_rm(encodeFilename(filename))
    def download_all(self, params):
@@ -11,41 +11,46 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import contextlib
 import subprocess
-from yt_dlp.utils import encodeArgument
+from yt_dlp.utils import Popen
 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 test_import(self):
+    def run_yt_dlp(self, exe=(sys.executable, 'yt_dlp/__main__.py'), opts=('--version', )):
-        subprocess.check_call([sys.executable, '-c', 'import yt_dlp'], cwd=rootDir)
+        stdout, stderr, returncode = Popen.run(
-
+            [*exe, '--ignore-config', *opts], cwd=rootDir, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    def test_module_exec(self):
+        print(stderr, file=sys.stderr)
-        subprocess.check_call([sys.executable, '-m', 'yt_dlp', '--ignore-config', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        self.assertEqual(returncode, 0)
        return stdout.strip(), stderr.strip()
    def test_main_exec(self):
-        subprocess.check_call([sys.executable, 'yt_dlp/__main__.py', '--ignore-config', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        self.run_yt_dlp()
    def test_import(self):
        self.run_yt_dlp(exe=(sys.executable, '-c', 'import yt_dlp'))
    def test_module_exec(self):
        self.run_yt_dlp(exe=(sys.executable, '-m', 'yt_dlp'))
    def test_cmdline_umlauts(self):
-        p = subprocess.Popen(
+        _, stderr = self.run_yt_dlp(opts=('ä', '--version'))
            [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', 'yt_dlp/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
+            subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', LAZY_EXTRACTORS],
-            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
+                                  cwd=rootDir, stdout=subprocess.DEVNULL)
            self.assertTrue(os.path.exists(LAZY_EXTRACTORS))
            _, stderr = self.run_yt_dlp(opts=('-s', 'test:'))
            self.assertFalse(stderr)
            subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=subprocess.DEVNULL)
        finally:
            with contextlib.suppress(OSError):
-                os.remove('yt_dlp/extractor/lazy_extractors.py')
+                os.remove(LAZY_EXTRACTORS)
 if __name__ == '__main__':
@@ -85,7 +85,7 @@ class TestHTTPS(unittest.TestCase):
        ydl = YoutubeDL({'logger': FakeLogger(), 'nocheckcertificate': True})
        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
-        self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
+        self.assertEqual(r['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
 class TestClientCert(unittest.TestCase):
@@ -113,7 +113,7 @@ class TestClientCert(unittest.TestCase):
            **params,
        })
        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
-        self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % 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'))
@@ -7,8 +7,10 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 import math
 import re
-from yt_dlp.jsinterp import JSInterpreter
+from yt_dlp.jsinterp import JS_Undefined, JSInterpreter
 class TestJSInterpreter(unittest.TestCase):
@@ -19,6 +21,9 @@ class TestJSInterpreter(unittest.TestCase):
        jsi = JSInterpreter('function x3(){return 42;}')
        self.assertEqual(jsi.call_function('x3'), 42)
        jsi = JSInterpreter('function x3(){42}')
        self.assertEqual(jsi.call_function('x3'), None)
        jsi = JSInterpreter('var x5 = function(){return 42;}')
        self.assertEqual(jsi.call_function('x5'), 42)
@@ -45,14 +50,32 @@ class TestJSInterpreter(unittest.TestCase):
        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)
        jsi = JSInterpreter('function f(){return "life, the universe and everything" < 42;}')
        self.assertFalse(jsi.call_function('f'))
    def test_array_access(self):
-        jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2] = 7; return x;}')
+        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):
@@ -62,6 +85,10 @@ class TestJSInterpreter(unittest.TestCase):
        jsi = JSInterpreter('function f(){return (1 + 2) * 3;}')
        self.assertEqual(jsi.call_function('f'), 9)
    def test_quotes(self):
        jsi = JSInterpreter(R'function f(){return "a\"\\("}')
        self.assertEqual(jsi.call_function('f'), R'a"\(')
    def test_assignments(self):
        jsi = JSInterpreter('function f(){var x = 20; x = 30 + 1; return x;}')
        self.assertEqual(jsi.call_function('f'), 31)
@@ -104,17 +131,33 @@ class TestJSInterpreter(unittest.TestCase):
        }''')
        self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
    def test_builtins(self):
        jsi = JSInterpreter('''
        function x() { return NaN }
        ''')
        self.assertTrue(math.isnan(jsi.call_function('x')))
        jsi = JSInterpreter('''
        function x() { return new Date('Wednesday 31 December 1969 18:01:26 MDT') - 0; }
        ''')
        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; }
+        function y(a) { return x() + (a?a:0); }
        function z() { return y(3); }
        ''')
        self.assertEqual(jsi.call_function('z'), 5)
        self.assertEqual(jsi.call_function('y'), 2)
    def test_for_loop(self):
        jsi = JSInterpreter('''
-        function x() { a=0; for (i=0; i-10; i++) {a++} a }
+        function x() { a=0; for (i=0; i-10; i++) {a++} return a }
        ''')
        self.assertEqual(jsi.call_function('x'), 10)
@@ -153,21 +196,53 @@ class TestJSInterpreter(unittest.TestCase):
        ''')
        self.assertEqual(jsi.call_function('x'), 10)
    def test_catch(self):
        jsi = JSInterpreter('''
        function x() { try{throw 10} catch(e){return 5} }
        ''')
        self.assertEqual(jsi.call_function('x'), 5)
    def test_finally(self):
        jsi = JSInterpreter('''
        function x() { try{throw 10} finally {return 42} }
        ''')
        self.assertEqual(jsi.call_function('x'), 42)
        jsi = JSInterpreter('''
        function x() { try{throw 10} catch(e){return 5} finally {return 42} }
        ''')
        self.assertEqual(jsi.call_function('x'), 42)
    def test_nested_try(self):
        jsi = JSInterpreter('''
        function x() {try {
            try{throw 10} finally {throw 42}
            } catch(e){return 5} }
        ''')
        self.assertEqual(jsi.call_function('x'), 5)
    def test_for_loop_continue(self):
        jsi = JSInterpreter('''
-        function x() { a=0; for (i=0; i-10; i++) { continue; a++ } a }
+        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):
        jsi = JSInterpreter('''
-        function x() { a=0; for (i=0; i-10; i++) { break; a++ } a }
+        function x() { a=0; for (i=0; i-10; i++) { break; a++ } return a }
        ''')
        self.assertEqual(jsi.call_function('x'), 0)
    def test_for_loop_try(self):
        jsi = JSInterpreter('''
        function x() {
            for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
            return 42 }
        ''')
        self.assertEqual(jsi.call_function('x'), 42)
    def test_literal_list(self):
        jsi = JSInterpreter('''
-        function x() { [1, 2, "asdf", [5, 6, 7]][3] }
+        function x() { return [1, 2, "asdf", [5, 6, 7]][3] }
        ''')
        self.assertEqual(jsi.call_function('x'), [5, 6, 7])
@@ -177,6 +252,162 @@ class TestJSInterpreter(unittest.TestCase):
        ''')
        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):
        jsi = JSInterpreter('''
        function x() { return void 42; }
        ''')
        self.assertEqual(jsi.call_function('x'), None)
    def test_return_function(self):
        jsi = JSInterpreter('''
        function x() { return [1, function(){return 1}][1] }
        ''')
        self.assertEqual(jsi.call_function('x')([]), 1)
    def test_null(self):
        jsi = JSInterpreter('''
        function x() { return null; }
        ''')
        self.assertEqual(jsi.call_function('x'), None)
        jsi = JSInterpreter('''
        function x() { return [null > 0, null < 0, null == 0, null === 0]; }
        ''')
        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):
        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):
        jsi = JSInterpreter('''
        function x() { let a=/,,[/,913,/](,)}/; }
        ''')
        self.assertEqual(jsi.call_function('x'), None)
        jsi = JSInterpreter('''
        function x() { let a=/,,[/,913,/](,)}/; return a; }
        ''')
        self.assertIsInstance(jsi.call_function('x'), re.Pattern)
        jsi = JSInterpreter('''
        function x() { let a=/,,[/,913,/](,)}/i; return a; }
        ''')
        self.assertEqual(jsi.call_function('x').flags & re.I, re.I)
        jsi = JSInterpreter(R'''
        function x() { let a=/,][}",],()}(\[)/; return a; }
        ''')
        self.assertEqual(jsi.call_function('x').pattern, r',][}",],()}(\[)')
    def test_char_code_at(self):
        jsi = JSInterpreter('function x(i){return "test".charCodeAt(i)}')
        self.assertEqual(jsi.call_function('x', 0), 116)
        self.assertEqual(jsi.call_function('x', 1), 101)
        self.assertEqual(jsi.call_function('x', 2), 115)
        self.assertEqual(jsi.call_function('x', 3), 116)
        self.assertEqual(jsi.call_function('x', 4), None)
        self.assertEqual(jsi.call_function('x', 'not_a_number'), 116)
    def test_bitwise_operators_overflow(self):
        jsi = JSInterpreter('function x(){return -524999584 << 5}')
        self.assertEqual(jsi.call_function('x'), 379882496)
        jsi = JSInterpreter('function x(){return 1236566549 << 5}')
        self.assertEqual(jsi.call_function('x'), 915423904)
 if __name__ == '__main__':
    unittest.main()
@@ -53,6 +53,7 @@ from yt_dlp.utils import (
    fix_xml_ampersands,
    float_or_none,
    format_bytes,
    get_compatible_ext,
    get_element_by_attribute,
    get_element_by_class,
    get_element_html_by_attribute,
@@ -108,6 +109,7 @@ from yt_dlp.utils import (
    strip_or_none,
    subtitles_filename,
    timeconvert,
    traverse_obj,
    unescapeHTML,
    unified_strdate,
    unified_timestamp,
@@ -139,13 +141,13 @@ class TestUtil(unittest.TestCase):
        self.assertEqual(sanitize_filename('123'), '123')
-        self.assertEqual('abc_de', sanitize_filename('abc/de'))
+        self.assertEqual('abc⧸de', sanitize_filename('abc/de'))
        self.assertFalse('/' in sanitize_filename('abc/de///'))
-        self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de'))
+        self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', is_id=False))
-        self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|'))
+        self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', is_id=False))
-        self.assertEqual('yes no', sanitize_filename('yes? no'))
+        self.assertEqual('yes no', sanitize_filename('yes? no', is_id=False))
-        self.assertEqual('this - that', sanitize_filename('this: that'))
+        self.assertEqual('this - that', sanitize_filename('this: that', is_id=False))
        self.assertEqual(sanitize_filename('AT&T'), 'AT&T')
        aumlaut = 'ä'
@@ -368,6 +370,7 @@ class TestUtil(unittest.TestCase):
        self.assertEqual(unified_strdate('2012/10/11 01:56:38 +0000'), '20121011')
        self.assertEqual(unified_strdate('1968 12 10'), '19681210')
        self.assertEqual(unified_strdate('1968-12-10'), '19681210')
        self.assertEqual(unified_strdate('31-07-2022 20:00'), '20220731')
        self.assertEqual(unified_strdate('28/01/2014 21:00:00 +0100'), '20140128')
        self.assertEqual(
            unified_strdate('11/26/2014 11:30:00 AM PST', day_first=False),
@@ -411,6 +414,10 @@ class TestUtil(unittest.TestCase):
        self.assertEqual(unified_timestamp('December 15, 2017 at 7:49 am'), 1513324140)
        self.assertEqual(unified_timestamp('2018-03-14T08:32:43.1493874+00:00'), 1521016363)
        self.assertEqual(unified_timestamp('December 31 1969 20:00:01 EDT'), 1)
        self.assertEqual(unified_timestamp('Wednesday 31 December 1969 18:01:26 MDT'), 86)
        self.assertEqual(unified_timestamp('12/31/1969 20:01:18 EDT', False), 78)
    def test_determine_ext(self):
        self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4')
        self.assertEqual(determine_ext('http://example.com/foo/bar/?download', None), None)
@@ -560,6 +567,7 @@ 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')
@@ -1842,6 +1850,217 @@ Line 1
        self.assertEqual(determine_file_encoding('# coding: utf-32-be'.encode('utf-32-be')), ('utf-32-be', 0))
        self.assertEqual(determine_file_encoding('# coding: utf-16-le'.encode('utf-16-le')), ('utf-16-le', 0))
    def test_get_compatible_ext(self):
        self.assertEqual(get_compatible_ext(
            vcodecs=[None], acodecs=[None, None], vexts=['mp4'], aexts=['m4a', 'm4a']), 'mkv')
        self.assertEqual(get_compatible_ext(
            vcodecs=[None], acodecs=[None], vexts=['flv'], aexts=['flv']), 'flv')
        self.assertEqual(get_compatible_ext(
            vcodecs=[None], acodecs=[None], vexts=['mp4'], aexts=['m4a']), 'mp4')
        self.assertEqual(get_compatible_ext(
            vcodecs=[None], acodecs=[None], vexts=['mp4'], aexts=['webm']), 'mkv')
        self.assertEqual(get_compatible_ext(
            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=['h264'], acodecs=['mp4a'], vexts=['mov'], aexts=['m4a']), 'mp4')
        self.assertEqual(get_compatible_ext(
            vcodecs=['av01.0.12M.08'], acodecs=['opus'], vexts=['mp4'], aexts=['webm']), 'webm')
        self.assertEqual(get_compatible_ext(
            vcodecs=['vp9'], acodecs=['opus'], vexts=['webm'], aexts=['webm'], preferences=['flv', 'mp4']), 'mp4')
        self.assertEqual(get_compatible_ext(
            vcodecs=['av1'], acodecs=['mp4a'], vexts=['webm'], aexts=['m4a'], preferences=('webm', 'mkv')), 'mkv')
    def test_traverse_obj(self):
        _TEST_DATA = {
            100: 100,
            1.2: 1.2,
            'str': 'str',
            'None': None,
            '...': ...,
            'urls': [
                {'index': 0, 'url': 'https://www.example.com/0'},
                {'index': 1, 'url': 'https://www.example.com/1'},
            ],
            'data': (
                {'index': 2},
                {'index': 3},
            ),
        }
        # 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 is not None),
                              msg='`...` should give all values except `None`')
        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, ...)), _TEST_DATA['urls'][0].values(),
                              msg='`...` selection for dicts should select all values')
        self.assertEqual(traverse_obj(_TEST_DATA, (..., ..., 'url')),
                         ['https://www.example.com/0', 'https://www.example.com/1'],
                         msg='nested `...` queries should work')
        self.assertCountEqual(traverse_obj(_TEST_DATA, (..., ..., 'index')), range(4),
                              msg='`...` query result should be flattened')
        # Test function as key
        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
                         [_TEST_DATA['urls']],
                         msg='function as query key should perform a filter based on (key, value)')
        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), {'str'},
                              msg='exceptions in the query function should be catched')
        # Test alternative paths
        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
                         msg='multiple `path_list` 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')
        # 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({}, {0: 1}, default=...), {0: ...},
                         msg='do not remove `None` values when dict key')
        # 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 successfull return `default`, not `[]`')
        # 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')
        # 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), list('str'),
                         msg='`...` branching into string should result in list')
        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
                                      traverse_string=True), ['s', 'r'],
                         msg='branching into string should result in list')
        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda _, x: x),
                                      traverse_string=True), list('str'),
                         msg='function branching into string should result in list')
        # 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)
 if __name__ == '__main__':
    unittest.main()
@@ -94,6 +94,42 @@ _NSIG_TESTS = [
        'https://www.youtube.com/s/player/5dd88d1d/player-plasma-ias-phone-en_US.vflset/base.js',
        'kSxKFLeqzv_ZyHSAt', 'n8gS8oRlHOxPFA',
    ),
    (
        'https://www.youtube.com/s/player/324f67b9/player_ias.vflset/en_US/base.js',
        'xdftNy7dh9QGnhW', '22qLGxrmX8F1rA',
    ),
    (
        'https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js',
        'TDCstCG66tEAO5pR9o', 'dbxNtZ14c-yWyw',
    ),
    (
        'https://www.youtube.com/s/player/c81bbb4a/player_ias.vflset/en_US/base.js',
        'gre3EcLurNY2vqp94', 'Z9DfGxWP115WTg',
    ),
    (
        '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',
    ),
 ]
@@ -101,6 +137,7 @@ _NSIG_TESTS = [
 class TestPlayerInfo(unittest.TestCase):
    def test_youtube_extract_player_info(self):
        PLAYER_URLS = (
            ('https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js', '4c3f79c5'),
            ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/en_US/base.js', '64dddad9'),
            ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/fr_FR/base.js', '64dddad9'),
            ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
@@ -0,0 +1 @@
 <?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>
@@ -29,6 +29,7 @@ from .cookies import load_cookies
 from .downloader import FFmpegFD, get_suitable_downloader, shorten_protocol_name
 from .downloader.rtmp import rtmpdump_version
 from .extractor import gen_extractor_classes, get_info_extractor
 from .extractor.common import UnsupportedURLIE
 from .extractor.openload import PhantomJSwrapper
 from .minicurses import format_text
 from .postprocessor import _PLUGIN_CLASSES as plugin_postprocessors
@@ -47,11 +48,12 @@ from .postprocessor import (
    get_postprocessor,
 )
 from .postprocessor.ffmpeg import resolve_mapping as resolve_recode_mapping
-from .update import detect_variant
+from .update import REPOSITORY, current_git_head, detect_variant
 from .utils import (
    DEFAULT_OUTTMPL,
    IDENTITY,
    LINK_TEMPLATES,
    MEDIA_EXTENSIONS,
    NO_DEFAULT,
    NUMBER_RE,
    OUTTMPL_TYPES,
@@ -80,6 +82,7 @@ from .utils import (
    RejectedVideoReached,
    SameFileError,
    UnavailableVideoError,
    UserNotLive,
    YoutubeDLCookieProcessor,
    YoutubeDLHandler,
    YoutubeDLRedirectHandler,
@@ -87,6 +90,7 @@ from .utils import (
    args_to_str,
    bug_reports_message,
    date_from_str,
    deprecation_warning,
    determine_ext,
    determine_protocol,
    encode_compat_str,
@@ -100,17 +104,21 @@ from .utils import (
    format_decimal_suffix,
    format_field,
    formatSeconds,
    get_compatible_ext,
    get_domain,
    int_or_none,
    iri_to_uri,
    is_path_like,
    join_nonempty,
    locked_file,
    make_archive_id,
    make_dir,
    make_HTTPS_handler,
    merge_headers,
    network_exceptions,
    number_of_digits,
    orderedSet,
    orderedSet_from_options,
    parse_filesize,
    preferredencoding,
    prepend_extension,
@@ -131,6 +139,7 @@ from .utils import (
    timetuple_from_msec,
    to_high_limit_path,
    traverse_obj,
    try_call,
    try_get,
    url_basename,
    variadic,
@@ -139,7 +148,7 @@ from .utils import (
    write_json_file,
    write_string,
 )
-from .version import RELEASE_GIT_HEAD, __version__
+from .version import RELEASE_GIT_HEAD, VARIANT, __version__
 if compat_os_name == 'nt':
    import ctypes
@@ -231,7 +240,7 @@ class YoutubeDL:
                       Default is 'only_download' for CLI, but False for API
    skip_playlist_after_errors: Number of allowed failures until the rest of
                       the playlist is skipped
-    force_generic_extractor: Force downloader to use the generic extractor
+    allowed_extractors:  List of regexes to match against extractor names that are allowed
    overwrites:        Overwrite all video and metadata files if True,
                       overwrite only non-video files if None
                       and don't overwrite any file if False
@@ -243,8 +252,8 @@ class YoutubeDL:
    matchtitle:        Download only matching titles.
    rejecttitle:       Reject downloads for matching titles.
    logger:            Log messages to a logging.Logger instance.
-    logtostderr:       Log messages to stderr instead of stdout.
+    logtostderr:       Print everything to stderr instead of stdout.
-    consoletitle:       Display progress in console window's titlebar.
+    consoletitle:      Display progress in console window's titlebar.
    writedescription:  Write the video description to a .description file
    writeinfojson:     Write the video description to a .info.json file
    clean_infojson:    Remove private fields from the infojson
@@ -267,7 +276,7 @@ class YoutubeDL:
    subtitleslangs:    List of languages of the subtitles to download (can be regex).
                       The list may contain "all" to refer to all the available
                       subtitles. The language can be prefixed with a "-" to
-                       exclude it from the requested languages. Eg: ['all', '-live_chat']
+                       exclude it from the requested languages, e.g. ['all', '-live_chat']
    keepvideo:         Keep the video file after post-processing
    daterange:         A DateRange object, download only if the upload_date is in the range.
    skip_download:     Skip the actual download of the video file
@@ -285,9 +294,8 @@ class YoutubeDL:
                       downloaded.
                       Videos without view count information are always
                       downloaded. None for no limit.
-    download_archive:  File name of a file where all downloads are recorded.
+    download_archive:  A set, or the name of a file where all downloads are recorded.
-                       Videos already present in the file are not downloaded
+                       Videos already present in the file are not downloaded again.
                       again.
    break_on_existing: Stop the download process after attempting to download a
                       file that is in the archive.
    break_on_reject:   Stop the download process when encountering a video that
@@ -296,8 +304,9 @@ class YoutubeDL:
                       should act on each input URL as opposed to for the entire queue
    cookiefile:        File name or text stream from where cookies should be read and dumped to
    cookiesfrombrowser:  A tuple containing the name of the browser, the profile
-                       name/pathfrom where cookies are loaded, and the name of the
+                       name/path from where cookies are loaded, the name of the keyring,
-                       keyring. Eg: ('chrome', ) or ('vivaldi', 'default', 'BASICTEXT')
+                       and the container name, e.g. ('chrome', ) or
                       ('vivaldi', 'default', 'BASICTEXT') or ('firefox', 'default', None, 'Meta')
    legacyserverconnect: Explicitly allow HTTPS connection to servers that do not
                       support RFC 5746 secure renegotiation
    nocheckcertificate:  Do not verify SSL certificates
@@ -369,7 +378,7 @@ class YoutubeDL:
                       Progress hooks are guaranteed to be called at least twice
                       (with status "started" and "finished") if the processing is successful.
-    merge_output_format: Extension to use when merging formats.
+    merge_output_format: "/" separated list of extensions to use when merging formats.
    final_ext:         Expected final extension; used to detect when the file was
                       already downloaded and converted
    fixup:             Automatically correct known faults of the file.
@@ -439,6 +448,7 @@ class YoutubeDL:
                       * index: Section number (Optional)
    force_keyframes_at_cuts: Re-encode the video when downloading ranges to get precise cuts
    noprogress:        Do not print the progress bar
    live_from_start:   Whether to download livestreams videos from the start
    The following parameters are not used by YoutubeDL itself, they are used by
    the downloader (see yt_dlp/downloader/common.py):
@@ -465,11 +475,13 @@ class YoutubeDL:
                       discontinuities such as ad breaks (default: False)
    extractor_args:    A dictionary of arguments to be passed to the extractors.
                       See "EXTRACTOR ARGUMENTS" for details.
-                       Eg: {'youtube': {'skip': ['dash', 'hls']}}
+                       E.g. {'youtube': {'skip': ['dash', 'hls']}}
    mark_watched:      Mark videos watched (even with --simulate). Only for YouTube
    The following options are deprecated and may be removed in the future:
    force_generic_extractor: Force downloader to use the generic extractor
                       - Use allowed_extractors = ['generic', 'default']
    playliststart:     - Use playlist_items
                       Playlist item to start at.
    playlistend:       - Use playlist_items
@@ -522,7 +534,8 @@ class YoutubeDL:
    """
    _NUMERIC_FIELDS = {
-        'width', 'height', 'tbr', 'abr', 'asr', 'vbr', 'fps', 'filesize', 'filesize_approx',
+        'width', 'height', 'asr', 'audio_channels', 'fps',
        'tbr', 'abr', 'vbr', 'filesize', 'filesize_approx',
        'timestamp', 'release_timestamp',
        'duration', 'view_count', 'like_count', 'dislike_count', 'repost_count',
        'average_rating', 'comment_count', 'age_limit',
@@ -534,7 +547,7 @@ class YoutubeDL:
    _format_fields = {
        # NB: Keep in sync with the docstring of extractor/common.py
        'url', 'manifest_url', 'manifest_stream_number', 'ext', 'format', 'format_id', 'format_note',
-        'width', 'height', 'resolution', 'dynamic_range', 'tbr', 'abr', 'acodec', 'asr',
+        'width', 'height', 'resolution', 'dynamic_range', 'tbr', 'abr', 'acodec', 'asr', 'audio_channels',
        'vbr', 'fps', 'vcodec', 'container', 'filesize', 'filesize_approx',
        'player_url', 'protocol', 'fragment_base_url', 'fragments', 'is_from_start',
        'preference', 'language', 'language_preference', 'quality', 'source_preference',
@@ -542,9 +555,9 @@ class YoutubeDL:
        'page_url', 'app', 'play_path', 'tc_url', 'flash_version', 'rtmp_live', 'rtmp_conn', 'rtmp_protocol', 'rtmp_real_time'
    }
    _format_selection_exts = {
-        'audio': {'m4a', 'mp3', 'ogg', 'aac'},
+        'audio': set(MEDIA_EXTENSIONS.common_audio),
-        'video': {'mp4', 'flv', 'webm', '3gp'},
+        'video': set(MEDIA_EXTENSIONS.common_video + ('3gp', )),
-        'storyboards': {'mhtml'},
+        'storyboards': set(MEDIA_EXTENSIONS.storyboards),
    }
    def __init__(self, params=None, auto_init=True):
@@ -584,7 +597,8 @@ class YoutubeDL:
            for type_, stream in self._out_files.items_ if type_ != 'console'
        })
-        MIN_SUPPORTED, MIN_RECOMMENDED = (3, 6), (3, 7)
+        # The code is left like this to be reused for future deprecations
        MIN_SUPPORTED, MIN_RECOMMENDED = (3, 7), (3, 7)
        current_version = sys.version_info[:2]
        if current_version < MIN_RECOMMENDED:
            msg = ('Support for Python version %d.%d has been deprecated. '
@@ -619,7 +633,7 @@ class YoutubeDL:
        for msg in self.params.get('_warnings', []):
            self.report_warning(msg)
        for msg in self.params.get('_deprecation_warnings', []):
-            self.deprecation_warning(msg)
+            self.deprecated_feature(msg)
        self.params['compat_opts'] = set(self.params.get('compat_opts', ()))
        if 'list-formats' in self.params['compat_opts']:
@@ -709,21 +723,23 @@ class YoutubeDL:
        def preload_download_archive(fn):
            """Preload the archive, if any is specified"""
            archive = set()
            if fn is None:
-                return False
+                return archive
            elif not is_path_like(fn):
                return fn
            self.write_debug(f'Loading archive file {fn!r}')
            try:
                with locked_file(fn, 'r', encoding='utf-8') as archive_file:
                    for line in archive_file:
-                        self.archive.add(line.strip())
+                        archive.add(line.strip())
            except OSError as ioe:
                if ioe.errno != errno.ENOENT:
                    raise
-                return False
+            return archive
            return True
-        self.archive = set()
+        self.archive = preload_download_archive(self.params.get('download_archive'))
        preload_download_archive(self.params.get('download_archive'))
    def warn_if_short_id(self, argv):
        # short YouTube ID starting with dash?
@@ -749,13 +765,6 @@ class YoutubeDL:
            self._ies_instances[ie_key] = ie
            ie.set_downloader(self)
    def _get_info_extractor_class(self, ie_key):
        ie = self._ies.get(ie_key)
        if ie is None:
            ie = get_info_extractor(ie_key)
            self.add_info_extractor(ie)
        return ie
    def get_info_extractor(self, ie_key):
        """
        Get an instance of an IE with name ie_key, it will try to get one from
@@ -772,8 +781,19 @@ class YoutubeDL:
        """
        Add the InfoExtractors returned by gen_extractors to the end of the list
        """
-        for ie in gen_extractor_classes():
+        all_ies = {ie.IE_NAME.lower(): ie for ie in gen_extractor_classes()}
-            self.add_info_extractor(ie)
+        all_ies['end'] = UnsupportedURLIE()
        try:
            ie_names = orderedSet_from_options(
                self.params.get('allowed_extractors', ['default']), {
                    'all': list(all_ies),
                    'default': [name for name, ie in all_ies.items() if ie._ENABLED],
                }, use_regex=True)
        except re.error as e:
            raise ValueError(f'Wrong regex for allowed_extractors: {e.pattern}')
        for name in ie_names:
            self.add_info_extractor(all_ies[name])
        self.write_debug(f'Loaded {len(ie_names)} extractors')
    def add_post_processor(self, pp, when='post_process'):
        """Add a PostProcessor object to the end of the chain."""
@@ -819,12 +839,14 @@ class YoutubeDL:
    def to_stdout(self, message, skip_eol=False, quiet=None):
        """Print message to stdout"""
        if quiet is not None:
-            self.deprecation_warning('"YoutubeDL.to_stdout" no longer accepts the argument quiet. Use "YoutubeDL.to_screen" instead')
+            self.deprecation_warning('"YoutubeDL.to_stdout" no longer accepts the argument quiet. '
                                     'Use "YoutubeDL.to_screen" instead')
        if skip_eol is not False:
-            self.deprecation_warning('"YoutubeDL.to_stdout" no longer accepts the argument skip_eol. Use "YoutubeDL.to_screen" instead')
+            self.deprecation_warning('"YoutubeDL.to_stdout" no longer accepts the argument skip_eol. '
                                     'Use "YoutubeDL.to_screen" instead')
        self._write_string(f'{self._bidi_workaround(message)}\n', self._out_files.out)
-    def to_screen(self, message, skip_eol=False, quiet=None):
+    def to_screen(self, message, skip_eol=False, quiet=None, only_once=False):
        """Print message to screen if not in quiet mode"""
        if self.params.get('logger'):
            self.params['logger'].debug(message)
@@ -833,7 +855,7 @@ class YoutubeDL:
            return
        self._write_string(
            '%s%s' % (self._bidi_workaround(message), ('' if skip_eol else '\n')),
-            self._out_files.screen)
+            self._out_files.screen, only_once=only_once)
    def to_stderr(self, message, only_once=False):
        """Print message to stderr"""
@@ -957,11 +979,14 @@ class YoutubeDL:
                return
            self.to_stderr(f'{self._format_err("WARNING:", self.Styles.WARNING)} {message}', only_once)
-    def deprecation_warning(self, message):
+    def deprecation_warning(self, message, *, stacklevel=0):
        deprecation_warning(
            message, stacklevel=stacklevel + 1, printer=self.report_error, is_error=False)
    def deprecated_feature(self, message):
        if self.params.get('logger') is not None:
-            self.params['logger'].warning(f'DeprecationWarning: {message}')
+            self.params['logger'].warning(f'Deprecated Feature: {message}')
-        else:
+        self.to_stderr(f'{self._format_err("Deprecated Feature:", self.Styles.ERROR)} {message}', True)
            self.to_stderr(f'{self._format_err("DeprecationWarning:", self.Styles.ERROR)} {message}', True)
    def report_error(self, message, *args, **kwargs):
        '''
@@ -1021,7 +1046,7 @@ class YoutubeDL:
    def get_output_path(self, dir_type='', filename=None):
        paths = self.params.get('paths', {})
-        assert isinstance(paths, dict)
+        assert isinstance(paths, dict), '"paths" parameter must be a dictionary'
        path = os.path.join(
            expand_path(paths.get('home', '').strip()),
            expand_path(paths.get(dir_type, '').strip()) if dir_type else '',
@@ -1039,7 +1064,7 @@ class YoutubeDL:
        # outtmpl should be expand_path'ed before template dict substitution
        # because meta fields may contain env variables we don't want to
-        # be expanded. For example, for outtmpl "%(title)s.%(ext)s" and
+        # be expanded. E.g. for outtmpl "%(title)s.%(ext)s" and
        # title "Hello $PATH", we don't want `$PATH` to be expanded.
        return expand_path(outtmpl).replace(sep, '')
@@ -1104,8 +1129,12 @@ class YoutubeDL:
            '-': float.__sub__,
        }
        # Field is of the form key1.key2...
-        # where keys (except first) can be string, int or slice
+        # where keys (except first) can be string, int, slice or "{field, ...}"
-        FIELD_RE = r'\w*(?:\.(?:\w+|{num}|{num}?(?::{num}?){{1,2}}))*'.format(num=r'(?:-?\d+)')
+        FIELD_INNER_RE = r'(?:\w+|%(num)s|%(num)s?(?::%(num)s?){1,2})' % {'num': r'(?:-?\d+)'}
        FIELD_RE = r'\w*(?:\.(?:%(inner)s|{%(field)s(?:,%(field)s)*}))*' % {
            'inner': FIELD_INNER_RE,
            'field': rf'\w*(?:\.{FIELD_INNER_RE})*'
        }
        MATH_FIELD_RE = rf'(?:{FIELD_RE}|-?{NUMBER_RE})'
        MATH_OPERATORS_RE = r'(?:%s)' % '|'.join(map(re.escape, MATH_FUNCTIONS.keys()))
        INTERNAL_FORMAT_RE = re.compile(rf'''(?x)
@@ -1119,11 +1148,20 @@ class YoutubeDL:
                (?:\|(?P<default>.*?))?
            )$''')
-        def _traverse_infodict(k):
+        def _traverse_infodict(fields):
-            k = k.split('.')
+            fields = [f for x in re.split(r'\.({.+?})\.?', fields)
-            if k[0] == '':
+                      for f in ([x] if x.startswith('{') else x.split('.'))]
-                k.pop(0)
+            for i in (0, -1):
-            return traverse_obj(info_dict, k, is_user_input=True, traverse_string=True)
+                if fields and not fields[i]:
                    fields.pop(i)
            for i, f in enumerate(fields):
                if not f.startswith('{'):
                    continue
                assert f.endswith('}'), f'No closing brace for {f} in {fields}'
                fields[i] = {k: k.split('.') for k in f[1:-1].split(',')}
            return traverse_obj(info_dict, fields, is_user_input=True, traverse_string=True)
        def get_value(mdict):
            # Object traversal
@@ -1159,6 +1197,9 @@ class YoutubeDL:
            if mdict['strf_format']:
                value = strftime_or_none(value, mdict['strf_format'].replace('\\,', ','))
            # XXX: Workaround for https://github.com/yt-dlp/yt-dlp/issues/4485
            if sanitize and value == '':
                value = None
            return value
        na = self.params.get('outtmpl_na_placeholder', 'NA')
@@ -1206,9 +1247,11 @@ class YoutubeDL:
                delim = '\n' if '#' in flags else ', '
                value, fmt = delim.join(map(str, variadic(value, allowed_types=(str, bytes)))), str_fmt
            elif fmt[-1] == 'j':  # json
-                value, fmt = json.dumps(value, default=_dumpjson_default, indent=4 if '#' in flags else None), str_fmt
+                value, fmt = json.dumps(
                    value, default=_dumpjson_default,
                    indent=4 if '#' in flags else None, ensure_ascii=False), str_fmt
            elif fmt[-1] == 'h':  # html
-                value, fmt = escapeHTML(value), str_fmt
+                value, fmt = escapeHTML(str(value)), str_fmt
            elif fmt[-1] == 'q':  # quoted
                value = map(str, variadic(value) if '#' in flags else [value])
                value, fmt = ' '.join(map(compat_shlex_quote, value)), str_fmt
@@ -1308,7 +1351,7 @@ class YoutubeDL:
    def _match_entry(self, info_dict, incomplete=False, silent=False):
        """ Returns None if the file should be downloaded """
-        video_title = info_dict.get('title', info_dict.get('id', 'video'))
+        video_title = info_dict.get('title', info_dict.get('id', 'entry'))
        def check_filter():
            if 'title' in info_dict:
@@ -1380,18 +1423,19 @@ class YoutubeDL:
    def extract_info(self, url, download=True, ie_key=None, extra_info=None,
                     process=True, force_generic_extractor=False):
        """
-        Return a list with a dictionary for each video extracted.
+        Extract and return the information dictionary of the URL
        Arguments:
-        url -- URL to extract
+        @param url          URL to extract
        Keyword arguments:
-        download -- whether to download videos during extraction
+        @param download     Whether to download videos
-        ie_key -- extractor key hint
+        @param process      Whether to resolve all unresolved references (URLs, playlist items).
-        extra_info -- dictionary containing the extra values to add to each result
+                            Must be True for download to work
-        process -- whether to resolve all unresolved references (URLs, playlist items),
+        @param ie_key       Use only the extractor with this key
-            must be True for download to work.
+
-        force_generic_extractor -- force using the generic extractor
+        @param extra_info   Dictionary containing the extra values to add to the info (For internal use only)
        @force_generic_extractor  Force using the generic extractor (Deprecated; use ie_key='Generic')
        """
        if extra_info is None:
@@ -1401,11 +1445,11 @@ class YoutubeDL:
            ie_key = 'Generic'
        if ie_key:
-            ies = {ie_key: self._get_info_extractor_class(ie_key)}
+            ies = {ie_key: self._ies[ie_key]} if ie_key in self._ies else {}
        else:
            ies = self._ies
-        for ie_key, ie in ies.items():
+        for key, ie in ies.items():
            if not ie.suitable(url):
                continue
@@ -1414,14 +1458,16 @@ class YoutubeDL:
                                    'and will probably not work.')
            temp_id = ie.get_temp_id(url)
-            if temp_id is not None and self.in_download_archive({'id': temp_id, 'ie_key': ie_key}):
+            if temp_id is not None and self.in_download_archive({'id': temp_id, 'ie_key': key}):
-                self.to_screen(f'[{ie_key}] {temp_id}: has already been recorded in the archive')
+                self.to_screen(f'[{key}] {temp_id}: has already been recorded in the archive')
                if self.params.get('break_on_existing', False):
                    raise ExistingVideoReached()
                break
-            return self.__extract_info(url, self.get_info_extractor(ie_key), download, extra_info, process)
+            return self.__extract_info(url, self.get_info_extractor(key), download, extra_info, process)
        else:
-            self.report_error('no suitable InfoExtractor for URL %s' % url)
+            extractors_restricted = self.params.get('allowed_extractors') not in (None, ['default'])
            self.report_error(f'No suitable extractor{format_field(ie_key, None, " (%s)")} found for URL {url}',
                              tb=False if extractors_restricted else None)
    def _handle_extraction_exceptions(func):
        @functools.wraps(func)
@@ -1455,7 +1501,7 @@ class YoutubeDL:
                break
        return wrapper
-    def _wait_for_video(self, ie_result):
+    def _wait_for_video(self, ie_result={}):
        if (not self.params.get('wait_for_video')
                or ie_result.get('_type', 'video') != 'video'
                or ie_result.get('formats') or ie_result.get('url')):
@@ -1479,7 +1525,7 @@ class YoutubeDL:
        if diff is None and ie_result.get('live_status') == 'is_upcoming':
            diff = round(random.uniform(min_wait, max_wait) if (max_wait and min_wait) else (max_wait or min_wait), 0)
            self.report_warning('Release time of video is not known')
-        elif (diff or 0) <= 0:
+        elif ie_result and (diff or 0) <= 0:
            self.report_warning('Video should already be available according to extracted info')
        diff = min(max(diff or 0, min_wait or 0), max_wait or float('inf'))
        self.to_screen(f'[wait] Waiting for {format_dur(diff)} - Press Ctrl+C to try now')
@@ -1503,7 +1549,14 @@ class YoutubeDL:
    @_handle_extraction_exceptions
    def __extract_info(self, url, ie, download, extra_info, process):
-        ie_result = ie.extract(url)
+        try:
            ie_result = ie.extract(url)
        except UserNotLive as e:
            if process:
                if self.params.get('wait_for_video'):
                    self.report_warning(e)
                self._wait_for_video()
            raise
        if ie_result is None:  # Finished already (backwards compatibility; listformats and friends should be moved here)
            self.report_warning(f'Extractor {ie.IE_NAME} returned nothing{bug_reports_message()}')
            return
@@ -1553,7 +1606,8 @@ class YoutubeDL:
        result_type = ie_result.get('_type', 'video')
        if result_type in ('url', 'url_transparent'):
-            ie_result['url'] = sanitize_url(ie_result['url'])
+            ie_result['url'] = sanitize_url(
                ie_result['url'], scheme='http' if self.params.get('prefer_insecure') else 'https')
            if ie_result.get('original_url'):
                extra_info.setdefault('original_url', ie_result['original_url'])
@@ -1633,8 +1687,8 @@ class YoutubeDL:
        elif result_type in ('playlist', 'multi_video'):
            # Protect from infinite recursion due to recursively nested playlists
            # (see https://github.com/ytdl-org/youtube-dl/issues/27833)
-            webpage_url = ie_result['webpage_url']
+            webpage_url = ie_result.get('webpage_url')  # Playlists maynot have webpage_url
-            if webpage_url in self._playlist_urls:
+            if webpage_url and webpage_url in self._playlist_urls:
                self.to_screen(
                    '[download] Skipping already downloaded playlist: %s'
                    % ie_result.get('title') or ie_result.get('id'))
@@ -1676,23 +1730,40 @@ class YoutubeDL:
        return make_dir(path, self.report_error)
    @staticmethod
-    def _playlist_infodict(ie_result, **kwargs):
+    def _playlist_infodict(ie_result, strict=False, **kwargs):
-        return {
+        info = {
-            **ie_result,
+            'playlist_count': ie_result.get('playlist_count'),
            'playlist': ie_result.get('title') or ie_result.get('id'),
            'playlist_id': ie_result.get('id'),
            'playlist_title': ie_result.get('title'),
            'playlist_uploader': ie_result.get('uploader'),
            'playlist_uploader_id': ie_result.get('uploader_id'),
            'playlist_index': 0,
            **kwargs,
        }
        if strict:
            return info
        if ie_result.get('webpage_url'):
            info.update({
                'webpage_url': ie_result['webpage_url'],
                'webpage_url_basename': url_basename(ie_result['webpage_url']),
                'webpage_url_domain': get_domain(ie_result['webpage_url']),
            })
        return {
            **info,
            'playlist_index': 0,
            '__last_playlist_index': max(ie_result['requested_entries'] or (0, 0)),
            'extractor': ie_result['extractor'],
            'extractor_key': ie_result['extractor_key'],
        }
    def __process_playlist(self, ie_result, download):
        """Process each entry in the playlist"""
        assert ie_result['_type'] in ('playlist', 'multi_video')
-        title = ie_result.get('title') or ie_result.get('id') or '<Untitled>'
+        common_info = self._playlist_infodict(ie_result, strict=True)
        title = common_info.get('playlist') or '<Untitled>'
        if self._match_entry(common_info, incomplete=True) is not None:
            return
        self.to_screen(f'[download] Downloading {ie_result["_type"]}: {title}')
        all_entries = PlaylistEntries(self, ie_result)
@@ -1710,12 +1781,14 @@ class YoutubeDL:
            # Better to do this after potentially exhausting entries
            ie_result['playlist_count'] = all_entries.get_full_count()
        extra = self._playlist_infodict(ie_result, n_entries=int_or_none(n_entries))
        ie_copy = collections.ChainMap(ie_result, extra)
        _infojson_written = False
        write_playlist_files = self.params.get('allow_playlist_files', True)
        if write_playlist_files and self.params.get('list_thumbnails'):
            self.list_thumbnails(ie_result)
        if write_playlist_files and not self.params.get('simulate'):
            ie_copy = self._playlist_infodict(ie_result, n_entries=int_or_none(n_entries))
            _infojson_written = self._write_info_json(
                'playlist', ie_result, self.prepare_filename(ie_copy, 'pl_infojson'))
            if _infojson_written is None:
@@ -1724,7 +1797,7 @@ class YoutubeDL:
                                       self.prepare_filename(ie_copy, 'pl_description')) is None:
                return
            # TODO: This should be passed to ThumbnailsConvertor if necessary
-            self._write_thumbnails('playlist', ie_copy, self.prepare_filename(ie_copy, 'pl_thumbnail'))
+            self._write_thumbnails('playlist', ie_result, self.prepare_filename(ie_copy, 'pl_thumbnail'))
        if lazy:
            if self.params.get('playlistreverse') or self.params.get('playlistrandom'):
@@ -1748,35 +1821,33 @@ class YoutubeDL:
        for i, (playlist_index, entry) in enumerate(entries):
            if lazy:
                resolved_entries.append((playlist_index, entry))
-
+            if not entry:
            # TODO: Add auto-generated fields
            if not entry or self._match_entry(entry, incomplete=True) is not None:
                continue
            self.to_screen('[download] Downloading video %s of %s' % (
                self._format_screen(i + 1, self.Styles.ID), self._format_screen(n_entries, self.Styles.EMPHASIS)))
            entry['__x_forwarded_for_ip'] = ie_result.get('__x_forwarded_for_ip')
            if not lazy and 'playlist-index' in self.params.get('compat_opts', []):
                playlist_index = ie_result['requested_entries'][i]
-            entry_result = self.__process_iterable_entry(entry, download, {
+            entry_copy = collections.ChainMap(entry, {
                **common_info,
                'n_entries': int_or_none(n_entries),
                '__last_playlist_index': max(ie_result['requested_entries'] or (0, 0)),
                'playlist_count': ie_result.get('playlist_count'),
                'playlist_index': playlist_index,
                'playlist_autonumber': i + 1,
                'playlist': title,
                'playlist_id': ie_result.get('id'),
                'playlist_title': ie_result.get('title'),
                'playlist_uploader': ie_result.get('uploader'),
                'playlist_uploader_id': ie_result.get('uploader_id'),
                'extractor': ie_result['extractor'],
                'webpage_url': ie_result['webpage_url'],
                'webpage_url_basename': url_basename(ie_result['webpage_url']),
                'webpage_url_domain': get_domain(ie_result['webpage_url']),
                'extractor_key': ie_result['extractor_key'],
            })
            if self._match_entry(entry_copy, incomplete=True) is not None:
                # For compatabilty with youtube-dl. See https://github.com/yt-dlp/yt-dlp/issues/4369
                resolved_entries[i] = (playlist_index, NO_DEFAULT)
                continue
            self.to_screen('[download] Downloading video %s of %s' % (
                self._format_screen(i + 1, self.Styles.ID), self._format_screen(n_entries, self.Styles.EMPHASIS)))
            extra.update({
                'playlist_index': playlist_index,
                'playlist_autonumber': i + 1,
            })
            entry_result = self.__process_iterable_entry(entry, download, extra)
            if not entry_result:
                failures += 1
            if failures >= max_failures:
@@ -1787,7 +1858,8 @@ class YoutubeDL:
                resolved_entries[i] = (playlist_index, entry_result)
        # Update with processed data
-        ie_result['requested_entries'], ie_result['entries'] = tuple(zip(*resolved_entries)) or ([], [])
+        ie_result['requested_entries'] = [i for i, e in resolved_entries if e is not NO_DEFAULT]
        ie_result['entries'] = [e for _, e in resolved_entries if e is not NO_DEFAULT]
        # Write the updated info to json
        if _infojson_written is True and self._write_info_json(
@@ -1944,8 +2016,8 @@ class YoutubeDL:
                    filter_parts.append(string)
        def _remove_unused_ops(tokens):
-            # Remove operators that we don't use and join them with the surrounding strings
+            # Remove operators that we don't use and join them with the surrounding strings.
-            # for example: 'mp4' '-' 'baseline' '-' '16x9' is converted to 'mp4-baseline-16x9'
+            # E.g. 'mp4' '-' 'baseline' '-' '16x9' is converted to 'mp4-baseline-16x9'
            ALLOWED_OPS = ('/', '+', ',', '(', ')')
            last_string, last_start, last_end, last_line = None, None, None, None
            for type, string, start, end, line in tokens:
@@ -2061,14 +2133,13 @@ class YoutubeDL:
            the_only_video = video_fmts[0] if len(video_fmts) == 1 else None
            the_only_audio = audio_fmts[0] if len(audio_fmts) == 1 else None
-            output_ext = self.params.get('merge_output_format')
+            output_ext = get_compatible_ext(
-            if not output_ext:
+                vcodecs=[f.get('vcodec') for f in video_fmts],
-                if the_only_video:
+                acodecs=[f.get('acodec') for f in audio_fmts],
-                    output_ext = the_only_video['ext']
+                vexts=[f['ext'] for f in video_fmts],
-                elif the_only_audio and not video_fmts:
+                aexts=[f['ext'] for f in audio_fmts],
-                    output_ext = the_only_audio['ext']
+                preferences=(try_call(lambda: self.params['merge_output_format'].split('/'))
-                else:
+                             or self.params.get('prefer_free_formats') and ('webm', 'mkv')))
                    output_ext = 'mkv'
            filtered = lambda *keys: filter(None, (traverse_obj(fmt, *keys) for fmt in formats_info))
@@ -2101,6 +2172,7 @@ class YoutubeDL:
                    'acodec': the_only_audio.get('acodec'),
                    'abr': the_only_audio.get('abr'),
                    'asr': the_only_audio.get('asr'),
                    'audio_channels': the_only_audio.get('audio_channels')
                })
            return new_dict
@@ -2354,6 +2426,8 @@ class YoutubeDL:
            for key in live_keys:
                if info_dict.get(key) is None:
                    info_dict[key] = (live_status == key)
        if live_status == 'post_live':
            info_dict['was_live'] = True
        # Auto generate title fields corresponding to the *_number fields when missing
        # in order to always have clean titles. This is very common for TV series.
@@ -2461,11 +2535,11 @@ class YoutubeDL:
        info_dict['_has_drm'] = any(f.get('has_drm') for f in formats) or None
        if not self.params.get('allow_unplayable_formats'):
            formats = [f for f in formats if not f.get('has_drm')]
-            if info_dict['_has_drm'] and all(
+
-                    f.get('acodec') == f.get('vcodec') == 'none' for f in formats):
+        if formats and all(f.get('acodec') == f.get('vcodec') == 'none' for f in formats):
-                self.report_warning(
+            self.report_warning(
-                    'This video is DRM protected and only images are available for download. '
+                f'{"This video is DRM protected and " if info_dict["_has_drm"] else ""}'
-                    'Use --list-formats to see them')
+                'only images are available for download. Use --list-formats to see them'.capitalize())
        get_from_start = not info_dict.get('is_live') or bool(self.params.get('live_from_start'))
        if not get_from_start:
@@ -2477,9 +2551,6 @@ class YoutubeDL:
                    '--live-from-start is passed, but there are no formats that can be downloaded from the start. '
                    'If you want to download from the current time, use --no-live-from-start'))
        if not formats:
            self.raise_no_formats(info_dict)
        def is_wellformed(f):
            url = f.get('url')
            if not url:
@@ -2492,7 +2563,10 @@ class YoutubeDL:
            return True
        # Filter out malformed formats for better extraction robustness
-        formats = list(filter(is_wellformed, formats))
+        formats = list(filter(is_wellformed, formats or []))
        if not formats:
            self.raise_no_formats(info_dict)
        formats_dict = {}
@@ -2628,31 +2702,29 @@ class YoutubeDL:
            # Process what we can, even without any available formats.
            formats_to_download = [{}]
-        requested_ranges = self.params.get('download_ranges')
+        requested_ranges = tuple(self.params.get('download_ranges', lambda *_: [{}])(info_dict, self))
        if requested_ranges:
            requested_ranges = tuple(requested_ranges(info_dict, self))
        best_format, downloaded_formats = formats_to_download[-1], []
        if download:
-            if best_format:
+            if best_format and requested_ranges:
                def to_screen(*msg):
                    self.to_screen(f'[info] {info_dict["id"]}: {" ".join(", ".join(variadic(m)) for m in msg)}')
                to_screen(f'Downloading {len(formats_to_download)} format(s):',
                          (f['format_id'] for f in formats_to_download))
-                if requested_ranges:
+                if requested_ranges != ({}, ):
                    to_screen(f'Downloading {len(requested_ranges)} time ranges:',
-                              (f'{int(c["start_time"])}-{int(c["end_time"])}' for c in requested_ranges))
+                              (f'{c["start_time"]:.1f}-{c["end_time"]:.1f}' for c in requested_ranges))
            max_downloads_reached = False
-            for fmt, chapter in itertools.product(formats_to_download, requested_ranges or [{}]):
+            for fmt, chapter in itertools.product(formats_to_download, requested_ranges):
                new_info = self._copy_infodict(info_dict)
                new_info.update(fmt)
                offset, duration = info_dict.get('section_start') or 0, info_dict.get('duration') or float('inf')
                end_time = offset + min(chapter.get('end_time', duration), duration)
                if chapter or offset:
                    new_info.update({
                        'section_start': offset + chapter.get('start_time', 0),
-                        'section_end': offset + min(chapter.get('end_time', duration), duration),
+                        'section_end': end_time if end_time < offset + duration else None,
                        'section_title': chapter.get('title'),
                        'section_number': chapter.get('index'),
                    })
@@ -2694,42 +2766,26 @@ class YoutubeDL:
                if lang not in available_subs:
                    available_subs[lang] = cap_info
-        if (not self.params.get('writesubtitles') and not
+        if not available_subs or (
-                self.params.get('writeautomaticsub') or not
+                not self.params.get('writesubtitles')
-                available_subs):
+                and not self.params.get('writeautomaticsub')):
            return None
        all_sub_langs = tuple(available_subs.keys())
        if self.params.get('allsubtitles', False):
            requested_langs = all_sub_langs
        elif self.params.get('subtitleslangs', False):
-            # A list is used so that the order of languages will be the same as
+            try:
-            # given in subtitleslangs. See https://github.com/yt-dlp/yt-dlp/issues/1041
+                requested_langs = orderedSet_from_options(
-            requested_langs = []
+                    self.params.get('subtitleslangs'), {'all': all_sub_langs}, use_regex=True)
-            for lang_re in self.params.get('subtitleslangs'):
+            except re.error as e:
-                discard = lang_re[0] == '-'
+                raise ValueError(f'Wrong regex for subtitlelangs: {e.pattern}')
                if discard:
                    lang_re = lang_re[1:]
                if lang_re == 'all':
                    if discard:
                        requested_langs = []
                    else:
                        requested_langs.extend(all_sub_langs)
                    continue
                current_langs = filter(re.compile(lang_re + '$').match, all_sub_langs)
                if discard:
                    for lang in current_langs:
                        while lang in requested_langs:
                            requested_langs.remove(lang)
                else:
                    requested_langs.extend(current_langs)
            requested_langs = orderedSet(requested_langs)
        elif normal_sub_langs:
            requested_langs = ['en'] if 'en' in normal_sub_langs else normal_sub_langs[:1]
        else:
            requested_langs = ['en'] if 'en' in all_sub_langs else all_sub_langs[:1]
        if requested_langs:
-            self.write_debug('Downloading subtitles: %s' % ', '.join(requested_langs))
+            self.to_screen(f'[info] {video_id}: Downloading subtitles: {", ".join(requested_langs)}')
        formats_query = self.params.get('subtitlesformat', 'best')
        formats_preference = formats_query.split('/') if formats_query else []
@@ -2765,12 +2821,16 @@ class YoutubeDL:
        info_copy['automatic_captions_table'] = self.render_subtitles_table(info_dict.get('id'), info_dict.get('automatic_captions'))
        def format_tmpl(tmpl):
-            mobj = re.match(r'\w+(=?)$', tmpl)
+            mobj = re.fullmatch(r'([\w.:,]|-\d|(?P<dict>{([\w.:,]|-\d)+}))+=?', tmpl)
-            if mobj and mobj.group(1):
+            if not mobj:
-                return f'{tmpl[:-1]} = %({tmpl[:-1]})r'
+                return tmpl
-            elif mobj:
+
-                return f'%({tmpl})s'
+            fmt = '%({})s'
-            return tmpl
+            if tmpl.startswith('{'):
                tmpl = f'.{tmpl}'
            if tmpl.endswith('='):
                tmpl, fmt = tmpl[:-1], '{0} = %({0})#j'
            return '\n'.join(map(fmt.format, [tmpl] if mobj.group('dict') else tmpl.split(',')))
        for tmpl in self.params['forceprint'].get(key, []):
            self.to_stdout(self.evaluate_outtmpl(format_tmpl(tmpl), info_copy))
@@ -3040,33 +3100,9 @@ class YoutubeDL:
                        return
                if info_dict.get('requested_formats') is not None:
                    def compatible_formats(formats):
                        # TODO: some formats actually allow this (mkv, webm, ogg, mp4), but not all of them.
                        video_formats = [format for format in formats if format.get('vcodec') != 'none']
                        audio_formats = [format for format in formats if format.get('acodec') != 'none']
                        if len(video_formats) > 2 or len(audio_formats) > 2:
                            return False
                        # Check extension
                        exts = {format.get('ext') for format in formats}
                        COMPATIBLE_EXTS = (
                            {'mp3', 'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v', 'ismv', 'isma'},
                            {'webm'},
                        )
                        for ext_sets in COMPATIBLE_EXTS:
                            if ext_sets.issuperset(exts):
                                return True
                        # TODO: Check acodec/vcodec
                        return False
                    requested_formats = info_dict['requested_formats']
                    old_ext = info_dict['ext']
                    if self.params.get('merge_output_format') is None:
                        if not compatible_formats(requested_formats):
                            info_dict['ext'] = 'mkv'
                            self.report_warning(
                                'Requested formats are incompatible for merge and will be merged into mkv')
                        if (info_dict['ext'] == 'webm'
                                and info_dict.get('thumbnails')
                                # check with type instead of pp_key, __name__, or isinstance
@@ -3261,6 +3297,7 @@ class YoutubeDL:
                self.to_screen(f'[info] {e}')
                if not self.params.get('break_per_url'):
                    raise
                self._num_downloads = 0
            else:
                if self.params.get('dump_single_json', False):
                    self.post_extract(res)
@@ -3309,6 +3346,12 @@ class YoutubeDL:
            return info_dict
        info_dict.setdefault('epoch', int(time.time()))
        info_dict.setdefault('_type', 'video')
        info_dict.setdefault('_version', {
            'version': __version__,
            'current_git_head': current_git_head(),
            'release_git_head': RELEASE_GIT_HEAD,
            'repository': REPOSITORY,
        })
        if remove_private_keys:
            reject = lambda k, v: v is None or k.startswith('__') or k in {
@@ -3426,18 +3469,15 @@ class YoutubeDL:
                    break
            else:
                return
-        return f'{extractor.lower()} {video_id}'
+        return make_archive_id(extractor, video_id)
    def in_download_archive(self, info_dict):
-        fn = self.params.get('download_archive')
+        if not self.archive:
        if fn is None:
            return False
-        vid_id = self._make_archive_id(info_dict)
+        vid_ids = [self._make_archive_id(info_dict)]
-        if not vid_id:
+        vid_ids.extend(info_dict.get('_old_archive_ids') or [])
-            return False  # Incomplete video information
+        return any(id_ in self.archive for id_ in vid_ids)
        return vid_id in self.archive
    def record_download_archive(self, info_dict):
        fn = self.params.get('download_archive')
@@ -3445,9 +3485,11 @@ class YoutubeDL:
            return
        vid_id = self._make_archive_id(info_dict)
        assert vid_id
        self.write_debug(f'Adding to archive: {vid_id}')
-        with locked_file(fn, 'a', encoding='utf-8') as archive_file:
+        if is_path_like(fn):
-            archive_file.write(vid_id + '\n')
+            with locked_file(fn, 'a', encoding='utf-8') as archive_file:
                archive_file.write(vid_id + '\n')
        self.archive.add(vid_id)
    @staticmethod
@@ -3567,6 +3609,7 @@ class YoutubeDL:
                format_field(f, func=self.format_resolution, ignore=('audio only', 'images')),
                format_field(f, 'fps', '\t%d', func=round),
                format_field(f, 'dynamic_range', '%s', ignore=(None, 'SDR')).replace('HDR', ''),
                format_field(f, 'audio_channels', '\t%s'),
                delim,
                format_field(f, 'filesize', ' \t%s', func=format_bytes) + format_field(f, 'filesize_approx', '~\t%s', func=format_bytes),
                format_field(f, 'tbr', '\t%dk', func=round),
@@ -3586,7 +3629,7 @@ class YoutubeDL:
                    delim=' '),
            ] for f in formats if f.get('preference') is None or f['preference'] >= -1000]
        header_line = self._list_format_headers(
-            'ID', 'EXT', 'RESOLUTION', '\tFPS', 'HDR', delim, '\tFILESIZE', '\tTBR', 'PROTO',
+            'ID', 'EXT', 'RESOLUTION', '\tFPS', 'HDR', 'CH', delim, '\tFILESIZE', '\tTBR', 'PROTO',
            delim, 'VCODEC', '\tVBR', 'ACODEC', '\tABR', '\tASR', 'MORE INFO')
        return render_table(
@@ -3599,7 +3642,7 @@ class YoutubeDL:
            return None
        return render_table(
            self._list_format_headers('ID', 'Width', 'Height', 'URL'),
-            [[t.get('id'), t.get('width', 'unknown'), t.get('height', 'unknown'), t['url']] for t in thumbnails])
+            [[t.get('id'), t.get('width') or 'unknown', t.get('height') or 'unknown', t['url']] for t in thumbnails])
    def render_subtitles_table(self, video_id, subtitles):
        def _row(lang, formats):
@@ -3642,6 +3685,8 @@ class YoutubeDL:
        if not self.params.get('verbose'):
            return
        from . import _IN_CLI  # Must be delayed import
        # These imports can be slow. So import them only as needed
        from .extractor.extractors import _LAZY_LOADER
        from .extractor.extractors import _PLUGIN_CLASSES as plugin_extractors
@@ -3671,10 +3716,14 @@ class YoutubeDL:
            write_debug = lambda msg: self._write_string(f'[debug] {msg}\n')
        source = detect_variant()
        if VARIANT not in (None, 'pip'):
            source += '*'
        write_debug(join_nonempty(
-            'yt-dlp version', __version__,
+            f'{"yt-dlp" if REPOSITORY == "yt-dlp/yt-dlp" else REPOSITORY} version',
            __version__,
            f'[{RELEASE_GIT_HEAD}]' if RELEASE_GIT_HEAD else '',
            '' if source == 'unknown' else f'({source})',
            '' if _IN_CLI else 'API',
            delim=' '))
        if not _LAZY_LOADER:
            if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
@@ -3688,18 +3737,8 @@ class YoutubeDL:
        if self.params['compat_opts']:
            write_debug('Compatibility options: %s' % ', '.join(self.params['compat_opts']))
-        if source == 'source':
+        if current_git_head():
-            try:
+            write_debug(f'Git HEAD: {current_git_head()}')
                stdout, _, _ = Popen.run(
                    ['git', 'rev-parse', '--short', 'HEAD'],
                    text=True, cwd=os.path.dirname(os.path.abspath(__file__)),
                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                if re.fullmatch('[0-9a-f]+', stdout.strip()):
                    write_debug(f'Git HEAD: {stdout.strip()}')
            except Exception:
                with contextlib.suppress(Exception):
                    sys.exc_clear()
        write_debug(system_identifier())
        exe_versions, ffmpeg_features = FFmpegPostProcessor.get_versions_and_features(self)
@@ -1,4 +1,8 @@
-f'You are using an unsupported version of Python. Only Python versions 3.6 and above are supported by yt-dlp'  # noqa: F541
+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
 __license__ = 'Public Domain'
@@ -20,6 +24,8 @@ from .extractor.common import InfoExtractor
 from .options import parseOpts
 from .postprocessor import (
    FFmpegExtractAudioPP,
    FFmpegMergerPP,
    FFmpegPostProcessor,
    FFmpegSubtitlesConvertorPP,
    FFmpegThumbnailsConvertorPP,
    FFmpegVideoConvertorPP,
@@ -57,6 +63,8 @@ from .utils import (
 )
 from .YoutubeDL import YoutubeDL
 _IN_CLI = False
 def _exit(status=0, *args):
    for msg in args:
@@ -222,6 +230,8 @@ def validate_options(opts):
        validate_regex('format sorting', f, InfoExtractor.FormatSort.regex)
    # Postprocessor formats
    validate_regex('merge output format', opts.merge_output_format,
                   r'({0})(/({0}))*'.format('|'.join(map(re.escape, FFmpegMergerPP.SUPPORTED_EXTS))))
    validate_regex('audio format', opts.audioformat, FFmpegExtractAudioPP.FORMAT_RE)
    validate_in('subtitle format', opts.convertsubtitles, FFmpegSubtitlesConvertorPP.SUPPORTED_EXTS)
    validate_regex('thumbnail format', opts.convertthumbnails, FFmpegThumbnailsConvertorPP.FORMAT_RE)
@@ -316,14 +326,15 @@ def validate_options(opts):
    def parse_chapters(name, value):
        chapters, ranges = [], []
        parse_timestamp = lambda x: float('inf') if x in ('inf', 'infinite') else parse_duration(x)
        for regex in value or []:
            if regex.startswith('*'):
-                for range in regex[1:].split(','):
+                for range_ in map(str.strip, regex[1:].split(',')):
-                    dur = tuple(map(parse_duration, range.strip().split('-')))
+                    mobj = range_ != '-' and re.fullmatch(r'([^-]+)?\s*-\s*([^-]+)?', range_)
-                    if len(dur) == 2 and all(t is not None for t in dur):
+                    dur = mobj and (parse_timestamp(mobj.group(1) or '0'), parse_timestamp(mobj.group(2) or 'inf'))
-                        ranges.append(dur)
+                    if None in (dur or [None]):
                    else:
                        raise ValueError(f'invalid {name} time range "{regex}". Must be of the form *start-end')
                    ranges.append(dur)
                continue
            try:
                chapters.append(re.compile(regex))
@@ -336,10 +347,16 @@ def validate_options(opts):
    # Cookies from browser
    if opts.cookiesfrombrowser:
-        mobj = re.match(r'(?P<name>[^+:]+)(\s*\+\s*(?P<keyring>[^:]+))?(\s*:(?P<profile>.+))?', 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)
        if mobj is None:
            raise ValueError(f'invalid cookies from browser arguments: {opts.cookiesfrombrowser}')
-        browser_name, keyring, profile = mobj.group('name', 'keyring', 'profile')
+        browser_name, keyring, profile, container = mobj.group('name', 'keyring', 'profile', 'container')
        browser_name = browser_name.lower()
        if browser_name not in SUPPORTED_BROWSERS:
            raise ValueError(f'unsupported browser specified for cookies: "{browser_name}". '
@@ -349,7 +366,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)
+        opts.cookiesfrombrowser = (browser_name, profile, keyring, container)
    # MetadataParser
    def metadataparser_actions(f):
@@ -394,6 +411,9 @@ def validate_options(opts):
    if opts.download_archive is not None:
        opts.download_archive = expand_path(opts.download_archive)
    if opts.ffmpeg_location is not None:
        opts.ffmpeg_location = expand_path(opts.ffmpeg_location)
    if opts.user_agent is not None:
        opts.headers.setdefault('User-Agent', opts.user_agent)
    if opts.referer is not None:
@@ -469,7 +489,7 @@ def validate_options(opts):
                    val1=opts.sponskrub and opts.sponskrub_cut)
    # Conflicts with --allow-unplayable-formats
-    report_conflict('--add-metadata', 'addmetadata')
+    report_conflict('--embed-metadata', 'addmetadata')
    report_conflict('--embed-chapters', 'addchapters')
    report_conflict('--embed-info-json', 'embed_infojson')
    report_conflict('--embed-subs', 'embedsubtitles')
@@ -758,6 +778,7 @@ 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,
@@ -899,6 +920,11 @@ 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
@@ -14,4 +14,5 @@ if __package__ is None and not hasattr(sys, 'frozen'):
 import yt_dlp
 if __name__ == '__main__':
    yt_dlp._IN_CLI = True
    yt_dlp.main()
@@ -6,7 +6,8 @@ import re
 import shutil
 import traceback
-from .utils import expand_path, write_json_file
+from .utils import expand_path, traverse_obj, version_tuple, write_json_file
 from .version import __version__
 class Cache:
@@ -45,12 +46,20 @@ class Cache:
                if ose.errno != errno.EEXIST:
                    raise
            self._ydl.write_debug(f'Saving {section}.{key} to cache')
-            write_json_file(data, fn)
+            write_json_file({'yt-dlp_version': __version__, 'data': data}, fn)
        except Exception:
            tb = traceback.format_exc()
            self._ydl.report_warning(f'Writing cache to {fn!r} failed: {tb}')
-    def load(self, section, key, dtype='json', default=None):
+    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):
        assert dtype in ('json',)
        if not self.enabled:
@@ -61,8 +70,8 @@ class Cache:
            try:
                with open(cache_fn, encoding='utf-8') as cachef:
                    self._ydl.write_debug(f'Loading {section}.{key} from cache')
-                    return json.load(cachef)
+                    return self._validate(json.load(cachef), min_ver)
-            except ValueError:
+            except (ValueError, KeyError):
                try:
                    file_size = os.path.getsize(cache_fn)
                except OSError as oe:
@@ -3,13 +3,12 @@ import sys
 import warnings
 import xml.etree.ElementTree as etree
 from . import re
 from ._deprecated import *  # noqa: F401, F403
 from .compat_utils import passthrough_module
 # XXX: Implement this the same way as other DeprecationWarnings without circular import
 passthrough_module(__name__, '._legacy', callback=lambda attr: warnings.warn(
-    DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=2))
+    DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=3))
 # HTMLParseError has been deprecated in Python 3.3 and removed in
@@ -33,6 +32,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"' % s.replace('"', '\\"')
 else:
    from shlex import quote as compat_shlex_quote  # noqa: F401
@@ -22,10 +22,14 @@ import urllib.request
 import xml.etree.ElementTree as etree
 from subprocess import DEVNULL
-from .compat_utils import passthrough_module  # isort: split
+# isort: split
-from .asyncio import run as compat_asyncio_run  # noqa: F401
+import asyncio  # noqa: F401
-from .re import Pattern as compat_Pattern  # noqa: F401
+import re  # noqa: F401
-from .re import match as compat_Match  # 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 .compat_utils import passthrough_module
 from ..dependencies import Cryptodome_AES as compat_pycrypto_AES  # noqa: F401
 from ..dependencies import brotli as compat_brotli  # noqa: F401
 from ..dependencies import websockets as compat_websockets  # noqa: F401
@@ -1,23 +0,0 @@
 # 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
@@ -2,13 +2,15 @@ tests = {
    'webp': lambda h: h[0:4] == b'RIFF' and h[8:] == b'WEBP',
    'png': lambda h: h[:8] == b'\211PNG\r\n\032\n',
    'jpeg': lambda h: h[6:10] in (b'JFIF', b'Exif'),
    'gif': lambda h: h[:6] in (b'GIF87a', b'GIF89a'),
 }
-def what(path):
+def what(file=None, h=None):
-    """Detect format of image (Currently supports jpeg, png, webp only)
+    """Detect format of image (Currently supports jpeg, png, webp, gif only)
    Ref: https://github.com/python/cpython/blob/3.10/Lib/imghdr.py
    """
-    with open(path, 'rb') as f:
+    if h is None:
-        head = f.read(12)
+        with open(file, 'rb') as f:
-    return next((type_ for type_, test in tests.items() if test(head)), None)
+            h = f.read(12)
    return next((type_ for type_, test in tests.items() if test(h)), None)
@@ -1,18 +0,0 @@
 # 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(''))
@@ -1,9 +1,10 @@
 import base64
 import contextlib
 import ctypes
 import http.cookiejar
 import http.cookies
 import json
 import os
 import re
 import shutil
 import struct
 import subprocess
@@ -25,7 +26,14 @@ from .dependencies import (
    sqlite3,
 )
 from .minicurses import MultilinePrinter, QuietMultilinePrinter
-from .utils import Popen, YoutubeDLCookieJar, error_to_str, expand_path
+from .utils import (
    Popen,
    YoutubeDLCookieJar,
    error_to_str,
    expand_path,
    is_path_like,
    try_call,
 )
 CHROMIUM_BASED_BROWSERS = {'brave', 'chrome', 'chromium', 'edge', 'opera', 'vivaldi'}
 SUPPORTED_BROWSERS = CHROMIUM_BASED_BROWSERS | {'firefox', 'safari'}
@@ -86,11 +94,12 @@ def _create_progress_bar(logger):
 def load_cookies(cookie_file, browser_specification, ydl):
    cookie_jars = []
    if browser_specification is not None:
-        browser_name, profile, keyring = _parse_browser_specification(*browser_specification)
+        browser_name, profile, keyring, container = _parse_browser_specification(*browser_specification)
-        cookie_jars.append(extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring))
+        cookie_jars.append(
            extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring, container=container))
    if cookie_file is not None:
-        is_filename = YoutubeDLCookieJar.is_path(cookie_file)
+        is_filename = is_path_like(cookie_file)
        if is_filename:
            cookie_file = expand_path(cookie_file)
@@ -102,9 +111,9 @@ def load_cookies(cookie_file, browser_specification, ydl):
    return _merge_cookie_jars(cookie_jars)
-def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(), *, keyring=None):
+def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(), *, keyring=None, container=None):
    if browser_name == 'firefox':
-        return _extract_firefox_cookies(profile, logger)
+        return _extract_firefox_cookies(profile, container, logger)
    elif browser_name == 'safari':
        return _extract_safari_cookies(profile, logger)
    elif browser_name in CHROMIUM_BASED_BROWSERS:
@@ -113,7 +122,7 @@ def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(),
        raise ValueError(f'unknown browser: {browser_name}')
-def _extract_firefox_cookies(profile, logger):
+def _extract_firefox_cookies(profile, container, logger):
    logger.info('Extracting cookies from firefox')
    if not sqlite3:
        logger.warning('Cannot extract cookies from firefox without sqlite3 support. '
@@ -132,11 +141,36 @@ def _extract_firefox_cookies(profile, logger):
        raise FileNotFoundError(f'could not find firefox cookies database in {search_root}')
    logger.debug(f'Extracting cookies from: "{cookie_database_path}"')
    container_id = None
    if container not in (None, 'none'):
        containers_path = os.path.join(os.path.dirname(cookie_database_path), 'containers.json')
        if not os.path.isfile(containers_path) or not os.access(containers_path, os.R_OK):
            raise FileNotFoundError(f'could not read containers.json in {search_root}')
        with open(containers_path) as containers:
            identities = json.load(containers).get('identities', [])
        container_id = next((context.get('userContextId') for context in identities if container in (
            context.get('name'),
            try_call(lambda: re.fullmatch(r'userContext([^\.]+)\.label', context['l10nID']).group())
        )), None)
        if not isinstance(container_id, int):
            raise ValueError(f'could not find firefox container "{container}" in containers.json')
    with tempfile.TemporaryDirectory(prefix='yt_dlp') as tmpdir:
        cursor = None
        try:
            cursor = _open_database_copy(cookie_database_path, tmpdir)
-            cursor.execute('SELECT host, name, value, path, expiry, isSecure FROM moz_cookies')
+            if isinstance(container_id, int):
                logger.debug(
                    f'Only loading cookies from firefox container "{container}", ID {container_id}')
                cursor.execute(
                    'SELECT host, name, value, path, expiry, isSecure FROM moz_cookies WHERE originAttributes LIKE ? OR originAttributes LIKE ?',
                    (f'%userContextId={container_id}', f'%userContextId={container_id}&%'))
            elif container == 'none':
                logger.debug('Only loading cookies not belonging to any container')
                cursor.execute(
                    'SELECT host, name, value, path, expiry, isSecure FROM moz_cookies WHERE NOT INSTR(originAttributes,"userContextId=")')
            else:
                cursor.execute('SELECT host, name, value, path, expiry, isSecure FROM moz_cookies')
            jar = YoutubeDLCookieJar()
            with _create_progress_bar(logger) as progress_bar:
                table = cursor.fetchall()
@@ -811,12 +845,15 @@ def _get_linux_keyring_password(browser_keyring_name, keyring, logger):
 def _get_mac_keyring_password(browser_keyring_name, logger):
    logger.debug('using find-generic-password to obtain password from OSX keychain')
    try:
-        stdout, _, _ = Popen.run(
+        stdout, _, returncode = Popen.run(
            ['security', 'find-generic-password',
             '-w',  # write password to stdout
             '-a', browser_keyring_name,  # match 'account'
             '-s', f'{browser_keyring_name} Safe Storage'],  # match 'service'
            stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
        if returncode:
            logger.warning('find-generic-password failed')
            return None
        return stdout.rstrip(b'\n')
    except Exception as e:
        logger.warning(f'exception running find-generic-password: {error_to_str(e)}')
@@ -876,10 +913,12 @@ def _decrypt_windows_dpapi(ciphertext, logger):
    References:
        - https://docs.microsoft.com/en-us/windows/win32/api/dpapi/nf-dpapi-cryptunprotectdata
    """
-    from ctypes.wintypes import DWORD
+
    import ctypes
    import ctypes.wintypes
    class DATA_BLOB(ctypes.Structure):
-        _fields_ = [('cbData', DWORD),
+        _fields_ = [('cbData', ctypes.wintypes.DWORD),
                    ('pbData', ctypes.POINTER(ctypes.c_char))]
    buffer = ctypes.create_string_buffer(ciphertext)
@@ -947,11 +986,106 @@ def _is_path(value):
    return os.path.sep in value
-def _parse_browser_specification(browser_name, profile=None, keyring=None):
+def _parse_browser_specification(browser_name, profile=None, keyring=None, container=None):
    if browser_name not in SUPPORTED_BROWSERS:
        raise ValueError(f'unsupported browser: "{browser_name}"')
    if keyring not in (None, *SUPPORTED_KEYRINGS):
        raise ValueError(f'unsupported keyring: "{keyring}"')
-    if profile is not None and _is_path(profile):
+    if profile is not None and _is_path(expand_path(profile)):
-        profile = os.path.expanduser(profile)
+        profile = expand_path(profile)
-    return browser_name, profile, keyring
+    return browser_name, profile, keyring, container
 class LenientSimpleCookie(http.cookies.SimpleCookie):
    """More lenient version of http.cookies.SimpleCookie"""
    # From https://github.com/python/cpython/blob/v3.10.7/Lib/http/cookies.py
    _LEGAL_KEY_CHARS = r"\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\="
    _LEGAL_VALUE_CHARS = _LEGAL_KEY_CHARS + r"\[\]"
    _RESERVED = {
        "expires",
        "path",
        "comment",
        "domain",
        "max-age",
        "secure",
        "httponly",
        "version",
        "samesite",
    }
    _FLAGS = {"secure", "httponly"}
    # Added 'bad' group to catch the remaining value
    _COOKIE_PATTERN = re.compile(r"""
        \s*                            # Optional whitespace at start of cookie
        (?P<key>                       # Start of group 'key'
        [""" + _LEGAL_KEY_CHARS + r"""]+?# Any word of at least one letter
        )                              # End of group 'key'
        (                              # Optional group: there may not be a value.
        \s*=\s*                          # Equal Sign
        (                                # Start of potential value
        (?P<val>                           # Start of group 'val'
        "(?:[^\\"]|\\.)*"                    # Any doublequoted string
        |                                    # or
        \w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT # Special case for "expires" attr
        |                                    # or
        [""" + _LEGAL_VALUE_CHARS + r"""]*     # Any word or empty string
        )                                  # End of group 'val'
        |                                  # or
        (?P<bad>(?:\\;|[^;])*?)            # 'bad' group fallback for invalid values
        )                                # End of potential value
        )?                             # End of optional value group
        \s*                            # Any number of spaces.
        (\s+|;|$)                      # Ending either at space, semicolon, or EOS.
        """, re.ASCII | re.VERBOSE)
    def load(self, data):
        # Workaround for https://github.com/yt-dlp/yt-dlp/issues/4776
        if not isinstance(data, str):
            return super().load(data)
        morsel = None
        index = 0
        length = len(data)
        while 0 <= index < length:
            match = self._COOKIE_PATTERN.search(data, index)
            if not match:
                break
            index = match.end(0)
            if match.group("bad"):
                morsel = None
                continue
            key, value = match.group("key", "val")
            if key[0] == "$":
                if morsel is not None:
                    morsel[key[1:]] = True
                continue
            lower_key = key.lower()
            if lower_key in self._RESERVED:
                if morsel is None:
                    continue
                if value is None:
                    if lower_key not in self._FLAGS:
                        morsel = None
                        continue
                    value = True
                else:
                    value, _ = self.value_decode(value)
                morsel[key] = value
            elif value is not None:
                morsel = self.get(key, http.cookies.Morsel())
                real_value, coded_value = self.value_decode(value)
                morsel.set(key, real_value, coded_value)
                self[key] = morsel
            else:
                morsel = None
@@ -28,7 +28,7 @@ try:
 except ImportError:
    try:
        from Crypto.Cipher import AES as Cryptodome_AES
-    except ImportError:
+    except (ImportError, SyntaxError):  # Old Crypto gives SyntaxError in newer Python
        Cryptodome_AES = None
    else:
        try:
@@ -1,5 +1,6 @@
 import contextlib
 import errno
 import functools
 import os
 import random
 import re
@@ -12,16 +13,18 @@ from ..minicurses import (
    QuietMultilinePrinter,
 )
 from ..utils import (
    IDENTITY,
    NO_DEFAULT,
    NUMBER_RE,
    LockingUnsupportedError,
    Namespace,
    RetryManager,
    classproperty,
    decodeArgument,
    encodeFilename,
    error_to_compat_str,
    float_or_none,
    format_bytes,
    join_nonempty,
    remove_start,
    sanitize_open,
    shell_quote,
    timeconvert,
@@ -90,6 +93,7 @@ class FileDownloader:
        for func in (
            'deprecation_warning',
            'deprecated_feature',
            'report_error',
            'report_file_already_downloaded',
            'report_warning',
@@ -117,11 +121,11 @@ class FileDownloader:
        time = timetuple_from_msec(seconds * 1000)
        if time.hours > 99:
            return '--:--:--'
        if not time.hours:
            return '%02d:%02d' % time[1:-1]
        return '%02d:%02d:%02d' % time[:-1]
-    format_eta = format_seconds
+    @classmethod
    def format_eta(cls, seconds):
        return f'{remove_start(cls.format_seconds(seconds), "00:"):>8s}'
    @staticmethod
    def calc_percent(byte_counter, data_len):
@@ -215,27 +219,24 @@ class FileDownloader:
        return filename + '.ytdl'
    def wrap_file_access(action, *, fatal=False):
-        def outer(func):
+        def error_callback(err, count, retries, *, fd):
-            def inner(self, *args, **kwargs):
+            return RetryManager.report_retry(
-                file_access_retries = self.params.get('file_access_retries', 0)
+                err, count, retries, info=fd.__to_screen,
-                retry = 0
+                warn=lambda e: (time.sleep(0.01), fd.to_screen(f'[download] Unable to {action} file: {e}')),
-                while True:
+                error=None if fatal else lambda e: fd.report_error(f'Unable to {action} file: {e}'),
-                    try:
+                sleep_func=fd.params.get('retry_sleep_functions', {}).get('file_access'))
-                        return func(self, *args, **kwargs)
+
-                    except OSError as err:
+        def wrapper(self, func, *args, **kwargs):
-                        retry = retry + 1
+            for retry in RetryManager(self.params.get('file_access_retries'), error_callback, fd=self):
-                        if retry > file_access_retries or err.errno not in (errno.EACCES, errno.EINVAL):
+                try:
-                            if not fatal:
+                    return func(self, *args, **kwargs)
-                                self.report_error(f'unable to {action} file: {err}')
+                except OSError as err:
-                                return
+                    if err.errno in (errno.EACCES, errno.EINVAL):
-                            raise
+                        retry.error = err
-                        self.to_screen(
+                        continue
-                            f'[download] Unable to {action} file due to file access error. '
+                    retry.error_callback(err, 1, 0)
-                            f'Retrying (attempt {retry} of {self.format_retries(file_access_retries)}) ...')
+
-                        if not self.sleep_retry('file_access', retry):
+        return functools.partial(functools.partialmethod, wrapper)
                            time.sleep(0.01)
            return inner
        return outer
    @wrap_file_access('open', fatal=True)
    def sanitize_open(self, filename, open_mode):
@@ -332,11 +333,16 @@ class FileDownloader:
                    return tmpl
            return default
        _formats_bytes = lambda k: f'{format_bytes(s.get(k)):>10s}'
        if s['status'] == 'finished':
            if self.params.get('noprogress'):
                self.to_screen('[download] Download completed')
            speed = try_call(lambda: s['total_bytes'] / s['elapsed'])
            s.update({
-                '_total_bytes_str': format_bytes(s.get('total_bytes')),
+                'speed': speed,
                '_speed_str': self.format_speed(speed).strip(),
                '_total_bytes_str': _formats_bytes('total_bytes'),
                '_elapsed_str': self.format_seconds(s.get('elapsed')),
                '_percent_str': self.format_percent(100),
            })
@@ -344,21 +350,22 @@ class FileDownloader:
                '100%%',
                with_fields(('total_bytes', 'of %(_total_bytes_str)s')),
                with_fields(('elapsed', 'in %(_elapsed_str)s')),
                with_fields(('speed', 'at %(_speed_str)s')),
                delim=' '))
        if s['status'] != 'downloading':
            return
        s.update({
-            '_eta_str': self.format_eta(s.get('eta')),
+            '_eta_str': self.format_eta(s.get('eta')).strip(),
            '_speed_str': self.format_speed(s.get('speed')),
            '_percent_str': self.format_percent(try_call(
                lambda: 100 * s['downloaded_bytes'] / s['total_bytes'],
                lambda: 100 * s['downloaded_bytes'] / s['total_bytes_estimate'],
                lambda: s['downloaded_bytes'] == 0 and 0)),
-            '_total_bytes_str': format_bytes(s.get('total_bytes')),
+            '_total_bytes_str': _formats_bytes('total_bytes'),
-            '_total_bytes_estimate_str': format_bytes(s.get('total_bytes_estimate')),
+            '_total_bytes_estimate_str': _formats_bytes('total_bytes_estimate'),
-            '_downloaded_bytes_str': format_bytes(s.get('downloaded_bytes')),
+            '_downloaded_bytes_str': _formats_bytes('downloaded_bytes'),
            '_elapsed_str': self.format_seconds(s.get('elapsed')),
        })
@@ -378,25 +385,20 @@ class FileDownloader:
        """Report attempt to resume at given byte."""
        self.to_screen('[download] Resuming download at byte %s' % resume_len)
-    def report_retry(self, err, count, retries):
+    def report_retry(self, err, count, retries, frag_index=NO_DEFAULT, fatal=True):
-        """Report retry in case of HTTP error 5xx"""
+        """Report retry"""
-        self.__to_screen(
+        is_frag = False if frag_index is NO_DEFAULT else 'fragment'
-            '[download] Got server HTTP error: %s. Retrying (attempt %d of %s) ...'
+        RetryManager.report_retry(
-            % (error_to_compat_str(err), count, self.format_retries(retries)))
+            err, count, retries, info=self.__to_screen,
-        self.sleep_retry('http', count)
+            warn=lambda msg: self.__to_screen(f'[download] Got error: {msg}'),
            error=IDENTITY if not fatal else lambda e: self.report_error(f'\r[download] Got error: {e}'),
            sleep_func=self.params.get('retry_sleep_functions', {}).get(is_frag or 'http'),
            suffix=f'fragment{"s" if frag_index is None else f" {frag_index}"}' if is_frag else None)
    def report_unable_to_resume(self):
        """Report it was impossible to resume download."""
        self.to_screen('[download] Unable to resume')
    def sleep_retry(self, retry_type, count):
        sleep_func = self.params.get('retry_sleep_functions', {}).get(retry_type)
        delay = float_or_none(sleep_func(n=count - 1)) if sleep_func else None
        if delay:
            self.__to_screen(f'Sleeping {delay:.2f} seconds ...')
            time.sleep(delay)
        return sleep_func is not None
    @staticmethod
    def supports_manifest(manifest):
        """ Whether the downloader can download the fragments from the manifest.
@@ -10,6 +10,7 @@ from ..compat import functools
 from ..postprocessor.ffmpeg import EXT_TO_OUT_FORMATS, FFmpegPostProcessor
 from ..utils import (
    Popen,
    RetryManager,
    _configuration_args,
    check_executable,
    classproperty,
@@ -134,29 +135,22 @@ class ExternalFD(FragmentFD):
                self.to_stderr(stderr)
            return returncode
        fragment_retries = self.params.get('fragment_retries', 0)
        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
-        count = 0
+        retry_manager = RetryManager(self.params.get('fragment_retries'), self.report_retry,
-        while count <= fragment_retries:
+                                     frag_index=None, fatal=not skip_unavailable_fragments)
        for retry in retry_manager:
            _, stderr, returncode = Popen.run(cmd, text=True, stderr=subprocess.PIPE)
            if not returncode:
                break
            # TODO: Decide whether to retry based on error code
            # https://aria2.github.io/manual/en/html/aria2c.html#exit-status
            if stderr:
                self.to_stderr(stderr)
-            count += 1
+            retry.error = Exception()
-            if count <= fragment_retries:
+            continue
-                self.to_screen(
+        if not skip_unavailable_fragments and retry_manager.error:
-                    '[%s] Got error. Retrying fragments (attempt %d of %s)...'
+            return -1
                    % (self.get_basename(), count, self.format_retries(fragment_retries)))
                self.sleep_retry('fragment', count)
        if count > fragment_retries:
            if not skip_unavailable_fragments:
                self.report_error('Giving up after %s fragment retries' % fragment_retries)
                return -1
        decrypt_fragment = self.decrypter(info_dict)
        dest, _ = self.sanitize_open(tmpfilename, 'wb')
@@ -258,6 +252,10 @@ class Aria2cFD(ExternalFD):
        check_results = (not re.search(feature, manifest) for feature in UNSUPPORTED_FEATURES)
        return all(check_results)
    @staticmethod
    def _aria2c_filename(fn):
        return fn if os.path.isabs(fn) else f'.{os.path.sep}{fn}'
    def _make_cmd(self, tmpfilename, info_dict):
        cmd = [self.exe, '-c',
               '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
@@ -286,11 +284,9 @@ class Aria2cFD(ExternalFD):
        # https://github.com/aria2/aria2/issues/1373
        dn = os.path.dirname(tmpfilename)
        if dn:
-            if not os.path.isabs(dn):
+            cmd += ['--dir', self._aria2c_filename(dn) + os.path.sep]
                dn = f'.{os.path.sep}{dn}'
            cmd += ['--dir', dn + os.path.sep]
        if 'fragments' not in info_dict:
-            cmd += ['--out', f'.{os.path.sep}{os.path.basename(tmpfilename)}']
+            cmd += ['--out', self._aria2c_filename(os.path.basename(tmpfilename))]
        cmd += ['--auto-file-renaming=false']
        if 'fragments' in info_dict:
@@ -299,11 +295,11 @@ class Aria2cFD(ExternalFD):
            url_list = []
            for frag_index, fragment in enumerate(info_dict['fragments']):
                fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], fragment_filename))
+                url_list.append('%s\n\tout=%s' % (fragment['url'], self._aria2c_filename(fragment_filename)))
            stream, _ = self.sanitize_open(url_list_file, 'wb')
            stream.write('\n'.join(url_list).encode())
            stream.close()
-            cmd += ['-i', url_list_file]
+            cmd += ['-i', self._aria2c_filename(url_list_file)]
        else:
            cmd += ['--', info_dict['url']]
        return cmd
@@ -521,16 +517,14 @@ _BY_NAME = {
    if name.endswith('FD') and name not in ('ExternalFD', 'FragmentFD')
 }
 _BY_EXE = {klass.EXE_NAME: klass for klass in _BY_NAME.values()}
 def list_external_downloaders():
    return sorted(_BY_NAME.keys())
 def get_external_downloader(external_downloader):
-    """ Given the name of the executable, see whether we support the given
+    """ Given the name of the executable, see whether we support the given downloader """
        downloader . """
    # Drop .exe extension on Windows
    bn = os.path.splitext(os.path.basename(external_downloader))[0]
-    return _BY_NAME.get(bn, _BY_EXE.get(bn))
+    return _BY_NAME.get(bn) or next((
        klass for klass in _BY_NAME.values() if klass.EXE_NAME in bn
    ), None)
@@ -184,7 +184,7 @@ def build_fragments_list(boot_info):
    first_frag_number = fragment_run_entry_table[0]['first']
    fragments_counter = itertools.count(first_frag_number)
    for segment, fragments_count in segment_run_table['segment_run']:
-        # In some live HDS streams (for example Rai), `fragments_count` is
+        # In some live HDS streams (e.g. Rai), `fragments_count` is
        # abnormal and causing out-of-memory errors. It's OK to change the
        # number of fragments for live streams as they are updated periodically
        if fragments_count == 4294967295 and boot_info['live']:
@@ -14,8 +14,8 @@ from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
 from ..compat import compat_os_name
 from ..utils import (
    DownloadError,
    RetryManager,
    encodeFilename,
    error_to_compat_str,
    sanitized_Request,
    traverse_obj,
 )
@@ -65,10 +65,9 @@ class FragmentFD(FileDownloader):
    """
    def report_retry_fragment(self, err, frag_index, count, retries):
-        self.to_screen(
+        self.deprecation_warning('yt_dlp.downloader.FragmentFD.report_retry_fragment is deprecated. '
-            '\r[download] Got server HTTP error: %s. Retrying fragment %d (attempt %d of %s) ...'
+                                 'Use yt_dlp.downloader.FileDownloader.report_retry instead')
-            % (error_to_compat_str(err), frag_index, count, self.format_retries(retries)))
+        return self.report_retry(err, count, retries, frag_index)
        self.sleep_retry('fragment', count)
    def report_skip_fragment(self, frag_index, err=None):
        err = f' {err};' if err else ''
@@ -347,6 +346,8 @@ class FragmentFD(FileDownloader):
            return _key_cache[url]
        def decrypt_fragment(fragment, frag_content):
            if frag_content is None:
                return
            decrypt_info = fragment.get('decrypt_info')
            if not decrypt_info or decrypt_info['METHOD'] != 'AES-128':
                return frag_content
@@ -432,7 +433,6 @@ class FragmentFD(FileDownloader):
        if not interrupt_trigger:
            interrupt_trigger = (True, )
        fragment_retries = self.params.get('fragment_retries', 0)
        is_fatal = (
            ((lambda _: False) if info_dict.get('is_live') else (lambda idx: idx == 0))
            if self.params.get('skip_unavailable_fragments', True) else (lambda _: True))
@@ -452,32 +452,25 @@ class FragmentFD(FileDownloader):
                headers['Range'] = 'bytes=%d-%d' % (byte_range['start'], byte_range['end'] - 1)
            # Never skip the first fragment
-            fatal, count = is_fatal(fragment.get('index') or (frag_index - 1)), 0
+            fatal = is_fatal(fragment.get('index') or (frag_index - 1))
-            while count <= fragment_retries:
+
            def error_callback(err, count, retries):
                if fatal and count > retries:
                    ctx['dest_stream'].close()
                self.report_retry(err, count, retries, frag_index, fatal)
                ctx['last_error'] = err
            for retry in RetryManager(self.params.get('fragment_retries'), error_callback):
                try:
                    ctx['fragment_count'] = fragment.get('fragment_count')
-                    if self._download_fragment(ctx, fragment['url'], info_dict, headers):
+                    if not self._download_fragment(ctx, fragment['url'], info_dict, headers):
-                        break
+                        return
                    return
                except (urllib.error.HTTPError, http.client.IncompleteRead) as err:
-                    # Unavailable (possibly temporary) fragments may be served.
+                    retry.error = err
-                    # First we try to retry then either skip or abort.
+                    continue
-                    # See https://github.com/ytdl-org/youtube-dl/issues/10165,
+                except DownloadError:  # has own retry settings
-                    # https://github.com/ytdl-org/youtube-dl/issues/10448).
+                    if fatal:
-                    count += 1
+                        raise
                    ctx['last_error'] = err
                    if count <= fragment_retries:
                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
                except DownloadError:
                    # Don't retry fragment if error occurred during HTTP downloading
                    # itself since it has own retry settings
                    if not fatal:
                        break
                    raise
            if count > fragment_retries and fatal:
                ctx['dest_stream'].close()
                self.report_error('Giving up after %s fragment retries' % fragment_retries)
        def append_fragment(frag_content, frag_index, ctx):
            if frag_content:
@@ -9,6 +9,7 @@ import urllib.error
 from .common import FileDownloader
 from ..utils import (
    ContentTooShortError,
    RetryManager,
    ThrottledDownload,
    XAttrMetadataError,
    XAttrUnavailableError,
@@ -72,9 +73,6 @@ class HttpFD(FileDownloader):
        ctx.is_resume = ctx.resume_len > 0
        count = 0
        retries = self.params.get('retries', 0)
        class SucceedDownload(Exception):
            pass
@@ -349,9 +347,7 @@ class HttpFD(FileDownloader):
            if data_len is not None and byte_counter != data_len:
                err = ContentTooShortError(byte_counter, int(data_len))
-                if count <= retries:
+                retry(err)
                    retry(err)
                raise err
            self.try_rename(ctx.tmpfilename, ctx.filename)
@@ -370,24 +366,20 @@ class HttpFD(FileDownloader):
            return True
-        while count <= retries:
+        for retry in RetryManager(self.params.get('retries'), self.report_retry):
            try:
                establish_connection()
                return download()
-            except RetryDownload as e:
+            except RetryDownload as err:
-                count += 1
+                retry.error = err.source_error
                if count <= retries:
                    self.report_retry(e.source_error, count, retries)
                else:
                    self.to_screen(f'[download] Got server HTTP error: {e.source_error}')
                continue
            except NextFragment:
                retry.error = None
                retry.attempt -= 1
                continue
            except SucceedDownload:
                return True
            except:  # noqa: E722
                close_stream()
                raise
        self.report_error('giving up after %s retries' % retries)
        return False
@@ -5,6 +5,7 @@ import time
 import urllib.error
 from .fragment import FragmentFD
 from ..utils import RetryManager
 u8 = struct.Struct('>B')
 u88 = struct.Struct('>Bx')
@@ -137,6 +138,8 @@ def write_piff_header(stream, params):
        if fourcc == 'AACL':
            sample_entry_box = box(b'mp4a', sample_entry_payload)
        if fourcc == 'EC-3':
            sample_entry_box = box(b'ec-3', sample_entry_payload)
    elif stream_type == 'video':
        sample_entry_payload += u16.pack(0)  # pre defined
        sample_entry_payload += u16.pack(0)  # reserved
@@ -245,7 +248,6 @@ class IsmFD(FragmentFD):
            'ism_track_written': False,
        })
        fragment_retries = self.params.get('fragment_retries', 0)
        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
        frag_index = 0
@@ -253,8 +255,10 @@ class IsmFD(FragmentFD):
            frag_index += 1
            if frag_index <= ctx['fragment_index']:
                continue
-            count = 0
+
-            while count <= fragment_retries:
+            retry_manager = RetryManager(self.params.get('fragment_retries'), self.report_retry,
                                         frag_index=frag_index, fatal=not skip_unavailable_fragments)
            for retry in retry_manager:
                try:
                    success = self._download_fragment(ctx, segment['url'], info_dict)
                    if not success:
@@ -267,18 +271,14 @@ class IsmFD(FragmentFD):
                        write_piff_header(ctx['dest_stream'], info_dict['_download_params'])
                        extra_state['ism_track_written'] = True
                    self._append_fragment(ctx, frag_content)
                    break
                except urllib.error.HTTPError as err:
-                    count += 1
+                    retry.error = err
                    if count <= fragment_retries:
                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
            if count > fragment_retries:
                if skip_unavailable_fragments:
                    self.report_skip_fragment(frag_index)
                    continue
-                self.report_error('giving up after %s fragment retries' % fragment_retries)
+
-                return False
+            if retry_manager.error:
                if not skip_unavailable_fragments:
                    return False
                self.report_skip_fragment(frag_index)
        self._finish_frag_download(ctx, info_dict)
        return True
@@ -4,6 +4,7 @@ import re
 import uuid
 from .fragment import FragmentFD
 from ..compat import imghdr
 from ..utils import escapeHTML, formatSeconds, srt_subtitles_timecode, urljoin
 from ..version import __version__ as YT_DLP_VERSION
@@ -166,21 +167,13 @@ body > figure > img {
                continue
            frag_content = self._read_fragment(ctx)
            mime_type = b'image/jpeg'
            if frag_content.startswith(b'\x89PNG\r\n\x1a\n'):
                mime_type = b'image/png'
            if frag_content.startswith((b'GIF87a', b'GIF89a')):
                mime_type = b'image/gif'
            if frag_content.startswith(b'RIFF') and frag_content[8:12] == b'WEBP':
                mime_type = b'image/webp'
            frag_header = io.BytesIO()
            frag_header.write(
                b'--%b\r\n' % frag_boundary.encode('us-ascii'))
            frag_header.write(
                b'Content-ID: <%b>\r\n' % self._gen_cid(i, fragment, frag_boundary).encode('us-ascii'))
            frag_header.write(
-                b'Content-type: %b\r\n' % mime_type)
+                b'Content-type: %b\r\n' % f'image/{imghdr.what(h=frag_content) or "jpeg"}'.encode())
            frag_header.write(
                b'Content-length: %u\r\n' % len(frag_content))
            frag_header.write(
@@ -1,3 +1,4 @@
 import asyncio
 import contextlib
 import os
 import signal
@@ -5,7 +6,6 @@ import threading
 from .common import FileDownloader
 from .external import FFmpegFD
 from ..compat import asyncio
 from ..dependencies import websockets
@@ -3,7 +3,13 @@ import time
 import urllib.error
 from .fragment import FragmentFD
-from ..utils import RegexNotFoundError, dict_get, int_or_none, try_get
+from ..utils import (
    RegexNotFoundError,
    RetryManager,
    dict_get,
    int_or_none,
    try_get,
 )
 class YoutubeLiveChatFD(FragmentFD):
@@ -16,7 +22,6 @@ class YoutubeLiveChatFD(FragmentFD):
            self.report_warning('Live chat download runs until the livestream ends. '
                                'If you wish to download the video simultaneously, run a separate yt-dlp instance')
        fragment_retries = self.params.get('fragment_retries', 0)
        test = self.params.get('test', False)
        ctx = {
@@ -104,8 +109,7 @@ class YoutubeLiveChatFD(FragmentFD):
            return continuation_id, live_offset, click_tracking_params
        def download_and_parse_fragment(url, frag_index, request_data=None, headers=None):
-            count = 0
+            for retry in RetryManager(self.params.get('fragment_retries'), self.report_retry, frag_index=frag_index):
            while count <= fragment_retries:
                try:
                    success = dl_fragment(url, request_data, headers)
                    if not success:
@@ -120,21 +124,15 @@ class YoutubeLiveChatFD(FragmentFD):
                    live_chat_continuation = try_get(
                        data,
                        lambda x: x['continuationContents']['liveChatContinuation'], dict) or {}
-                    if info_dict['protocol'] == 'youtube_live_chat_replay':
+
-                        if frag_index == 1:
+                    func = (info_dict['protocol'] == 'youtube_live_chat' and parse_actions_live
-                            continuation_id, offset, click_tracking_params = try_refresh_replay_beginning(live_chat_continuation)
+                            or frag_index == 1 and try_refresh_replay_beginning
-                        else:
+                            or parse_actions_replay)
-                            continuation_id, offset, click_tracking_params = parse_actions_replay(live_chat_continuation)
+                    return (True, *func(live_chat_continuation))
                    elif info_dict['protocol'] == 'youtube_live_chat':
                        continuation_id, offset, click_tracking_params = parse_actions_live(live_chat_continuation)
                    return True, continuation_id, offset, click_tracking_params
                except urllib.error.HTTPError as err:
-                    count += 1
+                    retry.error = err
-                    if count <= fragment_retries:
+                    continue
-                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
+            return False, None, None, None
            if count > fragment_retries:
                self.report_error('giving up after %s fragment retries' % fragment_retries)
                return False, None, None, None
        self._prepare_and_start_frag_download(ctx, info_dict)
@@ -1,5 +1,29 @@
 # flake8: noqa: F401
 from .youtube import (  # Youtube is moved to the top to improve performance
    YoutubeIE,
    YoutubeClipIE,
    YoutubeFavouritesIE,
    YoutubeNotificationsIE,
    YoutubeHistoryIE,
    YoutubeTabIE,
    YoutubeLivestreamEmbedIE,
    YoutubePlaylistIE,
    YoutubeRecommendedIE,
    YoutubeSearchDateIE,
    YoutubeSearchIE,
    YoutubeSearchURLIE,
    YoutubeMusicSearchURLIE,
    YoutubeSubscriptionsIE,
    YoutubeStoriesIE,
    YoutubeTruncatedIDIE,
    YoutubeTruncatedURLIE,
    YoutubeYtBeIE,
    YoutubeYtUserIE,
    YoutubeWatchLaterIE,
    YoutubeShortsAudioPivotIE
 )
 from .abc import (
    ABCIE,
    ABCIViewIE,
@@ -60,7 +84,7 @@ from .americastestkitchen import (
    AmericasTestKitchenIE,
    AmericasTestKitchenSeasonIE,
 )
-from .animeondemand import AnimeOnDemandIE
+from .angel import AngelIE
 from .anvato import AnvatoIE
 from .aol import AolIE
 from .allocine import AllocineIE
@@ -148,6 +172,7 @@ from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
 from .beatport import BeatportIE
 from .berufetv import BerufeTVIE
 from .bet import BetIE
 from .bfi import BFIPlayerIE
 from .bfmtv import (
@@ -167,7 +192,9 @@ from .bilibili import (
    BilibiliAudioIE,
    BilibiliAudioAlbumIE,
    BiliBiliPlayerIE,
-    BilibiliChannelIE,
+    BilibiliSpaceVideoIE,
    BilibiliSpaceAudioIE,
    BilibiliSpacePlaylistIE,
    BiliIntlIE,
    BiliIntlSeriesIE,
    BiliLiveIE,
@@ -193,6 +220,7 @@ from .bokecc import BokeCCIE
 from .bongacams import BongaCamsIE
 from .bostonglobe import BostonGlobeIE
 from .box import BoxIE
 from .booyah import BooyahClipsIE
 from .bpb import BpbIE
 from .br import (
    BRIE,
@@ -206,6 +234,7 @@ from .brightcove import (
    BrightcoveNewIE,
 )
 from .businessinsider import BusinessInsiderIE
 from .bundesliga import BundesligaIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
@@ -218,6 +247,7 @@ from .camdemy import (
    CamdemyFolderIE
 )
 from .cammodels import CamModelsIE
 from .camtasia import CamtasiaEmbedIE
 from .camwithher import CamWithHerIE
 from .canalalpha import CanalAlphaIE
 from .canalplus import CanalplusIE
@@ -304,6 +334,7 @@ from .cnn import (
    CNNIE,
    CNNBlogsIE,
    CNNArticleIE,
    CNNIndonesiaIE,
 )
 from .coub import CoubIE
 from .comedycentral import (
@@ -382,7 +413,7 @@ from .deezer import (
    DeezerAlbumIE,
 )
 from .democracynow import DemocracynowIE
-from .detik import Detik20IE
+from .detik import DetikEmbedIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .digg import DiggIE
@@ -408,6 +439,7 @@ from .dplay import (
    DiscoveryLifeIE,
    AnimalPlanetIE,
    TLCIE,
    MotorTrendIE,
    DiscoveryPlusIndiaIE,
    DiscoveryNetworksDeIE,
    DiscoveryPlusItalyIE,
@@ -443,7 +475,7 @@ from .dw import (
    DWIE,
    DWArticleIE,
 )
-from .eagleplatform import EaglePlatformIE
+from .eagleplatform import EaglePlatformIE, ClipYouEmbedIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE
 from .egghead import (
@@ -467,6 +499,7 @@ from .epicon import (
    EpiconIE,
    EpiconSeriesIE,
 )
 from .epoch import EpochIE
 from .eporner import EpornerIE
 from .eroprofile import (
    EroProfileIE,
@@ -488,6 +521,7 @@ from .espn import (
 from .esri import EsriVideoIE
 from .europa import EuropaIE
 from .europeantour import EuropeanTourIE
 from .eurosport import EurosportIE
 from .euscreen import EUScreenIE
 from .expotv import ExpoTVIE
 from .expressen import ExpressenIE
@@ -497,6 +531,7 @@ from .facebook import (
    FacebookIE,
    FacebookPluginsVideoIE,
    FacebookRedirectURLIE,
    FacebookReelIE,
 )
 from .fancode import (
    FancodeVodIE,
@@ -619,6 +654,7 @@ from .googlepodcasts import (
 )
 from .googlesearch import GoogleSearchIE
 from .gopro import GoProIE
 from .goplay import GoPlayIE
 from .goshgay import GoshgayIE
 from .gotostage import GoToStageIE
 from .gputechconf import GPUTechConfIE
@@ -628,6 +664,7 @@ from .gronkh import (
    GronkhVodsIE
 )
 from .groupon import GrouponIE
 from .harpodeon import HarpodeonIE
 from .hbo import HBOIE
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
@@ -640,6 +677,7 @@ from .hidive import HiDiveIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hitrecord import HitRecordIE
 from .holodex import HolodexIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import (
    HotStarIE,
@@ -658,6 +696,7 @@ from .hse import (
    HSEShowIE,
    HSEProductIE,
 )
 from .genericembeds import HTML5MediaEmbedIE
 from .huajiao import HuajiaoIE
 from .huya import HuyaLiveIE
 from .huffpost import HuffPostIE
@@ -682,6 +721,7 @@ from .iheart import (
    IHeartRadioIE,
    IHeartRadioPodcastIE,
 )
 from .iltalehti import IltalehtiIE
 from .imdb import (
    ImdbIE,
    ImdbListIE
@@ -713,6 +753,11 @@ from .iqiyi import (
    IqIE,
    IqAlbumIE
 )
 from .islamchannel import (
    IslamChannelIE,
    IslamChannelSeriesIE,
 )
 from .israelnationalnews import IsraelNationalNewsIE
 from .itprotv import (
    ITProTVIE,
    ITProTVCourseIE
@@ -760,6 +805,7 @@ from .kicker import KickerIE
 from .kickstarter import KickStarterIE
 from .kinja import KinjaEmbedIE
 from .kinopoisk import KinoPoiskIE
 from .kompas import KompasVideoIE
 from .konserthusetplay import KonserthusetPlayIE
 from .koo import KooIE
 from .kth import KTHIE
@@ -901,6 +947,7 @@ from .mediasite import (
    MediasiteCatalogIE,
    MediasiteNamedCatalogIE,
 )
 from .mediaworksnz import MediaWorksNZVODIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE
@@ -916,6 +963,7 @@ from .microsoftvirtualacademy import (
    MicrosoftVirtualAcademyIE,
    MicrosoftVirtualAcademyCourseIE,
 )
 from .microsoftembed import MicrosoftEmbedIE
 from .mildom import (
    MildomIE,
    MildomVodIE,
@@ -949,6 +997,7 @@ from .mixcloud import (
 from .mlb import (
    MLBIE,
    MLBVideoIE,
    MLBTVIE,
 )
 from .mlssoccer import MLSSoccerIE
 from .mnet import MnetIE
@@ -967,6 +1016,7 @@ from .motherless import (
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviepilot import MoviepilotIE
 from .moview import MoviewPlayIE
 from .moviezine import MoviezineIE
 from .movingimage import MovingImageIE
 from .msn import MSNIE
@@ -1035,6 +1085,7 @@ from .nbc import (
    NBCSportsIE,
    NBCSportsStreamIE,
    NBCSportsVPlayerIE,
    NBCStationsIE,
 )
 from .ndr import (
    NDRIE,
@@ -1069,6 +1120,7 @@ from .newgrounds import (
    NewgroundsPlaylistIE,
    NewgroundsUserIE,
 )
 from .newspicks import NewsPicksIE
 from .newstube import NewstubeIE
 from .newsy import NewsyIE
 from .nextmedia import (
@@ -1182,6 +1234,7 @@ from .olympics import OlympicsReplayIE
 from .on24 import On24IE
 from .ondemandkorea import OnDemandKoreaIE
 from .onefootball import OneFootballIE
 from .onenewsnz import OneNewsNZIE
 from .onet import (
    OnetIE,
    OnetChannelIE,
@@ -1205,19 +1258,8 @@ from .openrec import (
 from .ora import OraTVIE
 from .orf import (
    ORFTVthekIE,
    ORFFM4IE,
    ORFFM4StoryIE,
-    ORFOE1IE,
+    ORFRadioIE,
    ORFOE3IE,
    ORFNOEIE,
    ORFWIEIE,
    ORFBGLIE,
    ORFOOEIE,
    ORFSTMIE,
    ORFKTNIE,
    ORFSBGIE,
    ORFTIRIE,
    ORFVBGIE,
    ORFIPTVIE,
 )
 from .outsidetv import OutsideTVIE
@@ -1240,11 +1282,11 @@ from .paramountplus import (
    ParamountPlusIE,
    ParamountPlusSeriesIE,
 )
-from .parliamentliveuk import ParliamentLiveUKIE
+from .parler import ParlerIE
 from .parlview import ParlviewIE
 from .patreon import (
    PatreonIE,
-    PatreonUserIE
+    PatreonCampaignIE
 )
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE
@@ -1341,6 +1383,7 @@ from .puhutv import (
    PuhuTVIE,
    PuhuTVSerieIE,
 )
 from .prankcast import PrankCastIE
 from .premiershiprugby import PremiershipRugbyIE
 from .presstv import PressTVIE
 from .projectveritas import ProjectVeritasIE
@@ -1391,6 +1434,8 @@ from .rai import (
    RaiPlaySoundIE,
    RaiPlaySoundLiveIE,
    RaiPlaySoundPlaylistIE,
    RaiNewsIE,
    RaiSudtirolIE,
    RaiIE,
 )
 from .raywenderlich import (
@@ -1409,6 +1454,7 @@ from .rcti import (
    RCTIPlusTVIE,
 )
 from .rds import RDSIE
 from .redbee import ParliamentLiveUKIE, RTBFIE
 from .redbulltv import (
    RedBullTVIE,
    RedBullEmbedIE,
@@ -1442,7 +1488,6 @@ from .rokfin import (
 from .roosterteeth import RoosterTeethIE, RoosterTeethSeriesIE
 from .rottentomatoes import RottenTomatoesIE
 from .rozhlas import RozhlasIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import (
    RtlNlIE,
@@ -1548,6 +1593,7 @@ from .shared import (
    SharedIE,
    VivoIE,
 )
 from .sharevideos import ShareVideosEmbedIE
 from .shemaroome import ShemarooMeIE
 from .showroomlive import ShowRoomLiveIE
 from .simplecast import (
@@ -1583,6 +1629,7 @@ from .sky import (
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
 from .smotrim import SmotrimIE
 from .snotr import SnotrIE
 from .sohu import SohuIE
 from .sonyliv import (
@@ -1725,6 +1772,15 @@ from .telequebec import (
 )
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .tempo import TempoIE
 from .tencent import (
    IflixEpisodeIE,
    IflixSeriesIE,
    VQQSeriesIE,
    VQQVideoIE,
    WeTvEpisodeIE,
    WeTvSeriesIE,
 )
 from .tennistv import TennisTVIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
@@ -1784,6 +1840,10 @@ from .toongoggles import ToonGogglesIE
 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .triller import (
    TrillerIE,
    TrillerUserIE,
 )
 from .trilulilu import TriluliluIE
 from .trovo import (
    TrovoIE,
@@ -1793,6 +1853,7 @@ from .trovo import (
 )
 from .trueid import TrueIDIE
 from .trunews import TruNewsIE
 from .truth import TruthIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubetugraz import TubeTuGrazIE, TubeTuGrazSeriesIE
@@ -1816,6 +1877,10 @@ from .tv2 import (
    KatsomoIE,
    MTVUutisetArticleIE,
 )
 from .tv24ua import (
    TV24UAVideoIE,
    TV24UAGenericPassthroughIE
 )
 from .tv2dk import (
    TV2DKIE,
    TV2DKBornholmPlayIE,
@@ -1918,6 +1983,7 @@ from .drooble import DroobleIE
 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE
 from .unscripted import UnscriptedNewsVideoIE
 from .uol import UOLIE
 from .uplynk import (
    UplynkIE,
@@ -1975,7 +2041,6 @@ from .vidio import (
    VidioLiveIE
 )
 from .vidlii import VidLiiIE
 from .vier import VierIE, VierVideosIE
 from .viewlift import (
    ViewLiftIE,
    ViewLiftEmbedIE,
@@ -2088,7 +2153,6 @@ from .weibo import (
    WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
 from .wetv import WeTvEpisodeIE, WeTvSeriesIE
 from .wikimedia import WikimediaIE
 from .willow import WillowIE
 from .wimtv import WimTVIE
@@ -2096,7 +2160,9 @@ from .whowatch import WhoWatchIE
 from .wistia import (
    WistiaIE,
    WistiaPlaylistIE,
    WistiaChannelIE,
 )
 from .wordpress import WordpressPlaylistEmbedIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wppilot import (
    WPPilotIE,
@@ -2171,42 +2237,44 @@ from .younow import (
 from .youporn import YouPornIE
 from .yourporn import YourPornIE
 from .yourupload import YourUploadIE
 from .youtube import (
    YoutubeIE,
    YoutubeClipIE,
    YoutubeFavouritesIE,
    YoutubeNotificationsIE,
    YoutubeHistoryIE,
    YoutubeTabIE,
    YoutubeLivestreamEmbedIE,
    YoutubePlaylistIE,
    YoutubeRecommendedIE,
    YoutubeSearchDateIE,
    YoutubeSearchIE,
    YoutubeSearchURLIE,
    YoutubeMusicSearchURLIE,
    YoutubeSubscriptionsIE,
    YoutubeStoriesIE,
    YoutubeTruncatedIDIE,
    YoutubeTruncatedURLIE,
    YoutubeYtBeIE,
    YoutubeYtUserIE,
    YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE
 from .zattoo import (
    BBVTVIE,
    BBVTVLiveIE,
    BBVTVRecordingsIE,
    EinsUndEinsTVIE,
    EinsUndEinsTVLiveIE,
    EinsUndEinsTVRecordingsIE,
    EWETVIE,
    EWETVLiveIE,
    EWETVRecordingsIE,
    GlattvisionTVIE,
    GlattvisionTVLiveIE,
    GlattvisionTVRecordingsIE,
    MNetTVIE,
-    NetPlusIE,
+    MNetTVLiveIE,
    MNetTVRecordingsIE,
    NetPlusTVIE,
    NetPlusTVLiveIE,
    NetPlusTVRecordingsIE,
    OsnatelTVIE,
    OsnatelTVLiveIE,
    OsnatelTVRecordingsIE,
    QuantumTVIE,
    QuantumTVLiveIE,
    QuantumTVRecordingsIE,
    SaltTVIE,
    SaltTVLiveIE,
    SaltTVRecordingsIE,
    SAKTVIE,
    SAKTVLiveIE,
    SAKTVRecordingsIE,
    VTXTVIE,
    VTXTVLiveIE,
    VTXTVRecordingsIE,
    WalyTVIE,
    WalyTVLiveIE,
    WalyTVRecordingsIE,
    ZattooIE,
    ZattooLiveIE,
    ZattooMoviesIE,
@@ -1,5 +1,6 @@
 import base64
 import binascii
 import functools
 import hashlib
 import hmac
 import io
@@ -20,11 +21,11 @@ from ..utils import (
    decode_base_n,
    int_or_none,
    intlist_to_bytes,
    OnDemandPagedList,
    request_to_url,
    time_seconds,
    traverse_obj,
    update_url_query,
    urljoin,
 )
 # NOTE: network handler related code is temporary thing until network stack overhaul PRs are merged (#2861/#2862)
@@ -145,17 +146,106 @@ class AbemaLicenseHandler(urllib.request.BaseHandler):
 class AbemaTVBaseIE(InfoExtractor):
    _USERTOKEN = None
    _DEVICE_ID = None
    _MEDIATOKEN = None
    _SECRETKEY = b'v+Gjs=25Aw5erR!J8ZuvRrCx*rGswhB&qdHd_SYerEWdU&a?3DzN9BRbp5KwY4hEmcj5#fykMjJ=AuWz5GSMY-d@H7DMEh3M@9n2G552Us$$k9cD=3TxwWe86!x#Zyhe'
    @classmethod
    def _generate_aks(cls, deviceid):
        deviceid = deviceid.encode('utf-8')
        # add 1 hour and then drop minute and secs
        ts_1hour = int((time_seconds(hours=9) // 3600 + 1) * 3600)
        time_struct = time.gmtime(ts_1hour)
        ts_1hour_str = str(ts_1hour).encode('utf-8')
        tmp = None
        def mix_once(nonce):
            nonlocal tmp
            h = hmac.new(cls._SECRETKEY, digestmod=hashlib.sha256)
            h.update(nonce)
            tmp = h.digest()
        def mix_tmp(count):
            nonlocal tmp
            for i in range(count):
                mix_once(tmp)
        def mix_twist(nonce):
            nonlocal tmp
            mix_once(base64.urlsafe_b64encode(tmp).rstrip(b'=') + nonce)
        mix_once(cls._SECRETKEY)
        mix_tmp(time_struct.tm_mon)
        mix_twist(deviceid)
        mix_tmp(time_struct.tm_mday % 5)
        mix_twist(ts_1hour_str)
        mix_tmp(time_struct.tm_hour % 5)
        return base64.urlsafe_b64encode(tmp).rstrip(b'=').decode('utf-8')
    def _get_device_token(self):
        if self._USERTOKEN:
            return self._USERTOKEN
        AbemaTVBaseIE._DEVICE_ID = str(uuid.uuid4())
        aks = self._generate_aks(self._DEVICE_ID)
        user_data = self._download_json(
            'https://api.abema.io/v1/users', None, note='Authorizing',
            data=json.dumps({
                'deviceId': self._DEVICE_ID,
                'applicationKeySecret': aks,
            }).encode('utf-8'),
            headers={
                'Content-Type': 'application/json',
            })
        AbemaTVBaseIE._USERTOKEN = user_data['token']
        # don't allow adding it 2 times or more, though it's guarded
        remove_opener(self._downloader, AbemaLicenseHandler)
        add_opener(self._downloader, AbemaLicenseHandler(self))
        return self._USERTOKEN
    def _get_media_token(self, invalidate=False, to_show=True):
        if not invalidate and self._MEDIATOKEN:
            return self._MEDIATOKEN
        AbemaTVBaseIE._MEDIATOKEN = self._download_json(
            'https://api.abema.io/v1/media/token', None, note='Fetching media token' if to_show else False,
            query={
                'osName': 'android',
                'osVersion': '6.0.1',
                'osLang': 'ja_JP',
                'osTimezone': 'Asia/Tokyo',
                'appId': 'tv.abema',
                'appVersion': '3.27.1'
            }, headers={
                'Authorization': f'bearer {self._get_device_token()}',
            })['token']
        return self._MEDIATOKEN
    def _call_api(self, endpoint, video_id, query=None, note='Downloading JSON metadata'):
        return self._download_json(
            f'https://api.abema.io/{endpoint}', video_id, query=query or {},
            note=note,
            headers={
                'Authorization': f'bearer {self._get_device_token()}',
            })
    def _extract_breadcrumb_list(self, webpage, video_id):
        for jld in re.finditer(
                r'(?is)</span></li></ul><script[^>]+type=(["\']?)application/ld\+json\1[^>]*>(?P<json_ld>.+?)</script>',
                webpage):
            jsonld = self._parse_json(jld.group('json_ld'), video_id, fatal=False)
-            if jsonld:
+            if traverse_obj(jsonld, '@type') != 'BreadcrumbList':
-                if jsonld.get('@type') != 'BreadcrumbList':
+                continue
-                    continue
+            items = traverse_obj(jsonld, ('itemListElement', ..., 'name'))
-                trav = traverse_obj(jsonld, ('itemListElement', ..., 'name'))
+            if items:
-                if trav:
+                return items
                    return trav
        return []
@@ -207,87 +297,7 @@ class AbemaTVIE(AbemaTVBaseIE):
        },
        'skip': 'Not supported until yt-dlp implements native live downloader OR AbemaTV can start a local HTTP server',
    }]
    _USERTOKEN = None
    _DEVICE_ID = None
    _TIMETABLE = None
    _MEDIATOKEN = None
    _SECRETKEY = b'v+Gjs=25Aw5erR!J8ZuvRrCx*rGswhB&qdHd_SYerEWdU&a?3DzN9BRbp5KwY4hEmcj5#fykMjJ=AuWz5GSMY-d@H7DMEh3M@9n2G552Us$$k9cD=3TxwWe86!x#Zyhe'
    def _generate_aks(self, deviceid):
        deviceid = deviceid.encode('utf-8')
        # add 1 hour and then drop minute and secs
        ts_1hour = int((time_seconds(hours=9) // 3600 + 1) * 3600)
        time_struct = time.gmtime(ts_1hour)
        ts_1hour_str = str(ts_1hour).encode('utf-8')
        tmp = None
        def mix_once(nonce):
            nonlocal tmp
            h = hmac.new(self._SECRETKEY, digestmod=hashlib.sha256)
            h.update(nonce)
            tmp = h.digest()
        def mix_tmp(count):
            nonlocal tmp
            for i in range(count):
                mix_once(tmp)
        def mix_twist(nonce):
            nonlocal tmp
            mix_once(base64.urlsafe_b64encode(tmp).rstrip(b'=') + nonce)
        mix_once(self._SECRETKEY)
        mix_tmp(time_struct.tm_mon)
        mix_twist(deviceid)
        mix_tmp(time_struct.tm_mday % 5)
        mix_twist(ts_1hour_str)
        mix_tmp(time_struct.tm_hour % 5)
        return base64.urlsafe_b64encode(tmp).rstrip(b'=').decode('utf-8')
    def _get_device_token(self):
        if self._USERTOKEN:
            return self._USERTOKEN
        self._DEVICE_ID = str(uuid.uuid4())
        aks = self._generate_aks(self._DEVICE_ID)
        user_data = self._download_json(
            'https://api.abema.io/v1/users', None, note='Authorizing',
            data=json.dumps({
                'deviceId': self._DEVICE_ID,
                'applicationKeySecret': aks,
            }).encode('utf-8'),
            headers={
                'Content-Type': 'application/json',
            })
        self._USERTOKEN = user_data['token']
        # don't allow adding it 2 times or more, though it's guarded
        remove_opener(self._downloader, AbemaLicenseHandler)
        add_opener(self._downloader, AbemaLicenseHandler(self))
        return self._USERTOKEN
    def _get_media_token(self, invalidate=False, to_show=True):
        if not invalidate and self._MEDIATOKEN:
            return self._MEDIATOKEN
        self._MEDIATOKEN = self._download_json(
            'https://api.abema.io/v1/media/token', None, note='Fetching media token' if to_show else False,
            query={
                'osName': 'android',
                'osVersion': '6.0.1',
                'osLang': 'ja_JP',
                'osTimezone': 'Asia/Tokyo',
                'appId': 'tv.abema',
                'appVersion': '3.27.1'
            }, headers={
                'Authorization': 'bearer ' + self._get_device_token()
            })['token']
        return self._MEDIATOKEN
    def _perform_login(self, username, password):
        if '@' in username:  # don't strictly check if it's email address or not
@@ -301,13 +311,13 @@ class AbemaTVIE(AbemaTVBaseIE):
                method: username,
                'password': password
            }).encode('utf-8'), headers={
-                'Authorization': 'bearer ' + self._get_device_token(),
+                'Authorization': f'bearer {self._get_device_token()}',
                'Origin': 'https://abema.tv',
                'Referer': 'https://abema.tv/',
                'Content-Type': 'application/json',
            })
-        self._USERTOKEN = login_response['token']
+        AbemaTVBaseIE._USERTOKEN = login_response['token']
        self._get_media_token(True)
    def _real_extract(self, url):
@@ -355,7 +365,7 @@ class AbemaTVIE(AbemaTVBaseIE):
        # read breadcrumb on top of page
        breadcrumb = self._extract_breadcrumb_list(webpage, video_id)
        if breadcrumb:
-            # breadcrumb list translates to: (example is 1st test for this IE)
+            # breadcrumb list translates to: (e.g. 1st test for this IE)
            # Home > Anime (genre) > Isekai Shokudo 2 (series name) > Episode 1 "Cheese cakes" "Morning again" (episode title)
            # hence this works
            info['series'] = breadcrumb[-2]
@@ -442,6 +452,7 @@ class AbemaTVIE(AbemaTVBaseIE):
 class AbemaTVTitleIE(AbemaTVBaseIE):
    _VALID_URL = r'https?://abema\.tv/video/title/(?P<id>[^?/]+)'
    _PAGE_SIZE = 25
    _TESTS = [{
        'url': 'https://abema.tv/video/title/90-1597',
@@ -457,18 +468,39 @@ class AbemaTVTitleIE(AbemaTVBaseIE):
            'title': '真心が届く~僕とスターのオフィス・ラブ!?~',
        },
        'playlist_mincount': 16,
    }, {
        'url': 'https://abema.tv/video/title/25-102',
        'info_dict': {
            'id': '25-102',
            'title': 'ソードアート・オンライン アリシゼーション',
        },
        'playlist_mincount': 24,
    }]
    def _fetch_page(self, playlist_id, series_version, page):
        programs = self._call_api(
            f'v1/video/series/{playlist_id}/programs', playlist_id,
            note=f'Downloading page {page + 1}',
            query={
                'seriesVersion': series_version,
                'offset': str(page * self._PAGE_SIZE),
                'order': 'seq',
                'limit': str(self._PAGE_SIZE),
            })
        yield from (
            self.url_result(f'https://abema.tv/video/episode/{x}')
            for x in traverse_obj(programs, ('programs', ..., 'id'), default=[]))
    def _entries(self, playlist_id, series_version):
        return OnDemandPagedList(
            functools.partial(self._fetch_page, playlist_id, series_version),
            self._PAGE_SIZE)
    def _real_extract(self, url):
-        video_id = self._match_id(url)
+        playlist_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
+        series_info = self._call_api(f'v1/video/series/{playlist_id}', playlist_id)
-        playlist_title, breadcrumb = None, self._extract_breadcrumb_list(webpage, video_id)
+        return self.playlist_result(
-        if breadcrumb:
+            self._entries(playlist_id, series_info['version']), playlist_id=playlist_id,
-            playlist_title = breadcrumb[-1]
+            playlist_title=series_info.get('title'),
-
+            playlist_description=series_info.get('content'))
        playlist = [
            self.url_result(urljoin('https://abema.tv/', mobj.group(1)))
            for mobj in re.finditer(r'<li\s*class=".+?EpisodeList.+?"><a\s*href="(/[^"]+?)"', webpage)]
        return self.playlist_result(playlist, playlist_title=playlist_title, playlist_id=video_id)
@@ -84,7 +84,7 @@ class AcFunVideoIE(AcFunVideoBaseIE):
        video_id = self._match_id(url)
        webpage = self._download_webpage(url, video_id)
-        json_all = self._search_json(r'window.videoInfo\s*=\s*', webpage, 'videoInfo', video_id)
+        json_all = self._search_json(r'window.videoInfo\s*=', webpage, 'videoInfo', video_id)
        title = json_all.get('title')
        video_list = json_all.get('videoList') or []
@@ -164,7 +164,7 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
        video_id = f'{video_id}{format_field(ac_idx, template="__%s")}'
        webpage = self._download_webpage(url, video_id)
-        json_bangumi_data = self._search_json(r'window.bangumiData\s*=\s*', webpage, 'bangumiData', video_id)
+        json_bangumi_data = self._search_json(r'window.bangumiData\s*=', webpage, 'bangumiData', video_id)
        if ac_idx:
            video_info = json_bangumi_data['hlVideoInfo']
@@ -181,7 +181,7 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
            if v.get('id') == season_id), 1)
        json_bangumi_list = self._search_json(
-            r'window\.bangumiList\s*=\s*', webpage, 'bangumiList', video_id, fatal=False)
+            r'window\.bangumiList\s*=', webpage, 'bangumiList', video_id, fatal=False)
        video_internal_id = int_or_none(traverse_obj(json_bangumi_data, ('currentVideoInfo', 'id')))
        episode_number = video_internal_id and next((
            idx for idx, v in enumerate(json_bangumi_list.get('items') or [], 1)
@@ -1344,6 +1344,11 @@ MSO_INFO = {
        'username_field': 'username',
        'password_field': 'password',
    },
    'AlticeOne': {
        'name': 'Optimum TV',
        'username_field': 'j_username',
        'password_field': 'j_password',
    },
 }
@@ -1705,7 +1710,7 @@ class AdobePassIE(InfoExtractor):
                        mso_info.get('username_field', 'username'): username,
                        mso_info.get('password_field', 'password'): password
                    }
-                    if mso_id == 'Cablevision':
+                    if mso_id in ('Cablevision', 'AlticeOne'):
                        form_data['_eventId_proceed'] = ''
                    mvpd_confirm_page_res = post_form(provider_login_page_res, 'Logging in', form_data)
                    if mso_id != 'Rogers':
@@ -232,6 +232,7 @@ class AdobeTVChannelIE(AdobeTVPlaylistBaseIE):
 class AdobeTVVideoIE(AdobeTVBaseIE):
    IE_NAME = 'adobetv:video'
    _VALID_URL = r'https?://video\.tv\.adobe\.com/v/(?P<id>\d+)'
    _EMBED_REGEX = [r'<iframe[^>]+src=[\'"](?P<url>(?:https?:)?//video\.tv\.adobe\.com/v/\d+[^"]+)[\'"]']
    _TEST = {
        # From https://helpx.adobe.com/acrobat/how-to/new-experience-acrobat-dc.html?set=acrobat--get-started--essential-beginners
@@ -28,14 +28,17 @@ class AENetworksBaseIE(ThePlatformIE):
    }
    def _extract_aen_smil(self, smil_url, video_id, auth=None):
-        query = {'mbr': 'true'}
+        query = {
            'mbr': 'true',
            'formats': 'M3U+none,MPEG-DASH+none,MPEG4,MP3',
        }
        if auth:
            query['auth'] = auth
        TP_SMIL_QUERY = [{
            'assetTypes': 'high_video_ak',
-            'switch': 'hls_high_ak'
+            'switch': 'hls_high_ak',
        }, {
-            'assetTypes': 'high_video_s3'
+            'assetTypes': 'high_video_s3',
        }, {
            'assetTypes': 'high_video_s3',
            'switch': 'hls_high_fastly',
@@ -1,5 +1,5 @@
 from .common import InfoExtractor
-from ..utils import int_or_none
+from ..utils import ExtractorError, int_or_none
 class AmazonStoreIE(InfoExtractor):
@@ -9,7 +9,7 @@ class AmazonStoreIE(InfoExtractor):
        'url': 'https://www.amazon.co.uk/dp/B098XNCHLD/',
        'info_dict': {
            'id': 'B098XNCHLD',
-            'title': 'md5:5f3194dbf75a8dcfc83079bd63a2abed',
+            'title': 'md5:dae240564cbb2642170c02f7f0d7e472',
        },
        'playlist_mincount': 1,
        'playlist': [{
@@ -18,28 +18,44 @@ class AmazonStoreIE(InfoExtractor):
                'ext': 'mp4',
                'title': 'mcdodo usb c cable 100W 5a',
                'thumbnail': r're:^https?://.*\.jpg$',
                'duration': 34,
            },
        }]
    }, {
        'url': 'https://www.amazon.in/Sony-WH-1000XM4-Cancelling-Headphones-Bluetooth/dp/B0863TXGM3',
        'info_dict': {
            'id': 'B0863TXGM3',
-            'title': 'md5:b0bde4881d3cfd40d63af19f7898b8ff',
+            'title': 'md5:d1d3352428f8f015706c84b31e132169',
        },
        'playlist_mincount': 4,
    }, {
        'url': 'https://www.amazon.com/dp/B0845NXCXF/',
        'info_dict': {
            'id': 'B0845NXCXF',
-            'title': 'md5:2145cd4e3c7782f1ee73649a3cff1171',
+            'title': 'md5:f3fa12779bf62ddb6a6ec86a360a858e',
        },
        'playlist-mincount': 1,
    }, {
        'url': 'https://www.amazon.es/Samsung-Smartphone-s-AMOLED-Quad-c%C3%A1mara-espa%C3%B1ola/dp/B08WX337PQ',
        'info_dict': {
            'id': 'B08WX337PQ',
            'title': 'md5:f3fa12779bf62ddb6a6ec86a360a858e',
        },
        'playlist_mincount': 1,
    }]
    def _real_extract(self, url):
        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+
-        data_json = self._parse_json(self._html_search_regex(r'var\s?obj\s?=\s?jQuery\.parseJSON\(\'(.*)\'\)', webpage, 'data'), id)
+        for retry in self.RetryManager():
            webpage = self._download_webpage(url, id)
            try:
                data_json = self._search_json(
                    r'var\s?obj\s?=\s?jQuery\.parseJSON\(\'', webpage, 'data', id,
                    transform_source=lambda x: x.replace(R'\\u', R'\u'))
            except ExtractorError as e:
                retry.error = e
        entries = [{
            'id': video['marketPlaceID'],
            'url': video['url'],
@@ -49,4 +65,4 @@ class AmazonStoreIE(InfoExtractor):
            'height': int_or_none(video.get('videoHeight')),
            'width': int_or_none(video.get('videoWidth')),
        } for video in (data_json.get('videos') or []) if video.get('isVideo') and video.get('url')]
-        return self.playlist_result(entries, playlist_id=id, playlist_title=data_json['title'])
+        return self.playlist_result(entries, playlist_id=id, playlist_title=data_json.get('title'))
@@ -0,0 +1,56 @@
 import re
 from .common import InfoExtractor
 from ..utils import url_or_none, merge_dicts
 class AngelIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?angel\.com/watch/(?P<series>[^/?#]+)/episode/(?P<id>[\w-]+)/season-(?P<season_number>\d+)/episode-(?P<episode_number>\d+)/(?P<title>[^/?#]+)'
    _TESTS = [{
        'url': 'https://www.angel.com/watch/tuttle-twins/episode/2f3d0382-ea82-4cdc-958e-84fbadadc710/season-1/episode-1/when-laws-give-you-lemons',
        'md5': '4734e5cfdd64a568e837246aa3eaa524',
        'info_dict': {
            'id': '2f3d0382-ea82-4cdc-958e-84fbadadc710',
            'ext': 'mp4',
            'title': 'Tuttle Twins Season 1, Episode 1: When Laws Give You Lemons',
            'description': 'md5:73b704897c20ab59c433a9c0a8202d5e',
            'thumbnail': r're:^https?://images.angelstudios.com/image/upload/angel-app/.*$',
            'duration': 1359.0
        }
    }, {
        'url': 'https://www.angel.com/watch/the-chosen/episode/8dfb714d-bca5-4812-8125-24fb9514cd10/season-1/episode-1/i-have-called-you-by-name',
        'md5': 'e4774bad0a5f0ad2e90d175cafdb797d',
        'info_dict': {
            'id': '8dfb714d-bca5-4812-8125-24fb9514cd10',
            'ext': 'mp4',
            'title': 'The Chosen Season 1, Episode 1: I Have Called You By Name',
            'description': 'md5:aadfb4827a94415de5ff6426e6dee3be',
            'thumbnail': r're:^https?://images.angelstudios.com/image/upload/angel-app/.*$',
            'duration': 3276.0
        }
    }]
    def _real_extract(self, url):
        video_id = self._match_id(url)
        webpage = self._download_webpage(url, video_id)
        json_ld = self._search_json_ld(webpage, video_id)
        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
            json_ld.pop('url'), video_id, note='Downloading HD m3u8 information')
        info_dict = {
            'id': video_id,
            'title': self._og_search_title(webpage),
            'description': self._og_search_description(webpage),
            'formats': formats,
            'subtitles': subtitles
        }
        # Angel uses cloudinary in the background and supports image transformations.
        # We remove these transformations and return the source file
        base_thumbnail_url = url_or_none(self._og_search_thumbnail(webpage)) or json_ld.pop('thumbnails')
        if base_thumbnail_url:
            info_dict['thumbnail'] = re.sub(r'(/upload)/.+(/angel-app/.+)$', r'\1\2', base_thumbnail_url)
        return merge_dicts(info_dict, json_ld)
@@ -1,282 +0,0 @@
 import re
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
    determine_ext,
    extract_attributes,
    ExtractorError,
    join_nonempty,
    url_or_none,
    urlencode_postdata,
    urljoin,
 )
 class AnimeOnDemandIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?anime-on-demand\.de/anime/(?P<id>\d+)'
    _LOGIN_URL = 'https://www.anime-on-demand.de/users/sign_in'
    _APPLY_HTML5_URL = 'https://www.anime-on-demand.de/html5apply'
    _NETRC_MACHINE = 'animeondemand'
    # German-speaking countries of Europe
    _GEO_COUNTRIES = ['AT', 'CH', 'DE', 'LI', 'LU']
    _TESTS = [{
        # jap, OmU
        'url': 'https://www.anime-on-demand.de/anime/161',
        'info_dict': {
            'id': '161',
            'title': 'Grimgar, Ashes and Illusions (OmU)',
            'description': 'md5:6681ce3c07c7189d255ac6ab23812d31',
        },
        'playlist_mincount': 4,
    }, {
        # Film wording is used instead of Episode, ger/jap, Dub/OmU
        'url': 'https://www.anime-on-demand.de/anime/39',
        'only_matching': True,
    }, {
        # Episodes without titles, jap, OmU
        'url': 'https://www.anime-on-demand.de/anime/162',
        'only_matching': True,
    }, {
        # ger/jap, Dub/OmU, account required
        'url': 'https://www.anime-on-demand.de/anime/169',
        'only_matching': True,
    }, {
        # Full length film, non-series, ger/jap, Dub/OmU, account required
        'url': 'https://www.anime-on-demand.de/anime/185',
        'only_matching': True,
    }, {
        # Flash videos
        'url': 'https://www.anime-on-demand.de/anime/12',
        'only_matching': True,
    }]
    def _perform_login(self, username, password):
        login_page = self._download_webpage(
            self._LOGIN_URL, None, 'Downloading login page')
        if '>Our licensing terms allow the distribution of animes only to German-speaking countries of Europe' in login_page:
            self.raise_geo_restricted(
                '%s is only available in German-speaking countries of Europe' % self.IE_NAME)
        login_form = self._form_hidden_inputs('new_user', login_page)
        login_form.update({
            'user[login]': username,
            'user[password]': password,
        })
        post_url = self._search_regex(
            r'<form[^>]+action=(["\'])(?P<url>.+?)\1', login_page,
            'post url', default=self._LOGIN_URL, group='url')
        if not post_url.startswith('http'):
            post_url = urljoin(self._LOGIN_URL, post_url)
        response = self._download_webpage(
            post_url, None, 'Logging in',
            data=urlencode_postdata(login_form), headers={
                'Referer': self._LOGIN_URL,
            })
        if all(p not in response for p in ('>Logout<', 'href="/users/sign_out"')):
            error = self._search_regex(
                r'<p[^>]+\bclass=(["\'])(?:(?!\1).)*\balert\b(?:(?!\1).)*\1[^>]*>(?P<error>.+?)</p>',
                response, 'error', default=None, group='error')
            if error:
                raise ExtractorError('Unable to login: %s' % error, expected=True)
            raise ExtractorError('Unable to log in')
    def _real_extract(self, url):
        anime_id = self._match_id(url)
        webpage = self._download_webpage(url, anime_id)
        if 'data-playlist=' not in webpage:
            self._download_webpage(
                self._APPLY_HTML5_URL, anime_id,
                'Activating HTML5 beta', 'Unable to apply HTML5 beta')
            webpage = self._download_webpage(url, anime_id)
        csrf_token = self._html_search_meta(
            'csrf-token', webpage, 'csrf token', fatal=True)
        anime_title = self._html_search_regex(
            r'(?s)<h1[^>]+itemprop="name"[^>]*>(.+?)</h1>',
            webpage, 'anime name')
        anime_description = self._html_search_regex(
            r'(?s)<div[^>]+itemprop="description"[^>]*>(.+?)</div>',
            webpage, 'anime description', default=None)
        def extract_info(html, video_id, num=None):
            title, description = [None] * 2
            formats = []
            for input_ in re.findall(
                    r'<input[^>]+class=["\'].*?streamstarter[^>]+>', html):
                attributes = extract_attributes(input_)
                title = attributes.get('data-dialog-header')
                playlist_urls = []
                for playlist_key in ('data-playlist', 'data-otherplaylist', 'data-stream'):
                    playlist_url = attributes.get(playlist_key)
                    if isinstance(playlist_url, compat_str) and re.match(
                            r'/?[\da-zA-Z]+', playlist_url):
                        playlist_urls.append(attributes[playlist_key])
                if not playlist_urls:
                    continue
                lang = attributes.get('data-lang')
                lang_note = attributes.get('value')
                for playlist_url in playlist_urls:
                    kind = self._search_regex(
                        r'videomaterialurl/\d+/([^/]+)/',
                        playlist_url, 'media kind', default=None)
                    format_id = join_nonempty(lang, kind) if lang or kind else str(num)
                    format_note = join_nonempty(kind, lang_note, delim=', ')
                    item_id_list = []
                    if format_id:
                        item_id_list.append(format_id)
                    item_id_list.append('videomaterial')
                    playlist = self._download_json(
                        urljoin(url, playlist_url), video_id,
                        'Downloading %s JSON' % ' '.join(item_id_list),
                        headers={
                            'X-Requested-With': 'XMLHttpRequest',
                            'X-CSRF-Token': csrf_token,
                            'Referer': url,
                            'Accept': 'application/json, text/javascript, */*; q=0.01',
                        }, fatal=False)
                    if not playlist:
                        continue
                    stream_url = url_or_none(playlist.get('streamurl'))
                    if stream_url:
                        rtmp = re.search(
                            r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+/))(?P<playpath>mp[34]:.+)',
                            stream_url)
                        if rtmp:
                            formats.append({
                                'url': rtmp.group('url'),
                                'app': rtmp.group('app'),
                                'play_path': rtmp.group('playpath'),
                                'page_url': url,
                                'player_url': 'https://www.anime-on-demand.de/assets/jwplayer.flash-55abfb34080700304d49125ce9ffb4a6.swf',
                                'rtmp_real_time': True,
                                'format_id': 'rtmp',
                                'ext': 'flv',
                            })
                            continue
                    start_video = playlist.get('startvideo', 0)
                    playlist = playlist.get('playlist')
                    if not playlist or not isinstance(playlist, list):
                        continue
                    playlist = playlist[start_video]
                    title = playlist.get('title')
                    if not title:
                        continue
                    description = playlist.get('description')
                    for source in playlist.get('sources', []):
                        file_ = source.get('file')
                        if not file_:
                            continue
                        ext = determine_ext(file_)
                        format_id = join_nonempty(
                            lang, kind,
                            'hls' if ext == 'm3u8' else None,
                            'dash' if source.get('type') == 'video/dash' or ext == 'mpd' else None)
                        if ext == 'm3u8':
                            file_formats = self._extract_m3u8_formats(
                                file_, video_id, 'mp4',
                                entry_protocol='m3u8_native', m3u8_id=format_id, fatal=False)
                        elif source.get('type') == 'video/dash' or ext == 'mpd':
                            continue
                            file_formats = self._extract_mpd_formats(
                                file_, video_id, mpd_id=format_id, fatal=False)
                        else:
                            continue
                        for f in file_formats:
                            f.update({
                                'language': lang,
                                'format_note': format_note,
                            })
                        formats.extend(file_formats)
            return {
                'title': title,
                'description': description,
                'formats': formats,
            }
        def extract_entries(html, video_id, common_info, num=None):
            info = extract_info(html, video_id, num)
            if info['formats']:
                self._sort_formats(info['formats'])
                f = common_info.copy()
                f.update(info)
                yield f
            # Extract teaser/trailer only when full episode is not available
            if not info['formats']:
                m = re.search(
                    r'data-dialog-header=(["\'])(?P<title>.+?)\1[^>]+href=(["\'])(?P<href>.+?)\3[^>]*>(?P<kind>Teaser|Trailer)<',
                    html)
                if m:
                    f = common_info.copy()
                    f.update({
                        'id': '%s-%s' % (f['id'], m.group('kind').lower()),
                        'title': m.group('title'),
                        'url': urljoin(url, m.group('href')),
                    })
                    yield f
        def extract_episodes(html):
            for num, episode_html in enumerate(re.findall(
                    r'(?s)<h3[^>]+class="episodebox-title".+?>Episodeninhalt<', html), 1):
                episodebox_title = self._search_regex(
                    (r'class="episodebox-title"[^>]+title=(["\'])(?P<title>.+?)\1',
                     r'class="episodebox-title"[^>]+>(?P<title>.+?)<'),
                    episode_html, 'episodebox title', default=None, group='title')
                if not episodebox_title:
                    continue
                episode_number = int(self._search_regex(
                    r'(?:Episode|Film)\s*(\d+)',
                    episodebox_title, 'episode number', default=num))
                episode_title = self._search_regex(
                    r'(?:Episode|Film)\s*\d+\s*-\s*(.+)',
                    episodebox_title, 'episode title', default=None)
                video_id = 'episode-%d' % episode_number
                common_info = {
                    'id': video_id,
                    'series': anime_title,
                    'episode': episode_title,
                    'episode_number': episode_number,
                }
                for e in extract_entries(episode_html, video_id, common_info):
                    yield e
        def extract_film(html, video_id):
            common_info = {
                'id': anime_id,
                'title': anime_title,
                'description': anime_description,
            }
            for e in extract_entries(html, video_id, common_info):
                yield e
        def entries():
            has_episodes = False
            for e in extract_episodes(webpage):
                has_episodes = True
                yield e
            if not has_episodes:
                for e in extract_film(webpage, anime_id):
                    yield e
        return self.playlist_result(
            entries(), anime_id, anime_title, anime_description)
@@ -1,4 +1,3 @@
 import re
 import urllib.parse
 from .common import InfoExtractor
@@ -7,7 +6,6 @@ from ..utils import (
    ExtractorError,
    determine_ext,
    scale_thumbnails_to_max_format_width,
    unescapeHTML,
 )
@@ -91,7 +89,7 @@ class Ant1NewsGrArticleIE(Ant1NewsGrBaseIE):
        video_id = self._match_id(url)
        webpage = self._download_webpage(url, video_id)
        info = self._search_json_ld(webpage, video_id, expected_type='NewsArticle')
-        embed_urls = list(Ant1NewsGrEmbedIE._extract_urls(webpage))
+        embed_urls = list(Ant1NewsGrEmbedIE._extract_embed_urls(url, webpage))
        if not embed_urls:
            raise ExtractorError('no videos found for %s' % video_id, expected=True)
        return self.playlist_from_matches(
@@ -104,6 +102,7 @@ class Ant1NewsGrEmbedIE(Ant1NewsGrBaseIE):
    IE_DESC = 'ant1news.gr embedded videos'
    _BASE_PLAYER_URL_RE = r'(?:https?:)?//(?:[a-zA-Z0-9\-]+\.)?(?:antenna|ant1news)\.gr/templates/pages/player'
    _VALID_URL = rf'{_BASE_PLAYER_URL_RE}\?([^#]+&)?cid=(?P<id>[^#&]+)'
    _EMBED_REGEX = [rf'<iframe[^>]+?src=(?P<_q1>["\'])(?P<url>{_BASE_PLAYER_URL_RE}\?(?:(?!(?P=_q1)).)+)(?P=_q1)']
    _API_PATH = '/news/templates/data/jsonPlayer'
    _TESTS = [{
@@ -117,16 +116,6 @@ class Ant1NewsGrEmbedIE(Ant1NewsGrBaseIE):
        },
    }]
    @classmethod
    def _extract_urls(cls, webpage):
        _EMBED_URL_RE = rf'{cls._BASE_PLAYER_URL_RE}\?(?:(?!(?P=_q1)).)+'
        _EMBED_RE = rf'<iframe[^>]+?src=(?P<_q1>["\'])(?P<url>{_EMBED_URL_RE})(?P=_q1)'
        for mobj in re.finditer(_EMBED_RE, webpage):
            url = unescapeHTML(mobj.group('url'))
            if not cls.suitable(url):
                continue
            yield url
    def _real_extract(self, url):
        video_id = self._match_id(url)
@@ -5,31 +5,70 @@ import random
 import re
 import time
 from .anvato_token_generator import NFLTokenGenerator
 from .common import InfoExtractor
 from ..aes import aes_encrypt
 from ..compat import compat_str
 from ..utils import (
    bytes_to_intlist,
    determine_ext,
    intlist_to_bytes,
    int_or_none,
    intlist_to_bytes,
    join_nonempty,
    smuggle_url,
    strip_jsonp,
    traverse_obj,
    unescapeHTML,
    unsmuggle_url,
 )
 def md5_text(s):
-    if not isinstance(s, compat_str):
+    return hashlib.md5(str(s).encode()).hexdigest()
        s = compat_str(s)
    return hashlib.md5(s.encode('utf-8')).hexdigest()
 class AnvatoIE(InfoExtractor):
    _VALID_URL = r'anvato:(?P<access_key_or_mcp>[^:]+):(?P<id>\d+)'
    _API_BASE_URL = 'https://tkx.mp.lura.live/rest/v2'
    _ANVP_RE = r'<script[^>]+\bdata-anvp\s*=\s*(["\'])(?P<anvp>(?:(?!\1).)+)\1'
    _AUTH_KEY = b'\x31\xc2\x42\x84\x9e\x73\xa0\xce'  # from anvplayer.min.js
    _TESTS = [{
        # from https://www.nfl.com/videos/baker-mayfield-s-game-changing-plays-from-3-td-game-week-14
        'url': 'anvato:GXvEgwyJeWem8KCYXfeoHWknwP48Mboj:899441',
        'md5': '921919dab3cd0b849ff3d624831ae3e2',
        'info_dict': {
            'id': '899441',
            'ext': 'mp4',
            'title': 'Baker Mayfield\'s game-changing plays from 3-TD game Week 14',
            'description': 'md5:85e05a3cc163f8c344340f220521136d',
            'upload_date': '20201215',
            'timestamp': 1608009755,
            'thumbnail': r're:^https?://.*\.jpg',
            'uploader': 'NFL',
            'tags': ['Baltimore Ravens at Cleveland Browns (2020-REG-14)', 'Baker Mayfield', 'Game Highlights',
                     'Player Highlights', 'Cleveland Browns', 'league'],
            'duration': 157,
            'categories': ['Entertainment', 'Game', 'Highlights'],
        },
    }, {
        # from https://ktla.com/news/99-year-old-woman-learns-to-fly-in-torrance-checks-off-bucket-list-dream/
        'url': 'anvato:X8POa4zpGZMmeiq0wqiO8IP5rMqQM9VN:8032455',
        'md5': '837718bcfb3a7778d022f857f7a9b19e',
        'info_dict': {
            'id': '8032455',
            'ext': 'mp4',
            'title': '99-year-old woman learns to fly plane in Torrance, checks off bucket list dream',
            'description': 'md5:0a12bab8159445e78f52a297a35c6609',
            'upload_date': '20220928',
            'timestamp': 1664408881,
            'thumbnail': r're:^https?://.*\.jpg',
            'uploader': 'LIN',
            'tags': ['video', 'news', '5live'],
            'duration': 155,
            'categories': ['News'],
        },
    }]
    # Copied from anvplayer.min.js
    _ANVACK_TABLE = {
        'nbcu_nbcd_desktop_web_prod_93d8ead38ce2024f8f544b78306fbd15895ae5e6': 'NNemUkySjxLyPTKvZRiGntBIjEyK8uqicjMakIaQ',
@@ -202,86 +241,74 @@ class AnvatoIE(InfoExtractor):
        'telemundo': 'anvato_mcp_telemundo_web_prod_c5278d51ad46fda4b6ca3d0ea44a7846a054f582'
    }
    def _generate_nfl_token(self, anvack, mcp_id):
        reroute = self._download_json(
            'https://api.nfl.com/v1/reroute', mcp_id, data=b'grant_type=client_credentials',
            headers={'X-Domain-Id': 100}, note='Fetching token info')
        token_type = reroute.get('token_type') or 'Bearer'
        auth_token = f'{token_type} {reroute["access_token"]}'
        response = self._download_json(
            'https://api.nfl.com/v3/shield/', mcp_id, data=json.dumps({
                'query': '''{
  viewer {
    mediaToken(anvack: "%s", id: %s) {
      token
    }
  }
 }''' % (anvack, mcp_id),
            }).encode(), headers={
                'Authorization': auth_token,
                'Content-Type': 'application/json',
            }, note='Fetching NFL API token')
        return traverse_obj(response, ('data', 'viewer', 'mediaToken', 'token'))
    _TOKEN_GENERATORS = {
-        'GXvEgwyJeWem8KCYXfeoHWknwP48Mboj': NFLTokenGenerator,
+        'GXvEgwyJeWem8KCYXfeoHWknwP48Mboj': _generate_nfl_token,
    }
    _API_KEY = '3hwbSuqqT690uxjNYBktSQpa5ZrpYYR0Iofx7NcJHyA'
    _ANVP_RE = r'<script[^>]+\bdata-anvp\s*=\s*(["\'])(?P<anvp>(?:(?!\1).)+)\1'
    _AUTH_KEY = b'\x31\xc2\x42\x84\x9e\x73\xa0\xce'
    _TESTS = [{
        # from https://www.boston25news.com/news/watch-humpback-whale-breaches-right-next-to-fishing-boat-near-nh/817484874
        'url': 'anvato:8v9BEynrwx8EFLYpgfOWcG1qJqyXKlRM:4465496',
        'info_dict': {
            'id': '4465496',
            'ext': 'mp4',
            'title': 'VIDEO: Humpback whale breaches right next to NH boat',
            'description': 'VIDEO: Humpback whale breaches right next to NH boat. Footage courtesy: Zach Fahey.',
            'duration': 22,
            'timestamp': 1534855680,
            'upload_date': '20180821',
            'uploader': 'ANV',
        },
        'params': {
            'skip_download': True,
        },
    }, {
        # from https://sanfrancisco.cbslocal.com/2016/06/17/source-oakland-cop-on-leave-for-having-girlfriend-help-with-police-reports/
        'url': 'anvato:DVzl9QRzox3ZZsP9bNu5Li3X7obQOnqP:3417601',
        'only_matching': True,
    }]
    def __init__(self, *args, **kwargs):
        super(AnvatoIE, self).__init__(*args, **kwargs)
        self.__server_time = None
    def _server_time(self, access_key, video_id):
-        if self.__server_time is not None:
+        return int_or_none(traverse_obj(self._download_json(
-            return self.__server_time
+            f'{self._API_BASE_URL}/server_time', video_id, query={'anvack': access_key},
            note='Fetching server time', fatal=False), 'server_time')) or int(time.time())
-        self.__server_time = int(self._download_json(
+    def _get_video_json(self, access_key, video_id, extracted_token):
            self._api_prefix(access_key) + 'server_time?anvack=' + access_key, video_id,
            note='Fetching server time')['server_time'])
        return self.__server_time
    def _api_prefix(self, access_key):
        return 'https://tkx2-%s.anvato.net/rest/v2/' % ('prod' if 'prod' in access_key else 'stage')
    def _get_video_json(self, access_key, video_id):
        # See et() in anvplayer.min.js, which is an alias of getVideoJSON()
-        video_data_url = self._api_prefix(access_key) + 'mcp/video/%s?anvack=%s' % (video_id, access_key)
+        video_data_url = f'{self._API_BASE_URL}/mcp/video/{video_id}?anvack={access_key}'
        server_time = self._server_time(access_key, video_id)
-        input_data = '%d~%s~%s' % (server_time, md5_text(video_data_url), md5_text(server_time))
+        input_data = f'{server_time}~{md5_text(video_data_url)}~{md5_text(server_time)}'
        auth_secret = intlist_to_bytes(aes_encrypt(
            bytes_to_intlist(input_data[:64]), bytes_to_intlist(self._AUTH_KEY)))
-
+        query = {
-        video_data_url += '&X-Anvato-Adst-Auth=' + base64.b64encode(auth_secret).decode('ascii')
+            'X-Anvato-Adst-Auth': base64.b64encode(auth_secret).decode('ascii'),
            'rtyp': 'fp',
        }
        anvrid = md5_text(time.time() * 1000 * random.random())[:30]
        api = {
            'anvrid': anvrid,
            'anvts': server_time,
        }
-        if self._TOKEN_GENERATORS.get(access_key) is not None:
+        if extracted_token is not None:
-            api['anvstk2'] = self._TOKEN_GENERATORS[access_key].generate(self, access_key, video_id)
+            api['anvstk2'] = extracted_token
        elif self._TOKEN_GENERATORS.get(access_key) is not None:
            api['anvstk2'] = self._TOKEN_GENERATORS[access_key](self, access_key, video_id)
        elif self._ANVACK_TABLE.get(access_key) is not None:
            api['anvstk'] = md5_text(f'{access_key}|{anvrid}|{server_time}|{self._ANVACK_TABLE[access_key]}')
        else:
-            api['anvstk'] = md5_text('%s|%s|%d|%s' % (
+            api['anvstk2'] = 'default'
                access_key, anvrid, server_time,
                self._ANVACK_TABLE.get(access_key, self._API_KEY)))
        return self._download_json(
-            video_data_url, video_id, transform_source=strip_jsonp,
+            video_data_url, video_id, transform_source=strip_jsonp, query=query,
-            data=json.dumps({'api': api}).encode('utf-8'))
+            data=json.dumps({'api': api}, separators=(',', ':')).encode('utf-8'))
-    def _get_anvato_videos(self, access_key, video_id):
+    def _get_anvato_videos(self, access_key, video_id, token):
-        video_data = self._get_video_json(access_key, video_id)
+        video_data = self._get_video_json(access_key, video_id, token)
        formats = []
        for published_url in video_data['published_urls']:
-            video_url = published_url['embed_url']
+            video_url = published_url.get('embed_url')
            if not video_url:
                continue
            media_format = published_url.get('format')
            ext = determine_ext(video_url)
@@ -296,15 +323,27 @@ class AnvatoIE(InfoExtractor):
                'tbr': tbr or None,
            }
-            if media_format == 'm3u8' and tbr is not None:
+            vtt_subs, hls_subs = {}, {}
            if media_format == 'vtt':
                _, vtt_subs = self._extract_m3u8_formats_and_subtitles(
                    video_url, video_id, m3u8_id='vtt', fatal=False)
                continue
            elif media_format == 'm3u8' and tbr is not None:
                a_format.update({
                    'format_id': join_nonempty('hls', tbr),
                    'ext': 'mp4',
                })
            elif media_format == 'm3u8-variant' or ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
+                # For some videos the initial m3u8 URL returns JSON instead
-                    video_url, video_id, 'mp4', entry_protocol='m3u8_native',
+                manifest_json = self._download_json(
-                    m3u8_id='hls', fatal=False))
+                    video_url, video_id, note='Downloading manifest JSON', errnote=False)
                if manifest_json:
                    video_url = manifest_json.get('master_m3u8')
                    if not video_url:
                        continue
                hls_fmts, hls_subs = self._extract_m3u8_formats_and_subtitles(
                    video_url, video_id, ext='mp4', m3u8_id='hls', fatal=False)
                formats.extend(hls_fmts)
                continue
            elif ext == 'mp3' or media_format == 'mp3':
                a_format['vcodec'] = 'none'
@@ -324,6 +363,7 @@ class AnvatoIE(InfoExtractor):
                'ext': 'tt' if caption.get('format') == 'SMPTE-TT' else None
            }
            subtitles.setdefault(caption['language'], []).append(a_caption)
        subtitles = self._merge_subtitles(subtitles, hls_subs, vtt_subs)
        return {
            'id': video_id,
@@ -340,30 +380,19 @@ class AnvatoIE(InfoExtractor):
            'subtitles': subtitles,
        }
-    @staticmethod
+    @classmethod
-    def _extract_urls(ie, webpage, video_id):
+    def _extract_from_webpage(cls, url, webpage):
-        entries = []
+        for mobj in re.finditer(cls._ANVP_RE, webpage):
-        for mobj in re.finditer(AnvatoIE._ANVP_RE, webpage):
+            anvplayer_data = unescapeHTML(json.loads(mobj.group('anvp'))) or {}
-            anvplayer_data = ie._parse_json(
+            video_id, access_key = anvplayer_data.get('video'), anvplayer_data.get('accessKey')
                mobj.group('anvp'), video_id, transform_source=unescapeHTML,
                fatal=False)
            if not anvplayer_data:
                continue
            video = anvplayer_data.get('video')
            if not isinstance(video, compat_str) or not video.isdigit():
                continue
            access_key = anvplayer_data.get('accessKey')
            if not access_key:
                mcp = anvplayer_data.get('mcp')
                if mcp:
                    access_key = AnvatoIE._MCP_TO_ACCESS_KEY_TABLE.get(
                        mcp.lower())
            if not access_key:
                access_key = cls._MCP_TO_ACCESS_KEY_TABLE.get((anvplayer_data.get('mcp') or '').lower())
            if not (video_id or '').isdigit() or not access_key:
                continue
-            entries.append(ie.url_result(
+            url = f'anvato:{access_key}:{video_id}'
-                'anvato:%s:%s' % (access_key, video), ie=AnvatoIE.ie_key(),
+            if anvplayer_data.get('token'):
-                video_id=video))
+                url = smuggle_url(url, {'token': anvplayer_data['token']})
-        return entries
+            yield cls.url_result(url, AnvatoIE, video_id)
    def _extract_anvato_videos(self, webpage, video_id):
        anvplayer_data = self._parse_json(
@@ -371,7 +400,7 @@ class AnvatoIE(InfoExtractor):
                self._ANVP_RE, webpage, 'Anvato player data', group='anvp'),
            video_id)
        return self._get_anvato_videos(
-            anvplayer_data['accessKey'], anvplayer_data['video'])
+            anvplayer_data['accessKey'], anvplayer_data['video'], 'default')  # cbslocal token = 'default'
    def _real_extract(self, url):
        url, smuggled_data = unsmuggle_url(url, {})
@@ -379,9 +408,7 @@ class AnvatoIE(InfoExtractor):
            'countries': smuggled_data.get('geo_countries'),
        })
-        mobj = self._match_valid_url(url)
+        access_key, video_id = self._match_valid_url(url).group('access_key_or_mcp', 'id')
        access_key, video_id = mobj.group('access_key_or_mcp', 'id')
        if access_key not in self._ANVACK_TABLE:
-            access_key = self._MCP_TO_ACCESS_KEY_TABLE.get(
+            access_key = self._MCP_TO_ACCESS_KEY_TABLE.get(access_key) or access_key
-                access_key) or access_key
+        return self._get_anvato_videos(access_key, video_id, smuggled_data.get('token'))
        return self._get_anvato_videos(access_key, video_id)
@@ -1,5 +0,0 @@
 from .nfl import NFLTokenGenerator
 __all__ = [
    'NFLTokenGenerator',
 ]
@@ -1,3 +0,0 @@
 class TokenGenerator:
    def generate(self, anvack, mcp_id):
        raise NotImplementedError('This method must be implemented by subclasses')
@@ -1,28 +0,0 @@
 import json
 from .common import TokenGenerator
 class NFLTokenGenerator(TokenGenerator):
    _AUTHORIZATION = None
    def generate(ie, anvack, mcp_id):
        if not NFLTokenGenerator._AUTHORIZATION:
            reroute = ie._download_json(
                'https://api.nfl.com/v1/reroute', mcp_id,
                data=b'grant_type=client_credentials',
                headers={'X-Domain-Id': 100})
            NFLTokenGenerator._AUTHORIZATION = '%s %s' % (reroute.get('token_type') or 'Bearer', reroute['access_token'])
        return ie._download_json(
            'https://api.nfl.com/v3/shield/', mcp_id, data=json.dumps({
                'query': '''{
  viewer {
    mediaToken(anvack: "%s", id: %s) {
      token
    }
  }
 }''' % (anvack, mcp_id),
            }).encode(), headers={
                'Authorization': NFLTokenGenerator._AUTHORIZATION,
                'Content-Type': 'application/json',
            })['data']['viewer']['mediaToken']['token']
@@ -1,5 +1,3 @@
 import re
 from .common import InfoExtractor
 from ..utils import (
    determine_ext,
@@ -10,6 +8,7 @@ from ..utils import (
 class APAIE(InfoExtractor):
    _VALID_URL = r'(?P<base_url>https?://[^/]+\.apa\.at)/embed/(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
    _EMBED_REGEX = [r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//[^/]+\.apa\.at/embed/[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}.*?)\1']
    _TESTS = [{
        'url': 'http://uvp.apa.at/embed/293f6d17-692a-44e3-9fd5-7b178f3a1029',
        'md5': '2b12292faeb0a7d930c778c7a5b4759b',
@@ -30,14 +29,6 @@ class APAIE(InfoExtractor):
        'only_matching': True,
    }]
    @staticmethod
    def _extract_urls(webpage):
        return [
            mobj.group('url')
            for mobj in re.finditer(
                r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//[^/]+\.apa\.at/embed/[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}.*?)\1',
                webpage)]
    def _real_extract(self, url):
        mobj = self._match_valid_url(url)
        video_id, base_url = mobj.group('id', 'base_url')
@@ -10,6 +10,7 @@ from ..utils import (
 class AparatIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?aparat\.com/(?:v/|video/video/embed/videohash/)(?P<id>[a-zA-Z0-9]+)'
    _EMBED_REGEX = [r'<iframe .*?src="(?P<url>http://www\.aparat\.com/video/[^"]+)"']
    _TESTS = [{
        'url': 'http://www.aparat.com/v/wP8On',
@@ -49,6 +49,11 @@ class ArchiveOrgIE(InfoExtractor):
            'upload_date': '20100315',
            'creator': 'SRI International',
            'uploader': 'laura@archive.org',
            'thumbnail': r're:https://archive\.org/download/.*\.jpg',
            'release_year': 1968,
            'display_id': 'XD300-23_68HighlightsAResearchCntAugHumanIntellect.cdr',
            'track': 'XD300-23 68HighlightsAResearchCntAugHumanIntellect',
        },
    }, {
        'url': 'https://archive.org/details/Cops1922',
@@ -57,33 +62,43 @@ class ArchiveOrgIE(InfoExtractor):
            'id': 'Cops1922',
            'ext': 'mp4',
            'title': 'Buster Keaton\'s "Cops" (1922)',
-            'description': 'md5:43a603fd6c5b4b90d12a96b921212b9c',
+            'description': 'md5:cd6f9910c35aedd5fc237dbc3957e2ca',
            'uploader': 'yorkmba99@hotmail.com',
            'timestamp': 1387699629,
            'upload_date': '20131222',
            'display_id': 'Cops-v2.mp4',
            'thumbnail': r're:https://archive\.org/download/.*\.jpg',
            'duration': 1091.96,
        },
    }, {
        'url': 'http://archive.org/embed/XD300-23_68HighlightsAResearchCntAugHumanIntellect',
        'only_matching': True,
    }, {
        'url': 'https://archive.org/details/Election_Ads',
-        'md5': '284180e857160cf866358700bab668a3',
+        'md5': 'eec5cddebd4793c6a653b69c3b11f2e6',
        'info_dict': {
            'id': 'Election_Ads/Commercial-JFK1960ElectionAdCampaignJingle.mpg',
            'title': 'Commercial-JFK1960ElectionAdCampaignJingle.mpg',
-            'ext': 'mp4',
+            'ext': 'mpg',
            'thumbnail': r're:https://archive\.org/download/.*\.jpg',
            'duration': 59.77,
            'display_id': 'Commercial-JFK1960ElectionAdCampaignJingle.mpg',
        },
    }, {
        'url': 'https://archive.org/details/Election_Ads/Commercial-Nixon1960ElectionAdToughonDefense.mpg',
-        'md5': '7915213ef02559b5501fe630e1a53f59',
+        'md5': 'ea1eed8234e7d4165f38c8c769edef38',
        'info_dict': {
            'id': 'Election_Ads/Commercial-Nixon1960ElectionAdToughonDefense.mpg',
            'title': 'Commercial-Nixon1960ElectionAdToughonDefense.mpg',
-            'ext': 'mp4',
+            'ext': 'mpg',
            'timestamp': 1205588045,
            'uploader': 'mikedavisstripmaster@yahoo.com',
            'description': '1960 Presidential Campaign Election Commercials John F Kennedy, Richard M Nixon',
            'upload_date': '20080315',
            'display_id': 'Commercial-Nixon1960ElectionAdToughonDefense.mpg',
            'duration': 59.51,
            'license': 'http://creativecommons.org/licenses/publicdomain/',
            'thumbnail': r're:https://archive\.org/download/.*\.jpg',
        },
    }, {
        'url': 'https://archive.org/details/gd1977-05-08.shure57.stevenson.29303.flac16',
@@ -92,6 +107,12 @@ class ArchiveOrgIE(InfoExtractor):
            'id': 'gd1977-05-08.shure57.stevenson.29303.flac16/gd1977-05-08d01t01.flac',
            'title': 'Turning',
            'ext': 'flac',
            'track': 'Turning',
            'creator': 'Grateful Dead',
            'display_id': 'gd1977-05-08d01t01.flac',
            'track_number': 1,
            'album': '1977-05-08 - Barton Hall - Cornell University',
            'duration': 39.8,
        },
    }, {
        'url': 'https://archive.org/details/gd1977-05-08.shure57.stevenson.29303.flac16/gd1977-05-08d01t07.flac',
@@ -102,11 +123,20 @@ class ArchiveOrgIE(InfoExtractor):
            'ext': 'flac',
            'timestamp': 1205895624,
            'uploader': 'mvernon54@yahoo.com',
-            'description': 'md5:6a31f1996db0aa0fc9da6d6e708a1bb0',
+            'description': 'md5:6c921464414814720c6593810a5c7e3d',
            'upload_date': '20080319',
            'location': 'Barton Hall - Cornell University',
            'duration': 438.68,
            'track': 'Deal',
            'creator': 'Grateful Dead',
            'album': '1977-05-08 - Barton Hall - Cornell University',
            'release_date': '19770508',
            'display_id': 'gd1977-05-08d01t07.flac',
            'release_year': 1977,
            'track_number': 7,
        },
    }, {
        # FIXME: give a better error message than just IndexError when all available formats are restricted
        'url': 'https://archive.org/details/lp_the-music-of-russia_various-artists-a-askaryan-alexander-melik',
        'md5': '7cb019baa9b332e82ea7c10403acd180',
        'info_dict': {
@@ -114,6 +144,7 @@ class ArchiveOrgIE(InfoExtractor):
            'title': 'Bells Of Rostov',
            'ext': 'mp3',
        },
        'skip': 'restricted'
    }, {
        'url': 'https://archive.org/details/lp_the-music-of-russia_various-artists-a-askaryan-alexander-melik/disc1/02.02.+Song+And+Chorus+In+The+Polovetsian+Camp+From+%22Prince+Igor%22+(Act+2%2C+Scene+1).mp3',
        'md5': '1d0aabe03edca83ca58d9ed3b493a3c3',
@@ -126,6 +157,52 @@ class ArchiveOrgIE(InfoExtractor):
            'description': 'md5:012b2d668ae753be36896f343d12a236',
            'upload_date': '20190928',
        },
        'skip': 'restricted'
    }, {
        # Original formats are private
        'url': 'https://archive.org/details/irelandthemakingofarepublic',
        'info_dict': {
            'id': 'irelandthemakingofarepublic',
            'title': 'Ireland: The Making of a Republic',
            'upload_date': '20160610',
            'description': 'md5:f70956a156645a658a0dc9513d9e78b7',
            'uploader': 'dimitrios@archive.org',
            'creator': ['British Broadcasting Corporation', 'Time-Life Films'],
            'timestamp': 1465594947,
        },
        'playlist': [
            {
                'md5': '0b211261b26590d49df968f71b90690d',
                'info_dict': {
                    'id': 'irelandthemakingofarepublic/irelandthemakingofarepublicreel1_01.mov',
                    'ext': 'mp4',
                    'title': 'irelandthemakingofarepublicreel1_01.mov',
                    'duration': 130.46,
                    'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel1_01_000117.jpg',
                    'display_id': 'irelandthemakingofarepublicreel1_01.mov',
                },
            }, {
                'md5': '67335ee3b23a0da930841981c1e79b02',
                'info_dict': {
                    'id': 'irelandthemakingofarepublic/irelandthemakingofarepublicreel1_02.mov',
                    'ext': 'mp4',
                    'duration': 1395.13,
                    'title': 'irelandthemakingofarepublicreel1_02.mov',
                    'display_id': 'irelandthemakingofarepublicreel1_02.mov',
                    'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel1_02_001374.jpg',
                },
            }, {
                'md5': 'e470e86787893603f4a341a16c281eb5',
                'info_dict': {
                    'id': 'irelandthemakingofarepublic/irelandthemakingofarepublicreel2.mov',
                    'ext': 'mp4',
                    'duration': 1602.67,
                    'title': 'irelandthemakingofarepublicreel2.mov',
                    'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel2_001554.jpg',
                    'display_id': 'irelandthemakingofarepublicreel2.mov',
                },
            }
        ]
    }]
    @staticmethod
@@ -216,17 +293,25 @@ class ArchiveOrgIE(InfoExtractor):
                    'filesize': int_or_none(f.get('size'))})
            extension = (f['name'].rsplit('.', 1) + [None])[1]
-            if extension in KNOWN_EXTENSIONS:
+
            # We don't want to skip private formats if the user has access to them,
            # however without access to an account with such privileges we can't implement/test this.
            # For now to be safe, we will only skip them if there is no user logged in.
            is_logged_in = bool(self._get_cookies('https://archive.org').get('logged-in-sig'))
            if extension in KNOWN_EXTENSIONS and (not f.get('private') or is_logged_in):
                entry['formats'].append({
                    'url': 'https://archive.org/download/' + identifier + '/' + f['name'],
                    'format': f.get('format'),
                    'width': int_or_none(f.get('width')),
                    'height': int_or_none(f.get('height')),
                    'filesize': int_or_none(f.get('size')),
-                    'protocol': 'https'})
+                    'protocol': 'https',
                    'source_preference': 0 if f.get('source') == 'original' else -1,
                    'format_note': f.get('source')
                })
        for entry in entries.values():
-            self._sort_formats(entry['formats'])
+            self._sort_formats(entry['formats'], ('source', ))
        if len(entries) == 1:
            # If there's only one item, use it as the main info dict
@@ -441,9 +526,10 @@ class YoutubeWebArchiveIE(InfoExtractor):
        },
    ]
    _YT_INITIAL_DATA_RE = YoutubeBaseInfoExtractor._YT_INITIAL_DATA_RE
-    _YT_INITIAL_PLAYER_RESPONSE_RE = fr'''(?x)
+    _YT_INITIAL_PLAYER_RESPONSE_RE = fr'''(?x:
        (?:window\s*\[\s*["\']ytInitialPlayerResponse["\']\s*\]|ytInitialPlayerResponse)\s*=[(\s]*|
-        {YoutubeBaseInfoExtractor._YT_INITIAL_PLAYER_RESPONSE_RE}'''
+        {YoutubeBaseInfoExtractor._YT_INITIAL_PLAYER_RESPONSE_RE}
    )'''
    _YT_DEFAULT_THUMB_SERVERS = ['i.ytimg.com']  # thumbnails most likely archived on these servers
    _YT_ALL_THUMB_SERVERS = orderedSet(
@@ -70,8 +70,8 @@ class ArcPublishingIE(InfoExtractor):
        ], 'video-api-cdn.%s.arcpublishing.com/api'),
    ]
-    @staticmethod
+    @classmethod
-    def _extract_urls(webpage):
+    def _extract_embed_urls(cls, url, webpage):
        entries = []
        # https://arcpublishing.atlassian.net/wiki/spaces/POWA/overview
        for powa_el in re.findall(r'(<div[^>]+class="[^"]*\bpowa\b[^"]*"[^>]+data-uuid="%s"[^>]*>)' % ArcPublishingIE._UUID_REGEX, webpage):
@@ -1,5 +1,3 @@
 import re
 from .common import InfoExtractor
 from ..utils import (
    ExtractorError,
@@ -19,6 +17,8 @@ class ArkenaIE(InfoExtractor):
                                play\.arkena\.com/(?:config|embed)/avp/v\d/player/media/(?P<id>[^/]+)/[^/]+/(?P<account_id>\d+)
                            )
                        '''
    # See https://support.arkena.com/display/PLAY/Ways+to+embed+your+video
    _EMBED_REGEX = [r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//play\.arkena\.com/embed/avp/.+?)\1']
    _TESTS = [{
        'url': 'https://video.qbrick.com/play2/embed/player?accountId=1034090&mediaId=d8ab4607-00090107-aab86310',
        'md5': '97f117754e5f3c020f5f26da4a44ebaf',
@@ -50,15 +50,6 @@ class ArkenaIE(InfoExtractor):
        'only_matching': True,
    }]
    @staticmethod
    def _extract_url(webpage):
        # See https://support.arkena.com/display/PLAY/Ways+to+embed+your+video
        mobj = re.search(
            r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//play\.arkena\.com/embed/avp/.+?)\1',
            webpage)
        if mobj:
            return mobj.group('url')
    def _real_extract(self, url):
        mobj = self._match_valid_url(url)
        video_id = mobj.group('id')
@@ -1,190 +1,217 @@
 import re
 from .common import InfoExtractor
 from ..compat import (
    compat_str,
 )
 from ..utils import (
    ExtractorError,
    GeoRestrictedError,
    int_or_none,
    parse_iso8601,
    parse_qs,
    qualities,
    strip_or_none,
-    try_get,
+    traverse_obj,
    unified_strdate,
    url_or_none,
 )
 class ArteTVBaseIE(InfoExtractor):
    _ARTE_LANGUAGES = 'fr|de|en|es|it|pl'
-    _API_BASE = 'https://api.arte.tv/api/player/v1'
+    _API_BASE = 'https://api.arte.tv/api/player/v2'
 class ArteTVIE(ArteTVBaseIE):
    _VALID_URL = r'''(?x)
-                    https?://
+                    (?:https?://
                        (?:
                            (?:www\.)?arte\.tv/(?P<lang>%(langs)s)/videos|
                            api\.arte\.tv/api/player/v\d+/config/(?P<lang_2>%(langs)s)
                        )
-                        /(?P<id>\d{6}-\d{3}-[AF])
+                    |arte://program)
                        /(?P<id>\d{6}-\d{3}-[AF]|LIVE)
                    ''' % {'langs': ArteTVBaseIE._ARTE_LANGUAGES}
    _TESTS = [{
        'url': 'https://www.arte.tv/en/videos/088501-000-A/mexico-stealing-petrol-to-survive/',
-        'info_dict': {
+        'only_matching': True,
            'id': '088501-000-A',
            'ext': 'mp4',
            'title': 'Mexico: Stealing Petrol to Survive',
            'upload_date': '20190628',
        },
    }, {
        'url': 'https://www.arte.tv/pl/videos/100103-000-A/usa-dyskryminacja-na-porodowce/',
-        'only_matching': True,
+        'info_dict': {
            'id': '100103-000-A',
            'title': 'USA: Dyskryminacja na porodówce',
            'description': 'md5:242017b7cce59ffae340a54baefcafb1',
            'alt_title': 'ARTE Reportage',
            'upload_date': '20201103',
            'duration': 554,
            'thumbnail': r're:https://api-cdn\.arte\.tv/.+940x530',
            'timestamp': 1604417980,
            'ext': 'mp4',
        },
        'params': {'skip_download': 'm3u8'}
    }, {
        'note': 'No alt_title',
        'url': 'https://www.arte.tv/fr/videos/110371-000-A/la-chaleur-supplice-des-arbres-de-rue/',
        'info_dict': {
            'id': '110371-000-A',
            'ext': 'mp4',
            'upload_date': '20220718',
            'duration': 154,
            'timestamp': 1658162460,
            'description': 'md5:5890f36fe7dccfadb8b7c0891de54786',
            'title': 'La chaleur, supplice des arbres de rue',
            'thumbnail': 'https://api-cdn.arte.tv/img/v2/image/CPE2sQDtD8GLQgt8DuYHLf/940x530',
        },
        'params': {'skip_download': 'm3u8'}
    }, {
        'url': 'https://api.arte.tv/api/player/v2/config/de/100605-013-A',
        'only_matching': True,
    }, {
        'url': 'https://api.arte.tv/api/player/v2/config/de/LIVE',
        'only_matching': True,
    }]
    _GEO_BYPASS = True
    _LANG_MAP = {  # ISO639 -> French abbreviations
        'fr': 'F',
        'de': 'A',
        'en': 'E[ANG]',
        'es': 'E[ESP]',
        'it': 'E[ITA]',
        'pl': 'E[POL]',
        # XXX: probably means mixed; <https://www.arte.tv/en/videos/107710-029-A/dispatches-from-ukraine-local-journalists-report/>
        # uses this code for audio that happens to be in Ukrainian, but the manifest uses the ISO code 'mul' (mixed)
        'mul': 'EU',
    }
    _VERSION_CODE_RE = re.compile(r'''(?x)
        V
        (?P<original_voice>O?)
        (?P<vlang>[FA]|E\[[A-Z]+\]|EU)?
        (?P<audio_desc>AUD|)
        (?:
            (?P<has_sub>-ST)
            (?P<sdh_sub>M?)
            (?P<sub_lang>[FA]|E\[[A-Z]+\]|EU)
        )?
    ''')
    # all obtained by exhaustive testing
    _COUNTRIES_MAP = {
        'DE_FR': (
            'BL', 'DE', 'FR', 'GF', 'GP', 'MF', 'MQ', 'NC',
            'PF', 'PM', 'RE', 'WF', 'YT',
        ),
        # with both of the below 'BE' sometimes works, sometimes doesn't
        'EUR_DE_FR': (
            'AT', 'BL', 'CH', 'DE', 'FR', 'GF', 'GP', 'LI',
            'MC', 'MF', 'MQ', 'NC', 'PF', 'PM', 'RE', 'WF',
            'YT',
        ),
        'SAT': (
            'AD', 'AT', 'AX', 'BG', 'BL', 'CH', 'CY', 'CZ',
            'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GF',
            'GR', 'HR', 'HU', 'IE', 'IS', 'IT', 'KN', 'LI',
            'LT', 'LU', 'LV', 'MC', 'MF', 'MQ', 'MT', 'NC',
            'NL', 'NO', 'PF', 'PL', 'PM', 'PT', 'RE', 'RO',
            'SE', 'SI', 'SK', 'SM', 'VA', 'WF', 'YT',
        ),
    }
    def _real_extract(self, url):
        mobj = self._match_valid_url(url)
        video_id = mobj.group('id')
        lang = mobj.group('lang') or mobj.group('lang_2')
        langauge_code = self._LANG_MAP.get(lang)
-        info = self._download_json(
+        config = self._download_json(f'{self._API_BASE}/config/{lang}/{video_id}', video_id)
            '%s/config/%s/%s' % (self._API_BASE, lang, video_id), video_id)
        player_info = info['videoJsonPlayer']
-        vsr = try_get(player_info, lambda x: x['VSR'], dict)
+        geoblocking = traverse_obj(config, ('data', 'attributes', 'restriction', 'geoblocking')) or {}
-        if not vsr:
+        if geoblocking.get('restrictedArea'):
-            error = None
+            raise GeoRestrictedError(f'Video restricted to {geoblocking["code"]!r}',
-            if try_get(player_info, lambda x: x['custom_msg']['type']) == 'error':
+                                     countries=self._COUNTRIES_MAP.get(geoblocking['code'], ('DE', 'FR')))
                error = try_get(
                    player_info, lambda x: x['custom_msg']['msg'], compat_str)
            if not error:
                error = 'Video %s is not available' % player_info.get('VID') or video_id
            raise ExtractorError(error, expected=True)
-        upload_date_str = player_info.get('shootingDate')
+        if not traverse_obj(config, ('data', 'attributes', 'rights')):
-        if not upload_date_str:
+            # Eg: https://www.arte.tv/de/videos/097407-215-A/28-minuten
-            upload_date_str = (player_info.get('VRA') or player_info.get('VDA') or '').split(' ')[0]
+            # Eg: https://www.arte.tv/es/videos/104351-002-A/serviteur-du-peuple-1-23
            raise ExtractorError(
                'Video is not available in this language edition of Arte or broadcast rights expired', expected=True)
-        title = (player_info.get('VTI') or player_info['VID']).strip()
+        formats, subtitles = [], {}
-        subtitle = player_info.get('VSU', '').strip()
+        secondary_formats = []
-        if subtitle:
+        for stream in config['data']['attributes']['streams']:
-            title += ' - %s' % subtitle
+            # official player contains code like `e.get("versions")[0].eStat.ml5`
            stream_version = stream['versions'][0]
            stream_version_code = stream_version['eStat']['ml5']
-        qfunc = qualities(['MQ', 'HQ', 'EQ', 'SQ'])
+            lang_pref = -1
            m = self._VERSION_CODE_RE.match(stream_version_code)
            if m:
                lang_pref = int(''.join('01'[x] for x in (
                    m.group('vlang') == langauge_code,      # we prefer voice in the requested language
                    not m.group('audio_desc'),              # and not the audio description version
                    bool(m.group('original_voice')),        # but if voice is not in the requested language, at least choose the original voice
                    m.group('sub_lang') == langauge_code,   # if subtitles are present, we prefer them in the requested language
                    not m.group('has_sub'),                 # but we prefer no subtitles otherwise
                    not m.group('sdh_sub'),                 # and we prefer not the hard-of-hearing subtitles if there are subtitles
                )))
-        LANGS = {
+            short_label = traverse_obj(stream_version, 'shortLabel', expected_type=str, default='?')
-            'fr': 'F',
+            if stream['protocol'].startswith('HLS'):
-            'de': 'A',
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
-            'en': 'E[ANG]',
+                    stream['url'], video_id=video_id, ext='mp4', m3u8_id=stream_version_code, fatal=False)
-            'es': 'E[ESP]',
+                for fmt in fmts:
-            'it': 'E[ITA]',
+                    fmt.update({
-            'pl': 'E[POL]',
+                        'format_note': f'{stream_version.get("label", "unknown")} [{short_label}]',
        }
        langcode = LANGS.get(lang, lang)
        formats = []
        for format_id, format_dict in vsr.items():
            f = dict(format_dict)
            format_url = url_or_none(f.get('url'))
            streamer = f.get('streamer')
            if not format_url and not streamer:
                continue
            versionCode = f.get('versionCode')
            l = re.escape(langcode)
            # Language preference from most to least priority
            # Reference: section 6.8 of
            # https://www.arte.tv/sites/en/corporate/files/complete-technical-guidelines-arte-geie-v1-07-1.pdf
            PREFERENCES = (
                # original version in requested language, without subtitles
                r'VO{0}$'.format(l),
                # original version in requested language, with partial subtitles in requested language
                r'VO{0}-ST{0}$'.format(l),
                # original version in requested language, with subtitles for the deaf and hard-of-hearing in requested language
                r'VO{0}-STM{0}$'.format(l),
                # non-original (dubbed) version in requested language, without subtitles
                r'V{0}$'.format(l),
                # non-original (dubbed) version in requested language, with subtitles partial subtitles in requested language
                r'V{0}-ST{0}$'.format(l),
                # non-original (dubbed) version in requested language, with subtitles for the deaf and hard-of-hearing in requested language
                r'V{0}-STM{0}$'.format(l),
                # original version in requested language, with partial subtitles in different language
                r'VO{0}-ST(?!{0}).+?$'.format(l),
                # original version in requested language, with subtitles for the deaf and hard-of-hearing in different language
                r'VO{0}-STM(?!{0}).+?$'.format(l),
                # original version in different language, with partial subtitles in requested language
                r'VO(?:(?!{0}).+?)?-ST{0}$'.format(l),
                # original version in different language, with subtitles for the deaf and hard-of-hearing in requested language
                r'VO(?:(?!{0}).+?)?-STM{0}$'.format(l),
                # original version in different language, without subtitles
                r'VO(?:(?!{0}))?$'.format(l),
                # original version in different language, with partial subtitles in different language
                r'VO(?:(?!{0}).+?)?-ST(?!{0}).+?$'.format(l),
                # original version in different language, with subtitles for the deaf and hard-of-hearing in different language
                r'VO(?:(?!{0}).+?)?-STM(?!{0}).+?$'.format(l),
            )
            for pref, p in enumerate(PREFERENCES):
                if re.match(p, versionCode):
                    lang_pref = len(PREFERENCES) - pref
                    break
            else:
                lang_pref = -1
            format_note = '%s, %s' % (f.get('versionCode'), f.get('versionLibelle'))
            media_type = f.get('mediaType')
            if media_type == 'hls':
                m3u8_formats = self._extract_m3u8_formats(
                    format_url, video_id, 'mp4', entry_protocol='m3u8_native',
                    m3u8_id=format_id, fatal=False)
                for m3u8_format in m3u8_formats:
                    m3u8_format.update({
                        'language_preference': lang_pref,
                        'format_note': format_note,
                    })
-                formats.extend(m3u8_formats)
+                if any(map(short_label.startswith, ('cc', 'OGsub'))):
-                continue
+                    secondary_formats.extend(fmts)
                else:
                    formats.extend(fmts)
                self._merge_subtitles(subs, target=subtitles)
-            format = {
+            elif stream['protocol'] in ('HTTPS', 'RTMP'):
-                'format_id': format_id,
+                formats.append({
-                'language_preference': lang_pref,
+                    'format_id': f'{stream["protocol"]}-{stream_version_code}',
-                'format_note': format_note,
+                    'url': stream['url'],
-                'width': int_or_none(f.get('width')),
+                    'format_note': f'{stream_version.get("label", "unknown")} [{short_label}]',
-                'height': int_or_none(f.get('height')),
+                    'language_preference': lang_pref,
-                'tbr': int_or_none(f.get('bitrate')),
+                    # 'ext': 'mp4',  # XXX: may or may not be necessary, at least for HTTPS
-                'quality': qfunc(f.get('quality')),
+                })
            }
            if media_type == 'rtmp':
                format['url'] = f['streamer']
                format['play_path'] = 'mp4:' + f['url']
                format['ext'] = 'flv'
            else:
-                format['url'] = f['url']
+                self.report_warning(f'Skipping stream with unknown protocol {stream["protocol"]}')
-            formats.append(format)
+            # TODO: chapters from stream['segments']?
            # The JS also looks for chapters in config['data']['attributes']['chapters'],
            # but I am yet to find a video having those
-        # For this extractor, quality only represents the relative quality
+        formats.extend(secondary_formats)
-        # with respect to other formats with the same resolution
+        self._remove_duplicate_formats(formats)
-        self._sort_formats(formats, ('res', 'quality'))
+        self._sort_formats(formats)
        metadata = config['data']['attributes']['metadata']
        return {
-            'id': player_info.get('VID') or video_id,
+            'id': metadata['providerId'],
-            'title': title,
+            'webpage_url': traverse_obj(metadata, ('link', 'url')),
-            'description': player_info.get('VDE') or player_info.get('V7T'),
+            'title': traverse_obj(metadata, 'subtitle', 'title'),
-            'upload_date': unified_strdate(upload_date_str),
+            'alt_title': metadata.get('subtitle') and metadata.get('title'),
-            'thumbnail': player_info.get('programImage') or player_info.get('VTU', {}).get('IUR'),
+            'description': metadata.get('description'),
            'duration': traverse_obj(metadata, ('duration', 'seconds')),
            'language': metadata.get('language'),
            'timestamp': traverse_obj(config, ('data', 'attributes', 'rights', 'begin'), expected_type=parse_iso8601),
            'is_live': config['data']['attributes'].get('live', False),
            'formats': formats,
            'subtitles': subtitles,
            'thumbnails': [
                {'url': image['url'], 'id': image.get('caption')}
                for image in metadata.get('images') or [] if url_or_none(image.get('url'))
            ],
        }
 class ArteTVEmbedIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+'
    _EMBED_REGEX = [r'<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+?)\1']
    _TESTS = [{
        'url': 'https://www.arte.tv/player/v5/index.php?json_url=https%3A%2F%2Fapi.arte.tv%2Fapi%2Fplayer%2Fv2%2Fconfig%2Fde%2F100605-013-A&lang=de&autoplay=true&mute=0100605-013-A',
        'info_dict': {
@@ -194,17 +221,12 @@ class ArteTVEmbedIE(InfoExtractor):
            'description': 'md5:be40b667f45189632b78c1425c7c2ce1',
            'upload_date': '20201116',
        },
        'skip': 'No video available'
    }, {
        'url': 'https://www.arte.tv/player/v3/index.php?json_url=https://api.arte.tv/api/player/v2/config/de/100605-013-A',
        'only_matching': True,
    }]
    @staticmethod
    def _extract_urls(webpage):
        return [url for _, url in re.findall(
            r'<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?arte\.tv/player/v\d+/index\.php\?.*?\bjson_url=.+?)\1',
            webpage)]
    def _real_extract(self, url):
        qs = parse_qs(url)
        json_url = qs['json_url'][0]
@@ -217,44 +239,36 @@ class ArteTVPlaylistIE(ArteTVBaseIE):
    _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>RC-\d{6})' % ArteTVBaseIE._ARTE_LANGUAGES
    _TESTS = [{
        'url': 'https://www.arte.tv/en/videos/RC-016954/earn-a-living/',
-        'info_dict': {
+        'only_matching': True,
            'id': 'RC-016954',
            'title': 'Earn a Living',
            'description': 'md5:d322c55011514b3a7241f7fb80d494c2',
        },
        'playlist_mincount': 6,
    }, {
        'url': 'https://www.arte.tv/pl/videos/RC-014123/arte-reportage/',
-        'only_matching': True,
+        'playlist_mincount': 100,
        'info_dict': {
            'description': 'md5:84e7bf1feda248bc325ebfac818c476e',
            'id': 'RC-014123',
            'title': 'ARTE Reportage - najlepsze reportaże',
        },
    }]
    def _real_extract(self, url):
-        lang, playlist_id = self._match_valid_url(url).groups()
+        lang, playlist_id = self._match_valid_url(url).group('lang', 'id')
-        collection = self._download_json(
+        playlist = self._download_json(
-            '%s/collectionData/%s/%s?source=videos'
+            f'{self._API_BASE}/playlist/{lang}/{playlist_id}', playlist_id)['data']['attributes']
-            % (self._API_BASE, lang, playlist_id), playlist_id)
+
-        entries = []
+        entries = [{
-        for video in collection['videos']:
+            '_type': 'url_transparent',
-            if not isinstance(video, dict):
+            'url': video['config']['url'],
-                continue
+            'ie_key': ArteTVIE.ie_key(),
-            video_url = url_or_none(video.get('url')) or url_or_none(video.get('jsonUrl'))
+            'id': video.get('providerId'),
-            if not video_url:
+            'title': video.get('title'),
-                continue
+            'alt_title': video.get('subtitle'),
-            video_id = video.get('programId')
+            'thumbnail': url_or_none(traverse_obj(video, ('mainImage', 'url'))),
-            entries.append({
+            'duration': int_or_none(traverse_obj(video, ('duration', 'seconds'))),
-                '_type': 'url_transparent',
+        } for video in traverse_obj(playlist, ('items', lambda _, v: v['config']['url']))]
-                'url': video_url,
+
-                'id': video_id,
+        return self.playlist_result(entries, playlist_id,
-                'title': video.get('title'),
+                                    traverse_obj(playlist, ('metadata', 'title')),
-                'alt_title': video.get('subtitle'),
+                                    traverse_obj(playlist, ('metadata', 'description')))
                'thumbnail': url_or_none(try_get(video, lambda x: x['mainImage']['url'], compat_str)),
                'duration': int_or_none(video.get('durationSeconds')),
                'view_count': int_or_none(video.get('views')),
                'ie_key': ArteTVIE.ie_key(),
            })
        title = collection.get('title')
        description = collection.get('shortDescription') or collection.get('teaserText')
        return self.playlist_result(entries, playlist_id, title, description)
 class ArteTVCategoryIE(ArteTVBaseIE):
@@ -267,14 +281,13 @@ class ArteTVCategoryIE(ArteTVBaseIE):
            'description': 'Investigative documentary series, geopolitical analysis, and international commentary',
        },
        'playlist_mincount': 13,
-    },
+    }]
    ]
    @classmethod
    def suitable(cls, url):
        return (
            not any(ie.suitable(url) for ie in (ArteTVIE, ArteTVPlaylistIE, ))
-            and super(ArteTVCategoryIE, cls).suitable(url))
+            and super().suitable(url))
    def _real_extract(self, url):
        lang, playlist_id = self._match_valid_url(url).groups()
@@ -1,24 +1,33 @@
 from .common import InfoExtractor
-from ..utils import (
+from ..utils import clean_html, float_or_none, traverse_obj, unescapeHTML
    clean_html,
    float_or_none,
 )
 class AudioBoomIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?audioboom\.com/(?:boos|posts)/(?P<id>[0-9]+)'
    _TESTS = [{
        'url': 'https://audioboom.com/posts/7398103-asim-chaudhry',
-        'md5': '7b00192e593ff227e6a315486979a42d',
+        'md5': '4d68be11c9f9daf3dab0778ad1e010c3',
        'info_dict': {
            'id': '7398103',
            'ext': 'mp3',
            'title': 'Asim Chaudhry',
-            'description': 'md5:2f3fef17dacc2595b5362e1d7d3602fc',
+            'description': 'md5:0ed714ae0e81e5d9119cac2f618ad679',
            'duration': 4000.99,
            'uploader': 'Sue Perkins: An hour or so with...',
            'uploader_url': r're:https?://(?:www\.)?audioboom\.com/channel/perkins',
        }
    }, {  # Direct mp3-file link
        'url': 'https://audioboom.com/posts/8128496.mp3',
        'md5': 'e329edf304d450def95c7f86a9165ee1',
        'info_dict': {
            'id': '8128496',
            'ext': 'mp3',
            'title': 'TCRNo8 / DAILY 03 - In Control',
            'description': 'md5:44665f142db74858dfa21c5b34787948',
            'duration': 1689.7,
            'uploader': 'Lost Dot Podcast: The Trans Pyrenees and Transcontinental Race',
            'uploader_url': r're:https?://(?:www\.)?audioboom\.com/channels/5003904',
        }
    }, {
        'url': 'https://audioboom.com/posts/4279833-3-09-2016-czaban-hour-3?t=0',
        'only_matching': True,
@@ -26,45 +35,23 @@ class AudioBoomIE(InfoExtractor):
    def _real_extract(self, url):
        video_id = self._match_id(url)
        webpage = self._download_webpage(f'https://audioboom.com/posts/{video_id}', video_id)
-        webpage = self._download_webpage(url, video_id)
+        clip_store = self._search_json(
-
+            r'data-react-class="V5DetailPagePlayer"\s*data-react-props=["\']',
-        clip = None
+            webpage, 'clip store', video_id, fatal=False, transform_source=unescapeHTML)
-
+        clip = traverse_obj(clip_store, ('clips', 0), expected_type=dict) or {}
        clip_store = self._parse_json(
            self._html_search_regex(
                r'data-new-clip-store=(["\'])(?P<json>{.+?})\1',
                webpage, 'clip store', default='{}', group='json'),
            video_id, fatal=False)
        if clip_store:
            clips = clip_store.get('clips')
            if clips and isinstance(clips, list) and isinstance(clips[0], dict):
                clip = clips[0]
        def from_clip(field):
            if clip:
                return clip.get(field)
        audio_url = from_clip('clipURLPriorToLoading') or self._og_search_property(
            'audio', webpage, 'audio url')
        title = from_clip('title') or self._html_search_meta(
            ['og:title', 'og:audio:title', 'audio_title'], webpage)
        description = from_clip('description') or clean_html(from_clip('formattedDescription')) or self._og_search_description(webpage)
        duration = float_or_none(from_clip('duration') or self._html_search_meta(
            'weibo:audio:duration', webpage))
        uploader = from_clip('author') or self._html_search_meta(
            ['og:audio:artist', 'twitter:audio:artist_name', 'audio_artist'], webpage, 'uploader')
        uploader_url = from_clip('author_url') or self._html_search_meta(
            'audioboo:channel', webpage, 'uploader url')
        return {
            'id': video_id,
-            'url': audio_url,
+            'url': clip.get('clipURLPriorToLoading') or self._og_search_property('audio', webpage, 'audio url'),
-            'title': title,
+            'title': clip.get('title') or self._html_search_meta(['og:title', 'og:audio:title', 'audio_title'], webpage),
-            'description': description,
+            'description': (clip.get('description') or clean_html(clip.get('formattedDescription'))
-            'duration': duration,
+                            or self._og_search_description(webpage)),
-            'uploader': uploader,
+            'duration': float_or_none(clip.get('duration') or self._html_search_meta('weibo:audio:duration', webpage)),
-            'uploader_url': uploader_url,
+            'uploader': clip.get('author') or self._html_search_meta(
                ['og:audio:artist', 'twitter:audio:artist_name', 'audio_artist'], webpage, 'uploader'),
            'uploader_url': clip.get('author_url') or self._html_search_regex(
                r'<div class="avatar flex-shrink-0">\s*<a href="(?P<uploader_url>http[^"]+)"',
                webpage, 'uploader url', fatal=False),
        }
@@ -5,23 +5,24 @@ import time
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
    KNOWN_EXTENSIONS,
    ExtractorError,
    float_or_none,
    int_or_none,
    KNOWN_EXTENSIONS,
    parse_filesize,
    str_or_none,
    try_get,
    update_url_query,
    unified_strdate,
    unified_timestamp,
    update_url_query,
    url_or_none,
    urljoin,
 )
 class BandcampIE(InfoExtractor):
-    _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?P<uploader>[^/]+)\.bandcamp\.com/track/(?P<id>[^/?#&]+)'
    _EMBED_REGEX = [r'<meta property="og:url"[^>]*?content="(?P<url>.*?bandcamp\.com.*?)"']
    _TESTS = [{
        'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
        'md5': 'c557841d5e50261777a6585648adf439',
@@ -84,7 +85,7 @@ class BandcampIE(InfoExtractor):
            attr + ' data', group=2), video_id, fatal=fatal)
    def _real_extract(self, url):
-        title = self._match_id(url)
+        title, uploader = self._match_valid_url(url).group('id', 'uploader')
        webpage = self._download_webpage(url, title)
        tralbum = self._extract_data_attr(webpage, title)
        thumbnail = self._og_search_thumbnail(webpage)
@@ -196,6 +197,8 @@ class BandcampIE(InfoExtractor):
            'title': title,
            'thumbnail': thumbnail,
            'uploader': artist,
            'uploader_id': uploader,
            'uploader_url': f'https://{uploader}.bandcamp.com',
            'timestamp': timestamp,
            'release_timestamp': unified_timestamp(tralbum.get('album_release_date')),
            'duration': duration,
@@ -46,6 +46,7 @@ class BBCCoUkIE(InfoExtractor):
                        )
                        (?P<id>%s)(?!/(?:episodes|broadcasts|clips))
                    ''' % _ID_REGEX
    _EMBED_REGEX = [r'setPlaylist\("(?P<url>https?://www\.bbc\.co\.uk/iplayer/[^/]+/[\da-z]{8})"\)']
    _LOGIN_URL = 'https://account.bbc.com/signin'
    _NETRC_MACHINE = 'bbc'
@@ -1231,7 +1232,7 @@ class BBCIE(BBCCoUkIE):
                                          (lambda x: x['data']['blocks'],
                                           lambda x: x['data']['content']['model']['blocks'],),
                                          list) or []):
-                        if block.get('type') != 'media':
+                        if block.get('type') not in ['media', 'video']:
                            continue
                        parse_media(block.get('model'))
            return self.playlist_result(
@@ -0,0 +1,70 @@
 from .common import InfoExtractor
 from ..utils import float_or_none, mimetype2ext, traverse_obj
 class BerufeTVIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?web\.arbeitsagentur\.de/berufetv/[^?#]+/film;filmId=(?P<id>[\w-]+)'
    _TESTS = [{
        'url': 'https://web.arbeitsagentur.de/berufetv/studienberufe/wirtschaftswissenschaften/wirtschaftswissenschaften-volkswirtschaft/film;filmId=DvKC3DUpMKvUZ_6fEnfg3u',
        'md5': '041b6432ec8e6838f84a5c30f31cc795',
        'info_dict': {
            'id': 'DvKC3DUpMKvUZ_6fEnfg3u',
            'ext': 'mp4',
            'title': 'Volkswirtschaftslehre',
            'description': 'md5:6bd87d0c63163480a6489a37526ee1c1',
            'categories': ['Studien&shy;beruf'],
            'tags': ['Studienfilm'],
            'duration': 602.440,
            'thumbnail': r're:^https://asset-out-cdn\.video-cdn\.net/private/videos/DvKC3DUpMKvUZ_6fEnfg3u/thumbnails/793063\?quality=thumbnail&__token__=[^\s]+$',
        }
    }]
    def _real_extract(self, url):
        video_id = self._match_id(url)
        movie_metadata = self._download_json(
            'https://rest.arbeitsagentur.de/infosysbub/berufetv/pc/v1/film-metadata',
            video_id, 'Downloading JSON metadata',
            headers={'X-API-Key': '79089773-4892-4386-86e6-e8503669f426'}, fatal=False)
        meta = traverse_obj(
            movie_metadata, ('metadaten', lambda _, i: video_id == i['miId']),
            get_all=False, default={})
        video = self._download_json(
            f'https://d.video-cdn.net/play/player/8YRzUk6pTzmBdrsLe9Y88W/video/{video_id}',
            video_id, 'Downloading video JSON')
        formats, subtitles = [], {}
        for key, source in video['videoSources']['html'].items():
            if key == 'auto':
                fmts, subs = self._extract_m3u8_formats_and_subtitles(source[0]['source'], video_id)
                formats += fmts
                subtitles = subs
            else:
                formats.append({
                    'url': source[0]['source'],
                    'ext': mimetype2ext(source[0]['mimeType']),
                    'format_id': key,
                })
        for track in video.get('videoTracks') or []:
            if track.get('type') != 'SUBTITLES':
                continue
            subtitles.setdefault(track['language'], []).append({
                'url': track['source'],
                'name': track.get('label'),
                'ext': 'vtt'
            })
        return {
            'id': video_id,
            'title': meta.get('titel') or traverse_obj(video, ('videoMetaData', 'title')),
            'description': meta.get('beschreibung'),
            'thumbnail': meta.get('thumbnail') or f'https://asset-out-cdn.video-cdn.net/private/videos/{video_id}/thumbnails/active',
            'duration': float_or_none(video.get('duration'), scale=1000),
            'categories': [meta['kategorie']] if meta.get('kategorie') else None,
            'tags': meta.get('themengebiete'),
            'subtitles': subtitles,
            'formats': formats,
        }
@@ -2,8 +2,9 @@ import base64
 import hashlib
 import itertools
 import functools
 import re
 import math
 import re
 import urllib
 from .common import InfoExtractor, SearchInfoExtractor
 from ..compat import (
@@ -13,23 +14,24 @@ from ..compat import (
 )
 from ..utils import (
    ExtractorError,
    InAdvancePagedList,
    OnDemandPagedList,
    filter_dict,
    int_or_none,
    float_or_none,
    int_or_none,
    mimetype2ext,
    parse_count,
    parse_iso8601,
    qualities,
    traverse_obj,
    parse_count,
    smuggle_url,
    srt_subtitles_timecode,
    str_or_none,
    strip_jsonp,
    traverse_obj,
    unified_timestamp,
    unsmuggle_url,
    urlencode_postdata,
    url_or_none,
    OnDemandPagedList
 )
@@ -218,6 +220,9 @@ class BiliBiliIE(InfoExtractor):
        durl = traverse_obj(video_info, ('dash', 'video'))
        audios = traverse_obj(video_info, ('dash', 'audio')) or []
        flac_audio = traverse_obj(video_info, ('dash', 'flac', 'audio'))
        if flac_audio:
            audios.append(flac_audio)
        entries = []
        RENDITIONS = ('qn=80&quality=80&type=', 'quality=2&type=mp4')
@@ -502,39 +507,135 @@ class BiliBiliBangumiIE(InfoExtractor):
            season_info.get('bangumi_title'), season_info.get('evaluate'))
-class BilibiliChannelIE(InfoExtractor):
+class BilibiliSpaceBaseIE(InfoExtractor):
-    _VALID_URL = r'https?://space.bilibili\.com/(?P<id>\d+)'
+    def _extract_playlist(self, fetch_page, get_metadata, get_entries):
-    _API_URL = "https://api.bilibili.com/x/space/arc/search?mid=%s&pn=%d&jsonp=jsonp"
+        first_page = fetch_page(0)
        metadata = get_metadata(first_page)
        paged_list = InAdvancePagedList(
            lambda idx: get_entries(fetch_page(idx) if idx else first_page),
            metadata['page_count'], metadata['page_size'])
        return metadata, paged_list
 class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)(?P<video>/video)?/?(?:[?#]|$)'
    _TESTS = [{
        'url': 'https://space.bilibili.com/3985676/video',
-        'info_dict': {},
+        'info_dict': {
-        'playlist_mincount': 112,
+            'id': '3985676',
        },
        'playlist_mincount': 178,
    }]
-    def _entries(self, list_id):
+    def _real_extract(self, url):
-        count, max_count = 0, None
+        playlist_id, is_video_url = self._match_valid_url(url).group('id', 'video')
        if not is_video_url:
            self.to_screen('A channel URL was given. Only the channel\'s videos will be downloaded. '
                           'To download audios, add a "/audio" to the URL')
-        for page_num in itertools.count(1):
+        def fetch_page(page_idx):
-            data = self._download_json(
+            try:
-                self._API_URL % (list_id, page_num), list_id, note=f'Downloading page {page_num}')['data']
+                response = self._download_json('https://api.bilibili.com/x/space/arc/search',
                                               playlist_id, note=f'Downloading page {page_idx}',
                                               query={'mid': playlist_id, 'pn': page_idx + 1, 'jsonp': 'jsonp'})
            except ExtractorError as e:
                if isinstance(e.cause, urllib.error.HTTPError) and e.cause.code == 412:
                    raise ExtractorError(
                        'Request is blocked by server (412), please add cookies, wait and try later.', expected=True)
                raise
            if response['code'] == -401:
                raise ExtractorError(
                    'Request is blocked by server (401), please add cookies, wait and try later.', expected=True)
            return response['data']
-            max_count = max_count or traverse_obj(data, ('page', 'count'))
+        def get_metadata(page_data):
            page_size = page_data['page']['ps']
            entry_count = page_data['page']['count']
            return {
                'page_count': math.ceil(entry_count / page_size),
                'page_size': page_size,
            }
-            entries = traverse_obj(data, ('list', 'vlist'))
+        def get_entries(page_data):
-            if not entries:
+            for entry in traverse_obj(page_data, ('list', 'vlist')) or []:
-                return
+                yield self.url_result(f'https://www.bilibili.com/video/{entry["bvid"]}', BiliBiliIE, entry['bvid'])
            for entry in entries:
                yield self.url_result(
                    'https://www.bilibili.com/video/%s' % entry['bvid'],
                    BiliBiliIE.ie_key(), entry['bvid'])
-            count += len(entries)
+        metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
-            if max_count and count >= max_count:
+        return self.playlist_result(paged_list, playlist_id)
-                return
+
 class BilibiliSpaceAudioIE(BilibiliSpaceBaseIE):
    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)/audio'
    _TESTS = [{
        'url': 'https://space.bilibili.com/3985676/audio',
        'info_dict': {
            'id': '3985676',
        },
        'playlist_mincount': 1,
    }]
    def _real_extract(self, url):
-        list_id = self._match_id(url)
+        playlist_id = self._match_id(url)
-        return self.playlist_result(self._entries(list_id), list_id)
+
        def fetch_page(page_idx):
            return self._download_json(
                'https://api.bilibili.com/audio/music-service/web/song/upper', playlist_id,
                note=f'Downloading page {page_idx}',
                query={'uid': playlist_id, 'pn': page_idx + 1, 'ps': 30, 'order': 1, 'jsonp': 'jsonp'})['data']
        def get_metadata(page_data):
            return {
                'page_count': page_data['pageCount'],
                'page_size': page_data['pageSize'],
            }
        def get_entries(page_data):
            for entry in page_data.get('data', []):
                yield self.url_result(f'https://www.bilibili.com/audio/au{entry["id"]}', BilibiliAudioIE, entry['id'])
        metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
        return self.playlist_result(paged_list, playlist_id)
 class BilibiliSpacePlaylistIE(BilibiliSpaceBaseIE):
    _VALID_URL = r'https?://space.bilibili\.com/(?P<mid>\d+)/channel/collectiondetail\?sid=(?P<sid>\d+)'
    _TESTS = [{
        'url': 'https://space.bilibili.com/2142762/channel/collectiondetail?sid=57445',
        'info_dict': {
            'id': '2142762_57445',
            'title': '《底特律 变人》'
        },
        'playlist_mincount': 31,
    }]
    def _real_extract(self, url):
        mid, sid = self._match_valid_url(url).group('mid', 'sid')
        playlist_id = f'{mid}_{sid}'
        def fetch_page(page_idx):
            return self._download_json(
                'https://api.bilibili.com/x/polymer/space/seasons_archives_list',
                playlist_id, note=f'Downloading page {page_idx}',
                query={'mid': mid, 'season_id': sid, 'page_num': page_idx + 1, 'page_size': 30})['data']
        def get_metadata(page_data):
            page_size = page_data['page']['page_size']
            entry_count = page_data['page']['total']
            return {
                'page_count': math.ceil(entry_count / page_size),
                'page_size': page_size,
                'title': traverse_obj(page_data, ('meta', 'name'))
            }
        def get_entries(page_data):
            for entry in page_data.get('archives', []):
                yield self.url_result(f'https://www.bilibili.com/video/{entry["bvid"]}',
                                      BiliBiliIE, entry['bvid'])
        metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
        return self.playlist_result(paged_list, playlist_id, metadata['title'])
 class BilibiliCategoryIE(InfoExtractor):
@@ -620,14 +721,15 @@ class BiliBiliSearchIE(SearchInfoExtractor):
                    'keyword': query,
                    'page': page_num,
                    'context': '',
                    'order': 'pubdate',
                    'duration': 0,
                    'tids_2': '',
                    '__refresh__': 'true',
                    'search_type': 'video',
                    'tids': 0,
                    'highlight': 1,
-                })['data'].get('result') or []
+                })['data'].get('result')
            if not videos:
                break
            for video in videos:
                yield self.url_result(video['arcurl'], 'BiliBili', str(video['aid']))
@@ -905,7 +1007,7 @@ class BiliIntlBaseIE(InfoExtractor):
 class BiliIntlIE(BiliIntlBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?bili(?:bili\.tv|intl\.com)/(?:[a-z]{2}/)?(play/(?P<season_id>\d+)/(?P<ep_id>\d+)|video/(?P<aid>\d+))'
+    _VALID_URL = r'https?://(?:www\.)?bili(?:bili\.tv|intl\.com)/(?:[a-zA-Z]{2}/)?(play/(?P<season_id>\d+)/(?P<ep_id>\d+)|video/(?P<aid>\d+))'
    _TESTS = [{
        # Bstation page
        'url': 'https://www.bilibili.tv/en/play/34613/341736',
@@ -948,6 +1050,10 @@ class BiliIntlIE(BiliIntlBaseIE):
        # No language in URL
        'url': 'https://www.bilibili.tv/video/2019955076',
        'only_matching': True,
    }, {
        # Uppercase language in URL
        'url': 'https://www.bilibili.tv/EN/video/2019955076',
        'only_matching': True,
    }]
    def _real_extract(self, url):
@@ -971,7 +1077,7 @@ class BiliIntlIE(BiliIntlBaseIE):
 class BiliIntlSeriesIE(BiliIntlBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?bili(?:bili\.tv|intl\.com)/(?:[a-z]{2}/)?play/(?P<id>\d+)$'
+    _VALID_URL = r'https?://(?:www\.)?bili(?:bili\.tv|intl\.com)/(?:[a-zA-Z]{2}/)?play/(?P<id>\d+)/?(?:[?#]|$)'
    _TESTS = [{
        'url': 'https://www.bilibili.tv/en/play/34613',
        'playlist_mincount': 15,
@@ -989,6 +1095,9 @@ class BiliIntlSeriesIE(BiliIntlBaseIE):
    }, {
        'url': 'https://www.biliintl.com/en/play/34613',
        'only_matching': True,
    }, {
        'url': 'https://www.biliintl.com/EN/play/34613',
        'only_matching': True,
    }]
    def _entries(self, series_id):
@@ -13,6 +13,7 @@ from ..utils import (
 class BitChuteIE(InfoExtractor):
    _VALID_URL = r'https?://(?:www\.)?bitchute\.com/(?:video|embed|torrent/[^/]+)/(?P<id>[^/?#&]+)'
    _EMBED_REGEX = [rf'<(?:script|iframe)[^>]+\bsrc=(["\'])(?P<url>{_VALID_URL})']
    _TESTS = [{
        'url': 'https://www.bitchute.com/video/UGlrF9o9b-Q/',
        'md5': '7e427d7ed7af5a75b5855705ec750e2b',
@@ -33,14 +34,6 @@ class BitChuteIE(InfoExtractor):
        'only_matching': True,
    }]
    @staticmethod
    def _extract_urls(webpage):
        return [
            mobj.group('url')
            for mobj in re.finditer(
                r'<(?:script|iframe)[^>]+\bsrc=(["\'])(?P<url>%s)' % BitChuteIE._VALID_URL,
                webpage)]
    def _real_extract(self, url):
        video_id = self._match_id(url)
@@ -72,10 +65,12 @@ class BitChuteIE(InfoExtractor):
                error = self._html_search_regex(r'<h1 class="page-title">([^<]+)</h1>', webpage, 'error', default='Cannot find video')
                if error == 'Video Unavailable':
                    raise GeoRestrictedError(error)
-                raise ExtractorError(error)
+                raise ExtractorError(error, expected=True)
            formats = entries[0]['formats']
        self._check_formats(formats, video_id)
        if not formats:
            raise self.raise_no_formats('Video is unavailable', expected=True, video_id=video_id)
        self._sort_formats(formats)
        description = self._html_search_regex(
@@ -1,5 +1,3 @@
 import re
 from ..utils import (
    mimetype2ext,
    parse_duration,
@@ -13,7 +11,7 @@ from .common import InfoExtractor
 class BloggerIE(InfoExtractor):
    IE_NAME = 'blogger.com'
    _VALID_URL = r'https?://(?:www\.)?blogger\.com/video\.g\?token=(?P<id>.+)'
-    _VALID_EMBED = r'''<iframe[^>]+src=["']((?:https?:)?//(?:www\.)?blogger\.com/video\.g\?token=[^"']+)["']'''
+    _EMBED_REGEX = [r'''<iframe[^>]+src=["'](?P<url>(?:https?:)?//(?:www\.)?blogger\.com/video\.g\?token=[^"']+)["']''']
    _TESTS = [{
        'url': 'https://www.blogger.com/video.g?token=AD6v5dzEe9hfcARr5Hlq1WTkYy6t-fXH3BBahVhGvVHe5szdEUBEloSEDSTA8-b111089KbfWuBvTN7fnbxMtymsHhXAXwVvyzHH4Qch2cfLQdGxKQrrEuFpC1amSl_9GuLWODjPgw',
        'md5': 'f1bc19b6ea1b0fd1d81e84ca9ec467ac',
@@ -26,10 +24,6 @@ class BloggerIE(InfoExtractor):
        }
    }]
    @staticmethod
    def _extract_urls(webpage):
        return re.findall(BloggerIE._VALID_EMBED, webpage)
    def _real_extract(self, url):
        token_id = self._match_id(url)
        webpage = self._download_webpage(url, token_id)
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							`# Empty file needed to make devscripts.utils properly importable from outside`
		`@@ -0,0 +1 @@`
							<?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>