.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -2,11 +2,13 @@ name: Broken site support
 description: Report issue with yt-dlp on a supported site
 labels: [triage, site-bug]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-        > [!IMPORTANT]
+      description: Fill all fields even if you think it is irrelevant for the issue
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -22,7 +24,9 @@ body:
           required: true
         - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
@@ -43,8 +47,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -76,3 +78,11 @@ body:
       render: shell
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -2,11 +2,13 @@ name: Site support request
 description: Request support for a new site
 labels: [triage, site-request]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-        > [!IMPORTANT]
+      description: Fill all fields even if you think it is irrelevant for the issue
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -22,7 +24,9 @@ body:
           required: true
         - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input
@@ -55,8 +59,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -88,3 +90,11 @@ body:
       render: shell
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -1,12 +1,14 @@
 name: Site feature request
-description: Request new functionality for a site supported by yt-dlp
+description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-        > [!IMPORTANT]
+      description: Fill all fields even if you think it is irrelevant for the issue
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -20,7 +22,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
@@ -51,8 +55,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -84,3 +86,11 @@ body:
       render: shell
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -2,11 +2,13 @@ name: Core bug report
 description: Report a bug unrelated to any particular site or extractor
 labels: [triage, bug]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-        > [!IMPORTANT]
+      description: Fill all fields even if you think it is irrelevant for the issue
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -18,7 +20,13 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+          required: true
+        - label: I've 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 [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description
@@ -32,8 +40,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -65,3 +71,11 @@ body:
       render: shell
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -1,12 +1,14 @@
 name: Feature request
-description: Request a new feature unrelated to any particular site or extractor
+description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-        > [!IMPORTANT]
+      description: Fill all fields even if you think it is irrelevant for the issue
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
@@ -20,7 +22,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description
@@ -34,8 +38,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
         - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
@@ -63,3 +65,11 @@ body:
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>
       render: shell
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.

.github/ISSUE_TEMPLATE/6_question.yml

@@ -1,12 +1,14 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: |
+      label: DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE
-        > [!IMPORTANT]
+      description: Fill all fields even if you think it is irrelevant for the issue
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
   - type: markdown
     attributes:
       value: |
@@ -26,7 +28,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: question
@@ -40,8 +44,6 @@ body:
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
         - label: "If using API, add `'verbose': True` to `YoutubeDL` params instead"
@@ -69,3 +71,11 @@ body:
         [youtube] Extracting URL: https://www.youtube.com/watch?v=BaW_jenozKc
         <more lines>
       render: shell
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -18,7 +18,9 @@ body:
           required: true
         - label: I've checked that all URLs and arguments with special characters are [properly quoted or escaped](https://github.com/yt-dlp/yt-dlp/wiki/FAQ#video-url-contains-an-ampersand--and-im-getting-some-strange-output-1-2839-or-v-is-not-recognized-as-an-internal-or-external-command)
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -18,7 +18,9 @@ body:
           required: true
         - label: I've checked that none of provided URLs [violate any copyrights](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy) or contain any [DRM](https://en.wikipedia.org/wiki/Digital_rights_management) to the best of my knowledge
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -1,5 +1,5 @@
 name: Site feature request
-description: Request new functionality for a site supported by yt-dlp
+description: Request a new functionality for a supported site
 labels: [triage, site-enhancement]
 body:
   %(no_skip)s
@@ -16,7 +16,9 @@ body:
           required: true
         - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -14,7 +14,13 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar issues **including closed ones**. DO NOT post duplicates
+        - label: I've checked that all provided URLs are playable in a browser with the same IP and same login details
+          required: true
+        - label: I've 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 [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -1,5 +1,5 @@
 name: Feature request
-description: Request a new feature unrelated to any particular site or extractor
+description: Request a new functionality unrelated to any particular site or extractor
 labels: [triage, enhancement]
 body:
   %(no_skip)s
@@ -16,7 +16,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar requests **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar issues **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -1,5 +1,5 @@
 name: Ask question
-description: Ask a question about using yt-dlp
+description: Ask yt-dlp related question
 labels: [question]
 body:
   %(no_skip)s
@@ -22,7 +22,9 @@ body:
           required: true
         - label: I've verified that I have **updated yt-dlp to nightly or master** ([update instructions](https://github.com/yt-dlp/yt-dlp#update-channels))
           required: true
-        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar questions **including closed ones**. DO NOT post duplicates
+        - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766) and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=) for similar questions **including closed ones**. DO NOT post duplicates
+          required: true
+        - label: I've read the [guidelines for opening an issue](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#opening-an-issue)
           required: true
   - type: textarea
     id: question

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,14 @@
-<!--
 **IMPORTANT**: PRs without the template will be CLOSED
 
-    Due to the high volume of pull requests, it may be a while before your PR is reviewed.
-    Please try to keep your pull request focused on a single bugfix or new feature.
-    Pull requests with a vast scope and/or very large diff will take much longer to review.
-    It is recommended for new contributors to stick to smaller pull requests, so you can receive much more immediate feedback as you familiarize yourself with the codebase.
-
-    PLEASE AVOID FORCE-PUSHING after opening a PR, as it makes reviewing more difficult.
--->
-
 ### Description of your *pull request* and other information
 
-ADD DETAILED DESCRIPTION HERE
+<!--
+
+Explanation of your *pull request* in arbitrary form goes here. Please **make sure the description explains the purpose and effect** of your *pull request* and is worded well enough to be understood. Provide as much **context and examples** as possible
+
+-->
+
+ADD DESCRIPTION HERE
 
 Fixes #
 
@@ -19,22 +16,24 @@ Fixes #
 <details open><summary>Template</summary> <!-- OPEN is intentional -->
 
 <!--
+
 # PLEASE FOLLOW THE GUIDE BELOW
 
 - You will be asked some questions, please read them **carefully** and answer honestly
 - Put an `x` into all the boxes `[ ]` relevant to your *pull request* (like [x])
-    - Use *Preview* tab to see what your *pull request* will actually look like
+- Use *Preview* tab to see how your *pull request* will actually look like
+
 -->
 
 ### Before submitting a *pull request* make sure you have:
 - [ ] At least skimmed through [contributing guidelines](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#developer-instructions) including [yt-dlp coding conventions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#yt-dlp-coding-conventions)
 - [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests
 
-### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:
+### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check all of the following options that apply:
-- [ ] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)
+- [ ] I am the original author of this code and I am willing to release it under [Unlicense](http://unlicense.org/)
-- [ ] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
+- [ ] I am not the original author of this code but it is in public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
 
-### What is the purpose of your *pull request*? Check those that apply and remove the others:
+### What is the purpose of your *pull request*?
 - [ ] Fix or improvement to an extractor (Make sure to add/update tests)
 - [ ] New extractor ([Piracy websites will not be accepted](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy))
 - [ ] Core bug fix/improvement

.github/workflows/build.yml

@@ -192,7 +192,7 @@ jobs:
         with:
           path: ./repo
       - name: Virtualized Install, Prepare & Build
-        uses: yt-dlp/run-on-arch-action@v3
+        uses: yt-dlp/run-on-arch-action@v2
         with:
           # Ref: https://github.com/uraimo/run-on-arch-action/issues/55
           env: |
@@ -411,7 +411,7 @@ jobs:
         run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
           python devscripts/install_deps.py -o --include build
           python devscripts/install_deps.py --include curl-cffi
-          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-6.13.0-py3-none-any.whl"
+          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-6.11.1-py3-none-any.whl"
 
       - name: Prepare
         run: |
@@ -460,7 +460,7 @@ jobs:
         run: |
           python devscripts/install_deps.py -o --include build
           python devscripts/install_deps.py
-          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-6.13.0-py3-none-any.whl"
+          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-6.11.1-py3-none-any.whl"
 
       - name: Prepare
         run: |

.github/workflows/codeql.yml

@@ -33,7 +33,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -60,6 +60,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/core.yml

@@ -6,7 +6,7 @@ on:
       - devscripts/**
       - test/**
       - yt_dlp/**.py
-      - '!yt_dlp/extractor/**.py'
+      - '!yt_dlp/extractor/*.py'
       - yt_dlp/extractor/__init__.py
       - yt_dlp/extractor/common.py
       - yt_dlp/extractor/extractors.py
@@ -16,7 +16,7 @@ on:
       - devscripts/**
       - test/**
       - yt_dlp/**.py
-      - '!yt_dlp/extractor/**.py'
+      - '!yt_dlp/extractor/*.py'
       - yt_dlp/extractor/__init__.py
       - yt_dlp/extractor/common.py
       - yt_dlp/extractor/extractors.py

.github/workflows/quick-test.yml

@@ -38,5 +38,3 @@ jobs:
       run: ruff check --output-format github .
     - name: Run autopep8
       run: autopep8 --diff .
-    - name: Check file mode
-      run: git ls-files --format="%(objectmode) %(path)" yt_dlp/ | ( ! grep -v "^100644" )

.gitignore

@@ -92,7 +92,6 @@ updates_key.pem
 *.class
 *.isorted
 *.stackdump
-uv.lock
 
 # Generated
 AUTHORS

CONTRIBUTORS

@@ -713,60 +713,3 @@ xiaomac
 wesson09
 Crypto90
 MutantPiggieGolem1
-Sanceilaks
-Strkmn
-0x9fff00
-4ft35t
-7x11x13
-b5i
-cotko
-d3d9
-Dioarya
-finch71
-hexahigh
-InvalidUsernameException
-jixunmoe
-knackku
-krandor
-kvk-2015
-lonble
-msm595
-n10dollar
-NecroRomnt
-pjrobertson
-subsense
-test20140
-arantius
-entourage8
-lfavole
-mp3butcher
-slipinthedove
-YoshiTabletopGamer
-Arc8ne
-benfaerber
-chrisellsworth
-fries1234
-Kenshin9977
-MichaelDeBoey
-msikma
-pedro
-pferreir
-red-acid
-refack
-rysson
-somini
-thedenv
-vallovic
-arabcoders
-mireq
-mlabeeb03
-1271
-CasperMcFadden95
-Kicer86
-Kiritomo
-leeblackc
-meGAmeS1
-NeonMan
-pj47x
-troex
-WouterGordts

Changelog.md

@@ -4,342 +4,6 @@
 # To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
 -->
 
-### 2025.04.30
-
-#### Important changes
-- **New option `--preset-alias`/`-t` has been added**
-This provides convenient predefined aliases for common use cases. Available presets include `mp4`, `mp3`, `mkv`, `aac`, and `sleep`. See [the README](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#preset-aliases) for more details.
-
-#### Core changes
-- [Add `--preset-alias` option](https://github.com/yt-dlp/yt-dlp/commit/88eb1e7a9a2720ac89d653c0d0e40292388823bb) ([#12839](https://github.com/yt-dlp/yt-dlp/issues/12839)) by [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
-- **utils**
-    - `_yield_json_ld`: [Make function less fatal](https://github.com/yt-dlp/yt-dlp/commit/45f01de00e1bc076b7f676a669736326178647b1) ([#12855](https://github.com/yt-dlp/yt-dlp/issues/12855)) by [seproDev](https://github.com/seproDev)
-    - `url_or_none`: [Support WebSocket URLs](https://github.com/yt-dlp/yt-dlp/commit/a473e592337edb8ca40cde52c1fcaee261c54df9) ([#12848](https://github.com/yt-dlp/yt-dlp/issues/12848)) by [doe1080](https://github.com/doe1080)
-
-#### Extractor changes
-- **abematv**: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/f5736bb35bde62348caebf7b188668655e316deb) ([#12859](https://github.com/yt-dlp/yt-dlp/issues/12859)) by [Kiritomo](https://github.com/Kiritomo)
-- **atresplayer**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/839d64325356310e6de6cd9cad28fb546619ca63) ([#11424](https://github.com/yt-dlp/yt-dlp/issues/11424)) by [meGAmeS1](https://github.com/meGAmeS1), [seproDev](https://github.com/seproDev)
-- **bpb**: [Fix formats extraction](https://github.com/yt-dlp/yt-dlp/commit/80736b9c90818adee933a155079b8535bc06819f) ([#13015](https://github.com/yt-dlp/yt-dlp/issues/13015)) by [bashonly](https://github.com/bashonly)
-- **cda**: [Fix formats extraction](https://github.com/yt-dlp/yt-dlp/commit/9032f981362ea0be90626fab51ec37934feded6d) ([#12975](https://github.com/yt-dlp/yt-dlp/issues/12975)) by [bashonly](https://github.com/bashonly)
-- **cdafolder**: [Extend `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/cb271d445bc2d866c9a3404b1d8f59bcb77447df) ([#12919](https://github.com/yt-dlp/yt-dlp/issues/12919)) by [fireattack](https://github.com/fireattack), [Kicer86](https://github.com/Kicer86)
-- **crowdbunker**: [Make format extraction non-fatal](https://github.com/yt-dlp/yt-dlp/commit/4ebf41309d04a6e196944f1c0f5f0154cff0055a) ([#12836](https://github.com/yt-dlp/yt-dlp/issues/12836)) by [seproDev](https://github.com/seproDev)
-- **dacast**: [Support tokenized URLs](https://github.com/yt-dlp/yt-dlp/commit/e7e3b7a55c456da4a5a812b4fefce4dce8e6a616) ([#12979](https://github.com/yt-dlp/yt-dlp/issues/12979)) by [bashonly](https://github.com/bashonly)
-- **dzen.ru**: [Rework extractors](https://github.com/yt-dlp/yt-dlp/commit/a3f2b54c2535d862de6efa9cfaa6ca9a2b2f7dd6) ([#12852](https://github.com/yt-dlp/yt-dlp/issues/12852)) by [seproDev](https://github.com/seproDev)
-- **generic**: [Fix MPD extraction for `file://` URLs](https://github.com/yt-dlp/yt-dlp/commit/34a061a295d156934417c67ee98070b94943006b) ([#12978](https://github.com/yt-dlp/yt-dlp/issues/12978)) by [bashonly](https://github.com/bashonly)
-- **getcourseru**: [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/741fd809bc4d301c19b53877692ae510334a6750) ([#12943](https://github.com/yt-dlp/yt-dlp/issues/12943)) by [troex](https://github.com/troex)
-- **ivoox**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/7faa18b83dcfc74a1a1e2034e6b0369c495ca645) ([#12768](https://github.com/yt-dlp/yt-dlp/issues/12768)) by [NeonMan](https://github.com/NeonMan), [seproDev](https://github.com/seproDev)
-- **kika**: [Add playlist extractor](https://github.com/yt-dlp/yt-dlp/commit/3c1c75ecb8ab352f422b59af46fff2be992e4115) ([#12832](https://github.com/yt-dlp/yt-dlp/issues/12832)) by [1100101](https://github.com/1100101)
-- **linkedin**
-    - [Support feed URLs](https://github.com/yt-dlp/yt-dlp/commit/73a26f9ee68610e33c0b4407b77355f2ab7afd0e) ([#12927](https://github.com/yt-dlp/yt-dlp/issues/12927)) by [seproDev](https://github.com/seproDev)
-    - events: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/b37ff4de5baf4e4e70c6a0ec34e136a279ad20af) ([#12926](https://github.com/yt-dlp/yt-dlp/issues/12926)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-- **loco**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f5a37ea40e20865b976ffeeff13eeae60292eb23) ([#12934](https://github.com/yt-dlp/yt-dlp/issues/12934)) by [seproDev](https://github.com/seproDev)
-- **lrtradio**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/74e90dd9b8f9c1a5c48a2515126654f4d398d687) ([#12801](https://github.com/yt-dlp/yt-dlp/issues/12801)) by [subrat-lima](https://github.com/subrat-lima)
-- **manyvids**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/77aa15e98f34c4ad425aabf39dd1ee37b48f772c) ([#10907](https://github.com/yt-dlp/yt-dlp/issues/10907)) by [pj47x](https://github.com/pj47x)
-- **mixcloud**: [Refactor extractor](https://github.com/yt-dlp/yt-dlp/commit/db6d1f145ad583e0220637726029f8f2fa6200a0) ([#12830](https://github.com/yt-dlp/yt-dlp/issues/12830)) by [seproDev](https://github.com/seproDev), [WouterGordts](https://github.com/WouterGordts)
-- **mlbtv**: [Fix device ID caching](https://github.com/yt-dlp/yt-dlp/commit/36da6360e130197df927ee93409519ce3f4075f5) ([#12980](https://github.com/yt-dlp/yt-dlp/issues/12980)) by [bashonly](https://github.com/bashonly)
-- **niconico**
-    - [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/25cd7c1ecbb6cbf21dd3a6e59608e4af94715ecc) ([#13008](https://github.com/yt-dlp/yt-dlp/issues/13008)) by [doe1080](https://github.com/doe1080)
-    - [Remove DMC formats support](https://github.com/yt-dlp/yt-dlp/commit/7d05aa99c65352feae1cd9a3ff8784b64bfe382a) ([#12916](https://github.com/yt-dlp/yt-dlp/issues/12916)) by [doe1080](https://github.com/doe1080)
-    - live: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/1d45e30537bf83e069184a440703e4c43b2e0198) ([#12809](https://github.com/yt-dlp/yt-dlp/issues/12809)) by [Snack-X](https://github.com/Snack-X)
-- **panopto**: [Fix formats extraction](https://github.com/yt-dlp/yt-dlp/commit/9d26daa04ad5108257bc5e30f7f040c7f1fe7a5a) ([#12925](https://github.com/yt-dlp/yt-dlp/issues/12925)) by [seproDev](https://github.com/seproDev)
-- **parti**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/425017531fbc3369becb5a44013e26f26efabf45) ([#12769](https://github.com/yt-dlp/yt-dlp/issues/12769)) by [benfaerber](https://github.com/benfaerber)
-- **raiplay**: [Fix DRM detection](https://github.com/yt-dlp/yt-dlp/commit/dce82346245e35a46fda836ca2089805d2347935) ([#12971](https://github.com/yt-dlp/yt-dlp/issues/12971)) by [DTrombett](https://github.com/DTrombett)
-- **reddit**: [Support `--ignore-no-formats-error`](https://github.com/yt-dlp/yt-dlp/commit/28f04e8a5e383ff531db646190b4be45554610d6) ([#12993](https://github.com/yt-dlp/yt-dlp/issues/12993)) by [bashonly](https://github.com/bashonly)
-- **royalive**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/e1847535e28788414a25546a45bebcada2f34558) ([#12817](https://github.com/yt-dlp/yt-dlp/issues/12817)) by [CasperMcFadden95](https://github.com/CasperMcFadden95)
-- **rtve**: [Rework extractors](https://github.com/yt-dlp/yt-dlp/commit/f07ee91c71920ab1187a7ea756720e81aa406a9d) ([#10388](https://github.com/yt-dlp/yt-dlp/issues/10388)) by [meGAmeS1](https://github.com/meGAmeS1), [seproDev](https://github.com/seproDev)
-- **rumble**: [Improve format extraction](https://github.com/yt-dlp/yt-dlp/commit/58d0c83457b93b3c9a81eb6bc5a4c65f25e949df) ([#12838](https://github.com/yt-dlp/yt-dlp/issues/12838)) by [seproDev](https://github.com/seproDev)
-- **tokfmpodcast**: [Fix formats extraction](https://github.com/yt-dlp/yt-dlp/commit/91832111a12d87499294a0f430829b8c2254c339) ([#12842](https://github.com/yt-dlp/yt-dlp/issues/12842)) by [selfisekai](https://github.com/selfisekai)
-- **tv2dk**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/a3e91df30a45943f40759d2c1e0b6c2ca4b2a263) ([#12945](https://github.com/yt-dlp/yt-dlp/issues/12945)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-- **tvp**: vod: [Improve `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/4e69a626cce51428bc1d66dc606a56d9498b03a5) ([#12923](https://github.com/yt-dlp/yt-dlp/issues/12923)) by [seproDev](https://github.com/seproDev)
-- **tvw**: tvchannels: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/ed8ad1b4d6b9d7a1426ff5192ff924f3371e4721) ([#12721](https://github.com/yt-dlp/yt-dlp/issues/12721)) by [fries1234](https://github.com/fries1234)
-- **twitcasting**: [Fix livestream extraction](https://github.com/yt-dlp/yt-dlp/commit/de271a06fd6d20d4f55597ff7f90e4d913de0a52) ([#12977](https://github.com/yt-dlp/yt-dlp/issues/12977)) by [bashonly](https://github.com/bashonly)
-- **twitch**: clips: [Fix uploader metadata extraction](https://github.com/yt-dlp/yt-dlp/commit/1ae6bff564a65af41e94f1a4727892471ecdd05a) ([#13022](https://github.com/yt-dlp/yt-dlp/issues/13022)) by [1271](https://github.com/1271)
-- **twitter**
-    - [Fix extraction when logged-in](https://github.com/yt-dlp/yt-dlp/commit/1cf39ddf3d10b6512daa7dd139e5f6c0dc548bbc) ([#13024](https://github.com/yt-dlp/yt-dlp/issues/13024)) by [bashonly](https://github.com/bashonly)
-    - spaces: [Improve metadata extraction](https://github.com/yt-dlp/yt-dlp/commit/70599e53b736bb75922b737e6e0d4f76e419bb20) ([#12911](https://github.com/yt-dlp/yt-dlp/issues/12911)) by [doe1080](https://github.com/doe1080)
-- **vimeo**: [Extract from mobile API](https://github.com/yt-dlp/yt-dlp/commit/22ac81a0692019ac833cf282e4ef99718e9ef3fa) ([#13034](https://github.com/yt-dlp/yt-dlp/issues/13034)) by [bashonly](https://github.com/bashonly)
-- **vk**
-    - [Fix chapters extraction](https://github.com/yt-dlp/yt-dlp/commit/5361a7c6e2933c919716e0cb1e3116c28c40419f) ([#12821](https://github.com/yt-dlp/yt-dlp/issues/12821)) by [seproDev](https://github.com/seproDev)
-    - [Fix uploader extraction](https://github.com/yt-dlp/yt-dlp/commit/2381881fe58a723853350a6ab750a5efc9f10c85) ([#12985](https://github.com/yt-dlp/yt-dlp/issues/12985)) by [seproDev](https://github.com/seproDev)
-- **youtube**
-    - [Add context to video request rate limit error](https://github.com/yt-dlp/yt-dlp/commit/26feac3dd142536ad08ad1ed731378cb88e63602) ([#12958](https://github.com/yt-dlp/yt-dlp/issues/12958)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Add extractor arg to skip "initial_data" request](https://github.com/yt-dlp/yt-dlp/commit/ed6c6d7eefbc78fa72e4e60ad6edaa3ee2acc715) ([#12865](https://github.com/yt-dlp/yt-dlp/issues/12865)) by [leeblackc](https://github.com/leeblackc)
-    - [Add warning on video captcha challenge](https://github.com/yt-dlp/yt-dlp/commit/f484c51599a6cd01eb078ea7dc9bbba942967774) ([#12939](https://github.com/yt-dlp/yt-dlp/issues/12939)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Cache signature timestamps](https://github.com/yt-dlp/yt-dlp/commit/61c9a938b390b8334ee3a879fe2d93f714e30138) ([#13047](https://github.com/yt-dlp/yt-dlp/issues/13047)) by [bashonly](https://github.com/bashonly)
-    - [Detect and warn when account cookies are rotated](https://github.com/yt-dlp/yt-dlp/commit/8cb08028f5be2acb9835ce1670b196b9b077052f) ([#13014](https://github.com/yt-dlp/yt-dlp/issues/13014)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Detect player JS variants for any locale](https://github.com/yt-dlp/yt-dlp/commit/c2d6659d1069f8cff97e1fd61d1c59e949e1e63d) ([#13003](https://github.com/yt-dlp/yt-dlp/issues/13003)) by [bashonly](https://github.com/bashonly)
-    - [Do not strictly deprioritize `missing_pot` formats](https://github.com/yt-dlp/yt-dlp/commit/74fc2ae12c24eb6b4e02c6360c89bd05f3c8f740) ([#13061](https://github.com/yt-dlp/yt-dlp/issues/13061)) by [bashonly](https://github.com/bashonly)
-    - [Improve warning for SABR-only/SSAP player responses](https://github.com/yt-dlp/yt-dlp/commit/fd8394bc50301ac5e930aa65aa71ab1b8372b8ab) ([#13049](https://github.com/yt-dlp/yt-dlp/issues/13049)) by [bashonly](https://github.com/bashonly)
-    - tab: [Extract continuation from empty page](https://github.com/yt-dlp/yt-dlp/commit/72ba4879304c2082fecbb472e6cc05ee2d154a3b) ([#12938](https://github.com/yt-dlp/yt-dlp/issues/12938)) by [coletdjnz](https://github.com/coletdjnz)
-- **zdf**: [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/7be14109a6bd493a2e881da4f9e30adaf3e7e5d5) ([#12779](https://github.com/yt-dlp/yt-dlp/issues/12779)) by [bashonly](https://github.com/bashonly), [InvalidUsernameException](https://github.com/InvalidUsernameException)
-
-#### Downloader changes
-- **niconicodmc**: [Remove downloader](https://github.com/yt-dlp/yt-dlp/commit/8d127b18f81131453eaba05d3bb810d9b73adb75) ([#12916](https://github.com/yt-dlp/yt-dlp/issues/12916)) by [doe1080](https://github.com/doe1080)
-
-#### Networking changes
-- [Add PATCH request shortcut](https://github.com/yt-dlp/yt-dlp/commit/ceab4d5ed63a1f135a1816fe967c9d9a1ec7e6e8) ([#12884](https://github.com/yt-dlp/yt-dlp/issues/12884)) by [doe1080](https://github.com/doe1080)
-
-#### Misc. changes
-- **ci**: [Add file mode test to code check](https://github.com/yt-dlp/yt-dlp/commit/3690e91265d1d0bbeffaf6a9b8cc9baded1367bd) ([#13036](https://github.com/yt-dlp/yt-dlp/issues/13036)) by [Grub4K](https://github.com/Grub4K)
-- **cleanup**: Miscellaneous: [505b400](https://github.com/yt-dlp/yt-dlp/commit/505b400795af557bdcfd9d4fa7e9133b26ef431c) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-
-### 2025.03.31
-
-#### Core changes
-- [Add `--compat-options 2024`](https://github.com/yt-dlp/yt-dlp/commit/22e34adbd741e1c7072015debd615dc3fb71c401) ([#12789](https://github.com/yt-dlp/yt-dlp/issues/12789)) by [seproDev](https://github.com/seproDev)
-
-#### Extractor changes
-- **francaisfacile**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/bb321cfdc3fd4400598ddb12a15862bc2ac8fc10) ([#12787](https://github.com/yt-dlp/yt-dlp/issues/12787)) by [mlabeeb03](https://github.com/mlabeeb03)
-- **generic**: [Validate response before checking m3u8 live status](https://github.com/yt-dlp/yt-dlp/commit/9a1ec1d36e172d252714cef712a6d091e0a0c4f2) ([#12784](https://github.com/yt-dlp/yt-dlp/issues/12784)) by [bashonly](https://github.com/bashonly)
-- **microsoftlearnepisode**: [Extract more formats](https://github.com/yt-dlp/yt-dlp/commit/d63696f23a341ee36a3237ccb5d5e14b34c2c579) ([#12799](https://github.com/yt-dlp/yt-dlp/issues/12799)) by [bashonly](https://github.com/bashonly)
-- **mlbtv**: [Fix radio-only extraction](https://github.com/yt-dlp/yt-dlp/commit/f033d86b96b36f8c5289dd7c3304f42d4d9f6ff4) ([#12792](https://github.com/yt-dlp/yt-dlp/issues/12792)) by [bashonly](https://github.com/bashonly)
-- **on24**: [Support `mainEvent` URLs](https://github.com/yt-dlp/yt-dlp/commit/e465b078ead75472fcb7b86f6ccaf2b5d3bc4c21) ([#12800](https://github.com/yt-dlp/yt-dlp/issues/12800)) by [bashonly](https://github.com/bashonly)
-- **sbs**: [Fix subtitles extraction](https://github.com/yt-dlp/yt-dlp/commit/29560359120f28adaaac67c86fa8442eb72daa0d) ([#12785](https://github.com/yt-dlp/yt-dlp/issues/12785)) by [bashonly](https://github.com/bashonly)
-- **stvr**: [Rename extractor from RTVS to STVR](https://github.com/yt-dlp/yt-dlp/commit/5fc521cbd0ce7b2410d0935369558838728e205d) ([#12788](https://github.com/yt-dlp/yt-dlp/issues/12788)) by [mireq](https://github.com/mireq)
-- **twitch**: clips: [Extract portrait formats](https://github.com/yt-dlp/yt-dlp/commit/61046c31612b30c749cbdae934b7fe26abe659d7) ([#12763](https://github.com/yt-dlp/yt-dlp/issues/12763)) by [DmitryScaletta](https://github.com/DmitryScaletta)
-- **youtube**
-    - [Add `player_js_variant` extractor-arg](https://github.com/yt-dlp/yt-dlp/commit/07f04005e40ebdb368920c511e36e98af0077ed3) ([#12767](https://github.com/yt-dlp/yt-dlp/issues/12767)) by [bashonly](https://github.com/bashonly)
-    - tab: [Fix playlist continuation extraction](https://github.com/yt-dlp/yt-dlp/commit/6a6d97b2cbc78f818de05cc96edcdcfd52caa259) ([#12777](https://github.com/yt-dlp/yt-dlp/issues/12777)) by [coletdjnz](https://github.com/coletdjnz)
-
-#### Misc. changes
-- **cleanup**: Miscellaneous: [5e457af](https://github.com/yt-dlp/yt-dlp/commit/5e457af57fae9645b1b8fa0ed689229c8fb9656b) by [bashonly](https://github.com/bashonly)
-
-### 2025.03.27
-
-#### Core changes
-- **jsinterp**: [Fix nested attributes and object extraction](https://github.com/yt-dlp/yt-dlp/commit/a8b9ff3c2a0ae25735e580173becc78545b92572) ([#12760](https://github.com/yt-dlp/yt-dlp/issues/12760)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-
-#### Extractor changes
-- **youtube**: [Make signature and nsig extraction more robust](https://github.com/yt-dlp/yt-dlp/commit/48be862b32648bff5b3e553e40fca4dcc6e88b28) ([#12761](https://github.com/yt-dlp/yt-dlp/issues/12761)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-
-### 2025.03.26
-
-#### Extractor changes
-- **youtube**
-    - [Fix signature and nsig extraction for player `4fcd6e4a`](https://github.com/yt-dlp/yt-dlp/commit/a550dfc904a02843a26369ae50dbb7c0febfb30e) ([#12748](https://github.com/yt-dlp/yt-dlp/issues/12748)) by [seproDev](https://github.com/seproDev)
-    - [Only cache nsig code on successful decoding](https://github.com/yt-dlp/yt-dlp/commit/ecee97b4fa90d51c48f9154c3a6d5a8ffe46cd5c) ([#12750](https://github.com/yt-dlp/yt-dlp/issues/12750)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-
-### 2025.03.25
-
-#### Core changes
-- [Fix attribute error on failed VT init](https://github.com/yt-dlp/yt-dlp/commit/b872ffec50fd50f790a5a490e006a369a28a3df3) ([#12696](https://github.com/yt-dlp/yt-dlp/issues/12696)) by [Grub4K](https://github.com/Grub4K)
-- **utils**: `js_to_json`: [Make function less fatal](https://github.com/yt-dlp/yt-dlp/commit/9491b44032b330e05bd5eaa546187005d1e8538e) ([#12715](https://github.com/yt-dlp/yt-dlp/issues/12715)) by [seproDev](https://github.com/seproDev)
-
-#### Extractor changes
-- [Fix sorting of HLS audio formats by `GROUP-ID`](https://github.com/yt-dlp/yt-dlp/commit/86ab79e1a5182092321102adf6ca34195803b878) ([#12714](https://github.com/yt-dlp/yt-dlp/issues/12714)) by [bashonly](https://github.com/bashonly)
-- **17live**: vod: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/3396eb50dcd245b49c0f4aecd6e80ec914095d16) ([#12723](https://github.com/yt-dlp/yt-dlp/issues/12723)) by [subrat-lima](https://github.com/subrat-lima)
-- **9now.com.au**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/9d5e6de2e7a47226d1f72c713ad45c88ba01db68) ([#12702](https://github.com/yt-dlp/yt-dlp/issues/12702)) by [bashonly](https://github.com/bashonly)
-- **chzzk**: video: [Fix extraction](https://github.com/yt-dlp/yt-dlp/commit/e2dfccaf808b406d5bcb7dd04ae9ce420752dd6f) ([#12692](https://github.com/yt-dlp/yt-dlp/issues/12692)) by [bashonly](https://github.com/bashonly), [dirkf](https://github.com/dirkf)
-- **deezer**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/be5af3f9e91747768c2b41157851bfbe14c663f7) ([#12704](https://github.com/yt-dlp/yt-dlp/issues/12704)) by [seproDev](https://github.com/seproDev)
-- **generic**: [Fix MPD base URL parsing](https://github.com/yt-dlp/yt-dlp/commit/5086d4aed6aeb3908c62f49e2d8f74cc0cb05110) ([#12718](https://github.com/yt-dlp/yt-dlp/issues/12718)) by [fireattack](https://github.com/fireattack)
-- **streaks**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/801afeac91f97dc0b58cd39cc7e8c50f619dc4e1) ([#12679](https://github.com/yt-dlp/yt-dlp/issues/12679)) by [doe1080](https://github.com/doe1080)
-- **tver**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/66e0bab814e4a52ef3e12d81123ad992a29df50e) ([#12659](https://github.com/yt-dlp/yt-dlp/issues/12659)) by [arabcoders](https://github.com/arabcoders), [bashonly](https://github.com/bashonly)
-- **viki**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/fe4f14b8369038e7c58f7de546d76de1ce3a91ce) ([#12703](https://github.com/yt-dlp/yt-dlp/issues/12703)) by [seproDev](https://github.com/seproDev)
-- **vrsquare**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/b7fbb5a0a16a8e8d3e29c29e26ebed677d0d6ea3) ([#12515](https://github.com/yt-dlp/yt-dlp/issues/12515)) by [doe1080](https://github.com/doe1080)
-- **youtube**
-    - [Fix PhantomJS nsig fallback](https://github.com/yt-dlp/yt-dlp/commit/4054a2b623bd1e277b49d2e9abc3d112a4b1c7be) ([#12728](https://github.com/yt-dlp/yt-dlp/issues/12728)) by [bashonly](https://github.com/bashonly)
-    - [Fix signature and nsig extraction for player `363db69b`](https://github.com/yt-dlp/yt-dlp/commit/b9c979461b244713bf42691a5bc02834e2ba4b2c) ([#12725](https://github.com/yt-dlp/yt-dlp/issues/12725)) by [bashonly](https://github.com/bashonly)
-
-#### Networking changes
-- **Request Handler**: curl_cffi: [Support `curl_cffi` 0.10.x](https://github.com/yt-dlp/yt-dlp/commit/9bf23902ceb948b9685ce1dab575491571720fc6) ([#12670](https://github.com/yt-dlp/yt-dlp/issues/12670)) by [Grub4K](https://github.com/Grub4K)
-
-#### Misc. changes
-- **cleanup**: Miscellaneous: [9dde546](https://github.com/yt-dlp/yt-dlp/commit/9dde546e7ee3e1515d88ee3af08b099351455dc0) by [seproDev](https://github.com/seproDev)
-
-### 2025.03.21
-
-#### Core changes
-- [Fix external downloader availability when using `--ffmpeg-location`](https://github.com/yt-dlp/yt-dlp/commit/9f77e04c76e36e1cbbf49bc9eb385fa6ef804b67) ([#12318](https://github.com/yt-dlp/yt-dlp/issues/12318)) by [Kenshin9977](https://github.com/Kenshin9977)
-- [Load plugins on demand](https://github.com/yt-dlp/yt-dlp/commit/4445f37a7a66b248dbd8376c43137e6e441f138e) ([#11305](https://github.com/yt-dlp/yt-dlp/issues/11305)) by [coletdjnz](https://github.com/coletdjnz), [Grub4K](https://github.com/Grub4K), [pukkandan](https://github.com/pukkandan) (With fixes in [c034d65](https://github.com/yt-dlp/yt-dlp/commit/c034d655487be668222ef9476a16f374584e49a7))
-- [Support emitting ConEmu progress codes](https://github.com/yt-dlp/yt-dlp/commit/f7a1f2d8132967a62b0f6d5665c6d2dde2d42c09) ([#10649](https://github.com/yt-dlp/yt-dlp/issues/10649)) by [Grub4K](https://github.com/Grub4K)
-
-#### Extractor changes
-- **azmedien**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/26a502fc727d0e91b2db6bf4a112823bcc672e85) ([#12375](https://github.com/yt-dlp/yt-dlp/issues/12375)) by [goggle](https://github.com/goggle)
-- **bilibiliplaylist**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f5fb2229e66cf59d5bf16065bc041b42a28354a0) ([#12690](https://github.com/yt-dlp/yt-dlp/issues/12690)) by [bashonly](https://github.com/bashonly)
-- **bunnycdn**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/3a1583ca75fb523cbad0e5e174387ea7b477d175) ([#11586](https://github.com/yt-dlp/yt-dlp/issues/11586)) by [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
-- **canalsurmas**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/01a8be4c23f186329d85f9c78db34a55f3294ac5) ([#12497](https://github.com/yt-dlp/yt-dlp/issues/12497)) by [Arc8ne](https://github.com/Arc8ne)
-- **cda**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/be0d819e1103195043f6743650781f0d4d343f6d) ([#12552](https://github.com/yt-dlp/yt-dlp/issues/12552)) by [rysson](https://github.com/rysson)
-- **cultureunplugged**: [Extend `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/3042afb5fe342d3a00de76704cd7de611acc350e) ([#12486](https://github.com/yt-dlp/yt-dlp/issues/12486)) by [seproDev](https://github.com/seproDev)
-- **dailymotion**: [Improve embed detection](https://github.com/yt-dlp/yt-dlp/commit/ad60137c141efa5023fbc0ac8579eaefe8b3d8cc) ([#12464](https://github.com/yt-dlp/yt-dlp/issues/12464)) by [seproDev](https://github.com/seproDev)
-- **gem.cbc.ca**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/eb1417786a3027b1e7290ec37ef6aaece50ebed0) ([#12414](https://github.com/yt-dlp/yt-dlp/issues/12414)) by [bashonly](https://github.com/bashonly)
-- **globo**: [Fix subtitles extraction](https://github.com/yt-dlp/yt-dlp/commit/0e1697232fcbba7551f983fd1ba93bb445cbb08b) ([#12270](https://github.com/yt-dlp/yt-dlp/issues/12270)) by [pedro](https://github.com/pedro)
-- **instagram**
-    - [Add `app_id` extractor-arg](https://github.com/yt-dlp/yt-dlp/commit/a90641c8363fa0c10800b36eb6b01ee22d3a9409) ([#12359](https://github.com/yt-dlp/yt-dlp/issues/12359)) by [chrisellsworth](https://github.com/chrisellsworth)
-    - [Fix extraction of older private posts](https://github.com/yt-dlp/yt-dlp/commit/a59abe0636dc49b22a67246afe35613571b86f05) ([#12451](https://github.com/yt-dlp/yt-dlp/issues/12451)) by [bashonly](https://github.com/bashonly)
-    - [Improve error handling](https://github.com/yt-dlp/yt-dlp/commit/480125560a3b9972d29ae0da850aba8109e6bd41) ([#12410](https://github.com/yt-dlp/yt-dlp/issues/12410)) by [bashonly](https://github.com/bashonly)
-    - story: [Support `--no-playlist`](https://github.com/yt-dlp/yt-dlp/commit/65c3c58c0a67463a150920203cec929045c95a24) ([#12397](https://github.com/yt-dlp/yt-dlp/issues/12397)) by [fireattack](https://github.com/fireattack)
-- **jamendo**: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/89a68c4857ddbaf937ff22f12648baaf6b5af840) ([#12622](https://github.com/yt-dlp/yt-dlp/issues/12622)) by [bashonly](https://github.com/bashonly), [JChris246](https://github.com/JChris246)
-- **ketnet**: [Remove extractor](https://github.com/yt-dlp/yt-dlp/commit/bbada3ec0779422cde34f1ce3dcf595da463b493) ([#12628](https://github.com/yt-dlp/yt-dlp/issues/12628)) by [MichaelDeBoey](https://github.com/MichaelDeBoey)
-- **lbry**
-    - [Make m3u8 format extraction non-fatal](https://github.com/yt-dlp/yt-dlp/commit/9807181cfbf87bfa732f415c30412bdbd77cbf81) ([#12463](https://github.com/yt-dlp/yt-dlp/issues/12463)) by [bashonly](https://github.com/bashonly)
-    - [Raise appropriate error for non-media files](https://github.com/yt-dlp/yt-dlp/commit/7126b472601814b7fd8c9de02069e8fff1764891) ([#12462](https://github.com/yt-dlp/yt-dlp/issues/12462)) by [bashonly](https://github.com/bashonly)
-- **loco**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/983095485c731240aae27c950cb8c24a50827b56) ([#12667](https://github.com/yt-dlp/yt-dlp/issues/12667)) by [DTrombett](https://github.com/DTrombett)
-- **magellantv**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/172d5fcd778bf2605db7647ebc56b29ed18d24ac) ([#12505](https://github.com/yt-dlp/yt-dlp/issues/12505)) by [seproDev](https://github.com/seproDev)
-- **mitele**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/7223d29569a48a35ad132a508c115973866838d3) ([#12689](https://github.com/yt-dlp/yt-dlp/issues/12689)) by [bashonly](https://github.com/bashonly)
-- **msn**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/4815dac131d42c51e12c1d05232db0bbbf607329) ([#12513](https://github.com/yt-dlp/yt-dlp/issues/12513)) by [seproDev](https://github.com/seproDev), [thedenv](https://github.com/thedenv)
-- **n1**: [Fix extraction of newer articles](https://github.com/yt-dlp/yt-dlp/commit/9d70abe4de401175cbbaaa36017806f16b2df9af) ([#12514](https://github.com/yt-dlp/yt-dlp/issues/12514)) by [u-spec-png](https://github.com/u-spec-png)
-- **nbcstations**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/ebac65aa9e0bf9a97c24d00f7977900d2577364b) ([#12534](https://github.com/yt-dlp/yt-dlp/issues/12534)) by [refack](https://github.com/refack)
-- **niconico**
-    - [Fix format sorting](https://github.com/yt-dlp/yt-dlp/commit/7508e34f203e97389f1d04db92140b13401dd724) ([#12442](https://github.com/yt-dlp/yt-dlp/issues/12442)) by [xpadev-net](https://github.com/xpadev-net)
-    - live: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/c2e6e1d5f77f3b720a6266f2869eb750d20e5dc1) ([#12419](https://github.com/yt-dlp/yt-dlp/issues/12419)) by [bashonly](https://github.com/bashonly)
-- **openrec**: [Fix `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/17504f253564cfad86244de2b6346d07d2300ca5) ([#12608](https://github.com/yt-dlp/yt-dlp/issues/12608)) by [fireattack](https://github.com/fireattack)
-- **pinterest**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/bd0a66816934de70312eea1e71c59c13b401dc3a) ([#12538](https://github.com/yt-dlp/yt-dlp/issues/12538)) by [mikf](https://github.com/mikf)
-- **playsuisse**: [Fix login support](https://github.com/yt-dlp/yt-dlp/commit/6933f5670cea9c3e2fb16c1caa1eda54d13122c5) ([#12444](https://github.com/yt-dlp/yt-dlp/issues/12444)) by [bashonly](https://github.com/bashonly)
-- **reddit**: [Truncate title](https://github.com/yt-dlp/yt-dlp/commit/d9a53cc1e6fd912daf500ca4f19e9ca88994dbf9) ([#12567](https://github.com/yt-dlp/yt-dlp/issues/12567)) by [seproDev](https://github.com/seproDev)
-- **rtp**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/8eb9c1bf3b9908cca22ef043602aa24fb9f352c6) ([#11638](https://github.com/yt-dlp/yt-dlp/issues/11638)) by [pferreir](https://github.com/pferreir), [red-acid](https://github.com/red-acid), [seproDev](https://github.com/seproDev), [somini](https://github.com/somini), [vallovic](https://github.com/vallovic)
-- **softwhiteunderbelly**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/652827d5a076c9483c36654ad2cf3fe46219baf4) ([#12281](https://github.com/yt-dlp/yt-dlp/issues/12281)) by [benfaerber](https://github.com/benfaerber)
-- **soop**: [Fix timestamp extraction](https://github.com/yt-dlp/yt-dlp/commit/8305df00012ff8138a6ff95279d06b54ac607f63) ([#12609](https://github.com/yt-dlp/yt-dlp/issues/12609)) by [msikma](https://github.com/msikma)
-- **soundcloud**
-    - [Extract tags](https://github.com/yt-dlp/yt-dlp/commit/9deed13d7cce6d3647379e50589c92de89227509) ([#12420](https://github.com/yt-dlp/yt-dlp/issues/12420)) by [bashonly](https://github.com/bashonly)
-    - [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/6deeda5c11f34f613724fa0627879f0d607ba1b4) ([#12447](https://github.com/yt-dlp/yt-dlp/issues/12447)) by [bashonly](https://github.com/bashonly)
-- **tiktok**
-    - [Improve error handling](https://github.com/yt-dlp/yt-dlp/commit/99ea2978757a431eeb2a265b3395ccbe4ce202cf) ([#12445](https://github.com/yt-dlp/yt-dlp/issues/12445)) by [bashonly](https://github.com/bashonly)
-    - [Truncate title](https://github.com/yt-dlp/yt-dlp/commit/83b119dadb0f267f1fb66bf7ed74c097349de79e) ([#12566](https://github.com/yt-dlp/yt-dlp/issues/12566)) by [seproDev](https://github.com/seproDev)
-- **tv8.it**: [Add live and playlist extractors](https://github.com/yt-dlp/yt-dlp/commit/2ee3a0aff9be2be3bea60640d3d8a0febaf0acb6) ([#12569](https://github.com/yt-dlp/yt-dlp/issues/12569)) by [DTrombett](https://github.com/DTrombett)
-- **tvw**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/42b7440963866e31ff84a5b89030d1c596fa2e6e) ([#12271](https://github.com/yt-dlp/yt-dlp/issues/12271)) by [fries1234](https://github.com/fries1234)
-- **twitter**
-    - [Fix syndication token generation](https://github.com/yt-dlp/yt-dlp/commit/b8b47547049f5ebc3dd680fc7de70ed0ca9c0d70) ([#12537](https://github.com/yt-dlp/yt-dlp/issues/12537)) by [bashonly](https://github.com/bashonly)
-    - [Truncate title](https://github.com/yt-dlp/yt-dlp/commit/06f6de78db2eceeabd062ab1a3023e0ff9d4df53) ([#12560](https://github.com/yt-dlp/yt-dlp/issues/12560)) by [seproDev](https://github.com/seproDev)
-- **vk**: [Improve metadata extraction](https://github.com/yt-dlp/yt-dlp/commit/05c8023a27dd37c49163c0498bf98e3e3c1cb4b9) ([#12510](https://github.com/yt-dlp/yt-dlp/issues/12510)) by [seproDev](https://github.com/seproDev)
-- **vrtmax**: [Rework extractor](https://github.com/yt-dlp/yt-dlp/commit/df9ebeec00d658693252978d1ffb885e67aa6ab6) ([#12479](https://github.com/yt-dlp/yt-dlp/issues/12479)) by [bergoid](https://github.com/bergoid), [MichaelDeBoey](https://github.com/MichaelDeBoey), [seproDev](https://github.com/seproDev)
-- **weibo**: [Support playlists](https://github.com/yt-dlp/yt-dlp/commit/0bb39788626002a8a67e925580227952c563c8b9) ([#12284](https://github.com/yt-dlp/yt-dlp/issues/12284)) by [4ft35t](https://github.com/4ft35t)
-- **wsj**: [Support opinion URLs and impersonation](https://github.com/yt-dlp/yt-dlp/commit/7f3006eb0c0659982bb956d71b0bc806bcb0a5f2) ([#12431](https://github.com/yt-dlp/yt-dlp/issues/12431)) by [refack](https://github.com/refack)
-- **youtube**
-    - [Fix nsig and signature extraction for player `643afba4`](https://github.com/yt-dlp/yt-dlp/commit/9b868518a15599f3d7ef5a1c730dda164c30da9b) ([#12684](https://github.com/yt-dlp/yt-dlp/issues/12684)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
-    - [Player client maintenance](https://github.com/yt-dlp/yt-dlp/commit/3380febe9984c21c79c3147c1d390a4cf339bc4c) ([#12603](https://github.com/yt-dlp/yt-dlp/issues/12603)) by [seproDev](https://github.com/seproDev)
-    - [Split into package](https://github.com/yt-dlp/yt-dlp/commit/4432a9390c79253ac830702b226d2e558b636725) ([#12557](https://github.com/yt-dlp/yt-dlp/issues/12557)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Warn on DRM formats](https://github.com/yt-dlp/yt-dlp/commit/e67d786c7cc87bd449d22e0ddef08306891c1173) ([#12593](https://github.com/yt-dlp/yt-dlp/issues/12593)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Warn on missing formats due to SSAP](https://github.com/yt-dlp/yt-dlp/commit/79ec2fdff75c8c1bb89b550266849ad4dec48dd3) ([#12483](https://github.com/yt-dlp/yt-dlp/issues/12483)) by [coletdjnz](https://github.com/coletdjnz)
-
-#### Networking changes
-- [Add `keep_header_casing` extension](https://github.com/yt-dlp/yt-dlp/commit/7d18fed8f1983fe6de4ddc810dfb2761ba5744ac) ([#11652](https://github.com/yt-dlp/yt-dlp/issues/11652)) by [coletdjnz](https://github.com/coletdjnz), [Grub4K](https://github.com/Grub4K)
-- [Always add unsupported suffix on version mismatch](https://github.com/yt-dlp/yt-dlp/commit/95f8df2f796d0048119615200758199aedcd7cf4) ([#12626](https://github.com/yt-dlp/yt-dlp/issues/12626)) by [Grub4K](https://github.com/Grub4K)
-
-#### Misc. changes
-- **cleanup**: Miscellaneous: [f36e4b6](https://github.com/yt-dlp/yt-dlp/commit/f36e4b6e65cb8403791aae2f520697115cb88dec) by [dirkf](https://github.com/dirkf), [gamer191](https://github.com/gamer191), [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
-- **test**: [Show all differences for `expect_value` and `expect_dict`](https://github.com/yt-dlp/yt-dlp/commit/a3e0c7d3b267abdf3933b709704a28d43bb46503) ([#12334](https://github.com/yt-dlp/yt-dlp/issues/12334)) by [Grub4K](https://github.com/Grub4K)
-
-### 2025.02.19
-
-#### Core changes
-- **jsinterp**
-    - [Add `js_number_to_string`](https://github.com/yt-dlp/yt-dlp/commit/0d9f061d38c3a4da61972e2adad317079f2f1c84) ([#12110](https://github.com/yt-dlp/yt-dlp/issues/12110)) by [Grub4K](https://github.com/Grub4K)
-    - [Improve zeroise](https://github.com/yt-dlp/yt-dlp/commit/4ca8c44a073d5aa3a3e3112c35b2b23d6ce25ac6) ([#12313](https://github.com/yt-dlp/yt-dlp/issues/12313)) by [seproDev](https://github.com/seproDev)
-
-#### Extractor changes
-- **acast**: [Support shows.acast.com URLs](https://github.com/yt-dlp/yt-dlp/commit/57c717fee4bfbc9309845bbb48901b72e4b69304) ([#12223](https://github.com/yt-dlp/yt-dlp/issues/12223)) by [barsnick](https://github.com/barsnick)
-- **cwtv**
-    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/18a28514e306e822eab4f3a79c76d515bf076406) ([#12207](https://github.com/yt-dlp/yt-dlp/issues/12207)) by [arantius](https://github.com/arantius)
-    - movie: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/03c3d705778c07739e0034b51490877cffdc0983) ([#12227](https://github.com/yt-dlp/yt-dlp/issues/12227)) by [bashonly](https://github.com/bashonly)
-- **digiview**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/f53553087d3fde9dcd61d6e9f98caf09db1d8ef2) ([#9902](https://github.com/yt-dlp/yt-dlp/issues/9902)) by [lfavole](https://github.com/lfavole)
-- **dropbox**: [Fix extraction](https://github.com/yt-dlp/yt-dlp/commit/861aeec449c8f3c062d962945b234ff0341f61f3) ([#12228](https://github.com/yt-dlp/yt-dlp/issues/12228)) by [bashonly](https://github.com/bashonly)
-- **francetv**
-    - site
-        - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/817483ccc68aed6049ed9c4a2ffae44ca82d2b1c) ([#12236](https://github.com/yt-dlp/yt-dlp/issues/12236)) by [bashonly](https://github.com/bashonly)
-        - [Fix livestream extraction](https://github.com/yt-dlp/yt-dlp/commit/1295bbedd45fa8d9bc3f7a194864ae280297848e) ([#12316](https://github.com/yt-dlp/yt-dlp/issues/12316)) by [bashonly](https://github.com/bashonly)
-- **francetvinfo.fr**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/5c4c2ddfaa47988b4d50c1ad4988badc0b4f30c2) ([#12402](https://github.com/yt-dlp/yt-dlp/issues/12402)) by [bashonly](https://github.com/bashonly)
-- **gem.cbc.ca**: [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/5271ef48c6f61c145e03e18e960995d2e651d205) ([#12404](https://github.com/yt-dlp/yt-dlp/issues/12404)) by [bashonly](https://github.com/bashonly), [dirkf](https://github.com/dirkf)
-- **generic**: [Extract `live_status` for DASH manifest URLs](https://github.com/yt-dlp/yt-dlp/commit/19edaa44fcd375f54e63d6227b092f5252d3e889) ([#12256](https://github.com/yt-dlp/yt-dlp/issues/12256)) by [mp3butcher](https://github.com/mp3butcher)
-- **globo**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f8d0161455f00add65585ca1a476a7b5d56f5f96) ([#11795](https://github.com/yt-dlp/yt-dlp/issues/11795)) by [slipinthedove](https://github.com/slipinthedove), [YoshiTabletopGamer](https://github.com/YoshiTabletopGamer)
-- **goplay**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/d59f14a0a7a8b55e6bf468237def62b73ab4a517) ([#12237](https://github.com/yt-dlp/yt-dlp/issues/12237)) by [alard](https://github.com/alard)
-- **pbs**: [Support www.thirteen.org URLs](https://github.com/yt-dlp/yt-dlp/commit/9fb8ab2ff67fb699f60cce09163a580976e90c0e) ([#11191](https://github.com/yt-dlp/yt-dlp/issues/11191)) by [rohieb](https://github.com/rohieb)
-- **reddit**: [Bypass gated subreddit warning](https://github.com/yt-dlp/yt-dlp/commit/6ca23ffaa4663cb552f937f0b1e9769b66db11bd) ([#12335](https://github.com/yt-dlp/yt-dlp/issues/12335)) by [bashonly](https://github.com/bashonly)
-- **twitter**: [Fix syndication token generation](https://github.com/yt-dlp/yt-dlp/commit/14cd7f3443c6da4d49edaefcc12da9dee86e243e) ([#12107](https://github.com/yt-dlp/yt-dlp/issues/12107)) by [Grub4K](https://github.com/Grub4K), [pjrobertson](https://github.com/pjrobertson)
-- **youtube**
-    - [Retry on more critical requests](https://github.com/yt-dlp/yt-dlp/commit/d48e612609d012abbea3785be4d26d78a014abb2) ([#12339](https://github.com/yt-dlp/yt-dlp/issues/12339)) by [coletdjnz](https://github.com/coletdjnz)
-    - [nsig workaround for `tce` player JS](https://github.com/yt-dlp/yt-dlp/commit/ec17fb16e8d69d4e3e10fb73bf3221be8570dfee) ([#12401](https://github.com/yt-dlp/yt-dlp/issues/12401)) by [bashonly](https://github.com/bashonly)
-- **zdf**: [Extract more metadata](https://github.com/yt-dlp/yt-dlp/commit/241ace4f104d50fdf7638f9203927aefcf57a1f7) ([#9565](https://github.com/yt-dlp/yt-dlp/issues/9565)) by [StefanLobbenmeier](https://github.com/StefanLobbenmeier) (With fixes in [e7882b6](https://github.com/yt-dlp/yt-dlp/commit/e7882b682b959e476d8454911655b3e9b14c79b2) by [bashonly](https://github.com/bashonly))
-
-#### Downloader changes
-- **hls**
-    - [Fix `BYTERANGE` logic](https://github.com/yt-dlp/yt-dlp/commit/10b7ff68e98f17655e31952f6e17120b2d7dda96) ([#11972](https://github.com/yt-dlp/yt-dlp/issues/11972)) by [entourage8](https://github.com/entourage8)
-    - [Support `--write-pages` for m3u8 media playlists](https://github.com/yt-dlp/yt-dlp/commit/be69468752ff598cacee57bb80533deab2367a5d) ([#12333](https://github.com/yt-dlp/yt-dlp/issues/12333)) by [bashonly](https://github.com/bashonly)
-    - [Support `hls_media_playlist_data` format field](https://github.com/yt-dlp/yt-dlp/commit/c987be0acb6872c6561f28aa28171e803393d851) ([#12322](https://github.com/yt-dlp/yt-dlp/issues/12322)) by [bashonly](https://github.com/bashonly)
-
-#### Misc. changes
-- [Improve Issue/PR templates](https://github.com/yt-dlp/yt-dlp/commit/517ddf3c3f12560ab93e3d36244dc82db9f97818) ([#11499](https://github.com/yt-dlp/yt-dlp/issues/11499)) by [seproDev](https://github.com/seproDev) (With fixes in [4ecb833](https://github.com/yt-dlp/yt-dlp/commit/4ecb833472c90e078567b561fb7c089f1aa9587b) by [bashonly](https://github.com/bashonly))
-- **cleanup**: Miscellaneous: [4985a40](https://github.com/yt-dlp/yt-dlp/commit/4985a4041770eaa0016271809a1fd950dc809a55) by [dirkf](https://github.com/dirkf), [Grub4K](https://github.com/Grub4K), [StefanLobbenmeier](https://github.com/StefanLobbenmeier)
-- **docs**: [Add note to `supportedsites.md`](https://github.com/yt-dlp/yt-dlp/commit/01a63629a21781458dcbd38779898e117678f5ff) ([#12382](https://github.com/yt-dlp/yt-dlp/issues/12382)) by [seproDev](https://github.com/seproDev)
-- **test**: download: [Validate and sort info dict fields](https://github.com/yt-dlp/yt-dlp/commit/208163447408c78673b08c172beafe5c310fb167) ([#12299](https://github.com/yt-dlp/yt-dlp/issues/12299)) by [bashonly](https://github.com/bashonly), [pzhlkj6612](https://github.com/pzhlkj6612)
-
-### 2025.01.26
-
-#### Core changes
-- [Fix float comparison values in format filters](https://github.com/yt-dlp/yt-dlp/commit/f7d071e8aa3bf67ed7e0f881e749ca9ab50b3f8f) ([#11880](https://github.com/yt-dlp/yt-dlp/issues/11880)) by [bashonly](https://github.com/bashonly), [Dioarya](https://github.com/Dioarya)
-- **utils**: `sanitize_path`: [Fix some incorrect behavior](https://github.com/yt-dlp/yt-dlp/commit/fc12e724a3b4988cfc467d2981887dde48c26b69) ([#11923](https://github.com/yt-dlp/yt-dlp/issues/11923)) by [Grub4K](https://github.com/Grub4K)
-
-#### Extractor changes
-- **1tv**: [Support sport1tv.ru domain](https://github.com/yt-dlp/yt-dlp/commit/61ae5dc34ac775d6c122575e21ef2153b1273a2b) ([#11889](https://github.com/yt-dlp/yt-dlp/issues/11889)) by [kvk-2015](https://github.com/kvk-2015)
-- **abematv**: [Support season extraction](https://github.com/yt-dlp/yt-dlp/commit/c709cc41cbc16edc846e0a431cfa8508396d4cb6) ([#11771](https://github.com/yt-dlp/yt-dlp/issues/11771)) by [middlingphys](https://github.com/middlingphys)
-- **bilibili**
-    - [Support space `/lists/` URLs](https://github.com/yt-dlp/yt-dlp/commit/465167910407449354eb48e9861efd0819f53eb5) ([#11964](https://github.com/yt-dlp/yt-dlp/issues/11964)) by [c-basalt](https://github.com/c-basalt)
-    - [Support space video list extraction without login](https://github.com/yt-dlp/yt-dlp/commit/78912ed9c81f109169b828c397294a6cf8eacf41) ([#12089](https://github.com/yt-dlp/yt-dlp/issues/12089)) by [grqz](https://github.com/grqz)
-- **bilibilidynamic**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/9676b05715b61c8c5dd5598871e60d8807fb1a86) ([#11838](https://github.com/yt-dlp/yt-dlp/issues/11838)) by [finch71](https://github.com/finch71), [grqz](https://github.com/grqz)
-- **bluesky**: [Prefer source format](https://github.com/yt-dlp/yt-dlp/commit/ccda63934df7de2823f0834218c4254c7c4d2e4c) ([#12154](https://github.com/yt-dlp/yt-dlp/issues/12154)) by [0x9fff00](https://github.com/0x9fff00)
-- **crunchyroll**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/ff44ed53061e065804da6275d182d7928cc03a5e) ([#12195](https://github.com/yt-dlp/yt-dlp/issues/12195)) by [seproDev](https://github.com/seproDev)
-- **dropout**: [Fix extraction](https://github.com/yt-dlp/yt-dlp/commit/164368610456e2d96b279f8b120dea08f7b1d74f) ([#12102](https://github.com/yt-dlp/yt-dlp/issues/12102)) by [bashonly](https://github.com/bashonly)
-- **eggs**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/20c765d02385a105c8ef13b6f7a737491d29c19a) ([#11904](https://github.com/yt-dlp/yt-dlp/issues/11904)) by [seproDev](https://github.com/seproDev), [subsense](https://github.com/subsense)
-- **funimation**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/cdcf1e86726b8fa44f7e7126bbf1c18e1798d25c) ([#12167](https://github.com/yt-dlp/yt-dlp/issues/12167)) by [doe1080](https://github.com/doe1080)
-- **goodgame**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/e7cc02b14d8d323f805d14325a9c95593a170d28) ([#12173](https://github.com/yt-dlp/yt-dlp/issues/12173)) by [NecroRomnt](https://github.com/NecroRomnt)
-- **lbry**: [Support signed URLs](https://github.com/yt-dlp/yt-dlp/commit/de30f652ffb7623500215f5906844f2ae0d92c7b) ([#12138](https://github.com/yt-dlp/yt-dlp/issues/12138)) by [seproDev](https://github.com/seproDev)
-- **naver**: [Fix m3u8 formats extraction](https://github.com/yt-dlp/yt-dlp/commit/b3007c44cdac38187fc6600de76959a7079a44d1) ([#12037](https://github.com/yt-dlp/yt-dlp/issues/12037)) by [kclauhk](https://github.com/kclauhk)
-- **nest**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/1ef3ee7500c4ab8c26f7fdc5b0ad1da4d16eec8e) ([#11747](https://github.com/yt-dlp/yt-dlp/issues/11747)) by [pabs3](https://github.com/pabs3), [seproDev](https://github.com/seproDev)
-- **niconico**: series: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/bc88b904cd02314da41ce1b2fdf046d0680fe965) ([#11822](https://github.com/yt-dlp/yt-dlp/issues/11822)) by [test20140](https://github.com/test20140)
-- **nrk**
-    - [Extract more formats](https://github.com/yt-dlp/yt-dlp/commit/89198bb23b4d03e0473ac408bfb50d67c2f71165) ([#12069](https://github.com/yt-dlp/yt-dlp/issues/12069)) by [hexahigh](https://github.com/hexahigh)
-    - [Fix extraction](https://github.com/yt-dlp/yt-dlp/commit/45732e2590a1bd0bc9608f5eb68c59341ca84f02) ([#12193](https://github.com/yt-dlp/yt-dlp/issues/12193)) by [hexahigh](https://github.com/hexahigh)
-- **patreon**: [Extract attachment filename as `alt_title`](https://github.com/yt-dlp/yt-dlp/commit/e2e73b5c65593ec0a5e685663e6ec0f4aaffc1f1) ([#12000](https://github.com/yt-dlp/yt-dlp/issues/12000)) by [msm595](https://github.com/msm595)
-- **pbs**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/13825ab77815ee6e1603abbecbb9f3795057b93c) ([#12024](https://github.com/yt-dlp/yt-dlp/issues/12024)) by [dirkf](https://github.com/dirkf), [krandor](https://github.com/krandor), [n10dollar](https://github.com/n10dollar)
-- **piramidetv**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/af2c821d74049b519895288aca23cee81fc4b049) ([#10777](https://github.com/yt-dlp/yt-dlp/issues/10777)) by [HobbyistDev](https://github.com/HobbyistDev), [kclauhk](https://github.com/kclauhk), [seproDev](https://github.com/seproDev)
-- **redgifs**: [Support `/ifr/` URLs](https://github.com/yt-dlp/yt-dlp/commit/4850ce91d163579fa615c3c0d44c9bd64682c22b) ([#11805](https://github.com/yt-dlp/yt-dlp/issues/11805)) by [invertico](https://github.com/invertico)
-- **rtvslo.si**: show: [Extract more metadata](https://github.com/yt-dlp/yt-dlp/commit/3fc46086562857d5493cbcff687f76e4e4ed303f) ([#12136](https://github.com/yt-dlp/yt-dlp/issues/12136)) by [cotko](https://github.com/cotko)
-- **senategov**: [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/68221ecc87c6a3f3515757bac2a0f9674a38e3f2) ([#9361](https://github.com/yt-dlp/yt-dlp/issues/9361)) by [Grabien](https://github.com/Grabien), [seproDev](https://github.com/seproDev)
-- **soundcloud**
-    - [Extract more metadata](https://github.com/yt-dlp/yt-dlp/commit/6d304133ab32bcd1eb78ff1467f1a41dd9b66c33) ([#11945](https://github.com/yt-dlp/yt-dlp/issues/11945)) by [7x11x13](https://github.com/7x11x13)
-    - user: [Add `/comments` page support](https://github.com/yt-dlp/yt-dlp/commit/7bfb4f72e490310d2681c7f4815218a2ebbc73ee) ([#11999](https://github.com/yt-dlp/yt-dlp/issues/11999)) by [7x11x13](https://github.com/7x11x13)
-- **subsplash**: [Add extractors](https://github.com/yt-dlp/yt-dlp/commit/5d904b077d2f58ae44bdf208d2dcfcc3ff8347f5) ([#11054](https://github.com/yt-dlp/yt-dlp/issues/11054)) by [seproDev](https://github.com/seproDev), [subrat-lima](https://github.com/subrat-lima)
-- **theatercomplextownppv**: [Support `live` URLs](https://github.com/yt-dlp/yt-dlp/commit/797d2472a299692e01ad1500e8c3b7bc1daa7fe4) ([#11720](https://github.com/yt-dlp/yt-dlp/issues/11720)) by [bashonly](https://github.com/bashonly)
-- **vimeo**: [Fix thumbnail extraction](https://github.com/yt-dlp/yt-dlp/commit/9ff330948c92f6b2e1d9c928787362ab19cd6c62) ([#12142](https://github.com/yt-dlp/yt-dlp/issues/12142)) by [jixunmoe](https://github.com/jixunmoe)
-- **vimp**: Playlist: [Add support for tags](https://github.com/yt-dlp/yt-dlp/commit/d4f5be1735c8feaeb3308666e0b878e9782f529d) ([#11688](https://github.com/yt-dlp/yt-dlp/issues/11688)) by [FestplattenSchnitzel](https://github.com/FestplattenSchnitzel)
-- **weibo**: [Extend `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/a567f97b62ae9f6d6f5a9376c361512ab8dceda2) ([#12088](https://github.com/yt-dlp/yt-dlp/issues/12088)) by [4ft35t](https://github.com/4ft35t)
-- **xhamster**: [Various improvements](https://github.com/yt-dlp/yt-dlp/commit/3b99a0f0e07f0120ab416f34a8f5ab75d4fdf1d1) ([#11738](https://github.com/yt-dlp/yt-dlp/issues/11738)) by [knackku](https://github.com/knackku)
-- **xiaohongshu**: [Extract more formats](https://github.com/yt-dlp/yt-dlp/commit/f9f24ae376a9eaca777816479a4a29f6f0ce7681) ([#12147](https://github.com/yt-dlp/yt-dlp/issues/12147)) by [seproDev](https://github.com/seproDev)
-- **youtube**
-    - [Download `tv` client Innertube config](https://github.com/yt-dlp/yt-dlp/commit/326fb1ffaf4e8349f1fe8ba2a81839652e044bff) ([#12168](https://github.com/yt-dlp/yt-dlp/issues/12168)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Extract `media_type` for livestreams](https://github.com/yt-dlp/yt-dlp/commit/421bc72103d1faed473a451299cd17d6abb433bb) ([#11605](https://github.com/yt-dlp/yt-dlp/issues/11605)) by [nosoop](https://github.com/nosoop)
-    - [Restore convenience workarounds](https://github.com/yt-dlp/yt-dlp/commit/f0d4b8a5d6354b294bc9631cf15a7160b7bad5de) ([#12181](https://github.com/yt-dlp/yt-dlp/issues/12181)) by [bashonly](https://github.com/bashonly)
-    - [Update `ios` player client](https://github.com/yt-dlp/yt-dlp/commit/de82acf8769282ce321a86737ecc1d4bef0e82a7) ([#12155](https://github.com/yt-dlp/yt-dlp/issues/12155)) by [b5i](https://github.com/b5i)
-    - [Use different PO token for GVS and Player](https://github.com/yt-dlp/yt-dlp/commit/6b91d232e316efa406035915532eb126fbaeea38) ([#12090](https://github.com/yt-dlp/yt-dlp/issues/12090)) by [coletdjnz](https://github.com/coletdjnz)
-    - tab: [Improve shorts title extraction](https://github.com/yt-dlp/yt-dlp/commit/76ac023ff02f06e8c003d104f02a03deeddebdcd) ([#11997](https://github.com/yt-dlp/yt-dlp/issues/11997)) by [bashonly](https://github.com/bashonly), [d3d9](https://github.com/d3d9)
-- **zdf**: [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/bb69f5dab79fb32c4ec0d50e05f7fa26d05d54ba) ([#11041](https://github.com/yt-dlp/yt-dlp/issues/11041)) by [InvalidUsernameException](https://github.com/InvalidUsernameException)
-
-#### Misc. changes
-- **cleanup**: Miscellaneous: [3b45319](https://github.com/yt-dlp/yt-dlp/commit/3b4531934465580be22937fecbb6e1a3a9e2334f) by [bashonly](https://github.com/bashonly), [lonble](https://github.com/lonble), [pjrobertson](https://github.com/pjrobertson), [seproDev](https://github.com/seproDev)
-
-### 2025.01.15
-
-#### Extractor changes
-- **youtube**: [Do not use `web_creator` as a default client](https://github.com/yt-dlp/yt-dlp/commit/c8541f8b13e743fcfa06667530d13fee8686e22a) ([#12087](https://github.com/yt-dlp/yt-dlp/issues/12087)) by [bashonly](https://github.com/bashonly)
-
-### 2025.01.12
-
-#### Core changes
-- [Fix filename sanitization with `--no-windows-filenames`](https://github.com/yt-dlp/yt-dlp/commit/8346b549150003df988538e54c9d8bc4de568979) ([#11988](https://github.com/yt-dlp/yt-dlp/issues/11988)) by [bashonly](https://github.com/bashonly)
-- [Validate retries values are non-negative](https://github.com/yt-dlp/yt-dlp/commit/1f4e1e85a27c5b43e34d7706cfd88ffce1b56a4a) ([#11927](https://github.com/yt-dlp/yt-dlp/issues/11927)) by [Strkmn](https://github.com/Strkmn)
-
-#### Extractor changes
-- **drtalks**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/1f489f4a45691cac3f9e787d22a3a8a086229ba6) ([#10831](https://github.com/yt-dlp/yt-dlp/issues/10831)) by [pzhlkj6612](https://github.com/pzhlkj6612), [seproDev](https://github.com/seproDev)
-- **plvideo**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/3c14e9191f3035b9a729d1d87bc0381f42de57cf) ([#10657](https://github.com/yt-dlp/yt-dlp/issues/10657)) by [Sanceilaks](https://github.com/Sanceilaks), [seproDev](https://github.com/seproDev)
-- **vine**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/e2ef4fece6c9742d1733e3bae408c4787765f78c) ([#11700](https://github.com/yt-dlp/yt-dlp/issues/11700)) by [allendema](https://github.com/allendema)
-- **xiaohongshu**: [Extend `_VALID_URL`](https://github.com/yt-dlp/yt-dlp/commit/763ed06ee69f13949397897bd42ff2ec3dc3d384) ([#11806](https://github.com/yt-dlp/yt-dlp/issues/11806)) by [HobbyistDev](https://github.com/HobbyistDev)
-- **youtube**
-    - [Fix DASH formats incorrectly skipped in some situations](https://github.com/yt-dlp/yt-dlp/commit/0b6b7742c2e7f2a1fcb0b54ef3dd484bab404b3f) ([#11910](https://github.com/yt-dlp/yt-dlp/issues/11910)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Refactor cookie auth](https://github.com/yt-dlp/yt-dlp/commit/75079f4e3f7dce49b61ef01da7adcd9876a0ca3b) ([#11989](https://github.com/yt-dlp/yt-dlp/issues/11989)) by [coletdjnz](https://github.com/coletdjnz)
-    - [Use `tv` instead of `mweb` client by default](https://github.com/yt-dlp/yt-dlp/commit/712d2abb32f59b2d246be2901255f84f1a4c30b3) ([#12059](https://github.com/yt-dlp/yt-dlp/issues/12059)) by [coletdjnz](https://github.com/coletdjnz)
-
-#### Misc. changes
-- **cleanup**: Miscellaneous: [dade5e3](https://github.com/yt-dlp/yt-dlp/commit/dade5e35c89adaad04408bfef766820dbca06ebe) by [grqz](https://github.com/grqz), [Grub4K](https://github.com/Grub4K), [seproDev](https://github.com/seproDev)
-
 ### 2024.12.23
 
 #### Core changes

README.md

@@ -6,6 +6,7 @@
 [![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Download&style=for-the-badge)](#installation "Installation")
 [![PyPI](https://img.shields.io/badge/-PyPI-blue.svg?logo=pypi&labelColor=555555&style=for-the-badge)](https://pypi.org/project/yt-dlp "PyPI")
 [![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](Collaborators.md#collaborators "Donate")
+[![Matrix](https://img.shields.io/matrix/yt-dlp:matrix.org?color=brightgreen&labelColor=555555&label=&logo=element&style=for-the-badge)](https://matrix.to/#/#yt-dlp:matrix.org "Matrix")
 [![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)](https://discord.gg/H5MNcFW63r "Discord")
 [![Supported Sites](https://img.shields.io/badge/-Supported_Sites-brightgreen.svg?style=for-the-badge)](supportedsites.md "Supported Sites")
 [![License: Unlicense](https://img.shields.io/badge/-Unlicense-blue.svg?style=for-the-badge)](LICENSE "License")
@@ -337,11 +338,10 @@ If you fork the project on GitHub, you can run your fork's [build workflow](.git
     --plugin-dirs PATH              Path to an additional directory to search
                                     for plugins. This option can be used
                                     multiple times to add multiple directories.
-                                    Use "default" to search the default plugin
+                                    Note that this currently only works for
-                                    directories (default)
+                                    extractor plugins; postprocessor plugins can
-    --no-plugin-dirs                Clear plugin directories to search,
+                                    only be loaded from the default plugin
-                                    including defaults and those provided by
+                                    directories
-                                    previous --plugin-dirs
     --flat-playlist                 Do not extract a playlist's URL result
                                     entries; some entry metadata may be missing
                                     and downloading may be bypassed
@@ -386,12 +386,6 @@ If you fork the project on GitHub, you can run your fork's [build workflow](.git
                                     recursive options. As a safety measure, each
                                     alias may be triggered a maximum of 100
                                     times. This option can be used multiple times
-    -t, --preset-alias PRESET       Applies a predefined set of options. e.g.
-                                    --preset-alias mp3. The following presets
-                                    are available: mp3, aac, mp4, mkv, sleep.
-                                    See the "Preset Aliases" section at the end
-                                    for more info. This option can be used
-                                    multiple times
 
 ## Network Options:
     --proxy URL                     Use the specified HTTP/HTTPS/SOCKS proxy. To
@@ -1104,23 +1098,6 @@ Make chapter entries for, or remove various segments (sponsor,
                                     can use this option multiple times to give
                                     arguments for different extractors
 
-## Preset Aliases:
-    -t mp3                          -f 'ba[acodec^=mp3]/ba/b' -x --audio-format
-                                    mp3
-
-    -t aac                          -f
-                                    'ba[acodec^=aac]/ba[acodec^=mp4a.40.]/ba/b'
-                                    -x --audio-format aac
-
-    -t mp4                          --merge-output-format mp4 --remux-video mp4
-                                    -S vcodec:h264,lang,quality,res,fps,hdr:12,a
-                                    codec:aac
-
-    -t mkv                          --merge-output-format mkv --remux-video mkv
-
-    -t sleep                        --sleep-subtitles 5 --sleep-requests 0.75
-                                    --sleep-interval 10 --max-sleep-interval 20
-
 # CONFIGURATION
 
 You can configure yt-dlp by placing any supported command line option in a configuration file. The configuration is loaded from the following locations:
@@ -1549,7 +1526,7 @@ The available fields are:
  - `hasvid`: Gives priority to formats that have a video stream
  - `hasaud`: Gives priority to formats that have an audio stream
  - `ie_pref`: The format preference
- - `lang`: The language preference as determined by the extractor (e.g. original language preferred over audio description)
+ - `lang`: The language preference
  - `quality`: The quality of the format
  - `source`: The preference of the source
  - `proto`: Protocol used for download (`https`/`ftps` > `http`/`ftp` > `m3u8_native`/`m3u8` > `http_dash_segments`> `websocket_frag` > `mms`/`rtsp` > `f4f`/`f4m`)
@@ -1783,7 +1760,7 @@ $ yt-dlp --replace-in-metadata "title,uploader" "[ _]" "-"
 
 # EXTRACTOR ARGUMENTS
 
-Some extractors accept additional arguments which can be passed using `--extractor-args KEY:ARGS`. `ARGS` is a `;` (semicolon) separated string of `ARG=VAL1,VAL2`. E.g. `--extractor-args "youtube:player-client=tv,mweb;formats=incomplete" --extractor-args "twitter:api=syndication"`
+Some extractors accept additional arguments which can be passed using `--extractor-args KEY:ARGS`. `ARGS` is a `;` (semicolon) separated string of `ARG=VAL1,VAL2`. E.g. `--extractor-args "youtube:player-client=tv,mweb;formats=incomplete" --extractor-args "funimation:version=uncut"`
 
 Note: In CLI, `ARG` can use `-` instead of `_`; e.g. `youtube:player-client"` becomes `youtube:player_client"`
 
@@ -1792,8 +1769,8 @@ The following extractors use this feature:
 #### youtube
 * `lang`: Prefer translated metadata (`title`, `description` etc) of this language code (case-sensitive). By default, the video primary language metadata is preferred, with a fallback to `en` translated. See [youtube.py](https://github.com/yt-dlp/yt-dlp/blob/c26f9b991a0681fd3ea548d535919cec1fbbd430/yt_dlp/extractor/youtube.py#L381-L390) for list of supported content language codes
 * `skip`: One or more of `hls`, `dash` or `translated_subs` to skip extraction of the m3u8 manifests, dash manifests and [auto-translated subtitles](https://github.com/yt-dlp/yt-dlp/issues/4090#issuecomment-1158102032) respectively
-* `player_client`: Clients to extract video data from. The currently available clients are `web`, `web_safari`, `web_embedded`, `web_music`, `web_creator`, `mweb`, `ios`, `android`, `android_vr`, `tv` and `tv_embedded`. By default, `tv,ios,web` is used, or `tv,web` is used when authenticating with cookies. The `web_music` client is added for `music.youtube.com` URLs when logged-in cookies are used. The `web_embedded` client is added for age-restricted videos but only works if the video is embeddable. The `tv_embedded` and `web_creator` clients are added for age-restricted videos if account age-verification is required. Some clients, such as `web` and `web_music`, require a `po_token` for their formats to be downloadable. Some clients, such as `web_creator`, will only work with authentication. Not all clients support authentication via cookies. You can use `default` for the default clients, or you can use `all` for all clients (not recommended). You can prefix a client with `-` to exclude it, e.g. `youtube:player_client=default,-ios`
+* `player_client`: Clients to extract video data from. The main clients are `web`, `ios` and `android`, with variants `_music` and `_creator` (e.g. `ios_creator`); and `mweb`, `android_vr`, `web_safari`, `web_embedded`, `tv` and `tv_embedded` with no variants. By default, `ios,mweb` is used, or `web_creator,mweb` is used when authenticating with cookies. The `_music` variants are added for `music.youtube.com` URLs. Some clients, such as `web` and `android`, require a `po_token` for their formats to be downloadable. Some clients, such as the `_creator` variants, will only work with authentication. Not all clients support authentication via cookies. You can use `all` to use all the clients, and `default` for the default clients. You can prefix a client with `-` to exclude it, e.g. `youtube:player_client=all,-web`
-* `player_skip`: Skip some network requests that are generally needed for robust extraction. One or more of `configs` (skip client configs), `webpage` (skip initial webpage), `js` (skip js player), `initial_data` (skip initial data/next ep request). While these options can help reduce the number of requests needed or avoid some rate-limiting, they could cause issues such as missing formats or metadata.  See [#860](https://github.com/yt-dlp/yt-dlp/pull/860) and [#12826](https://github.com/yt-dlp/yt-dlp/issues/12826) for more details
+* `player_skip`: Skip some network requests that are generally needed for robust extraction. One or more of `configs` (skip client configs), `webpage` (skip initial webpage), `js` (skip js player). While these options can help reduce the number of requests needed or avoid some rate-limiting, they could cause some issues. See [#860](https://github.com/yt-dlp/yt-dlp/pull/860) for more details
 * `player_params`: YouTube player parameters to use for player requests. Will overwrite any default ones set by yt-dlp.
 * `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side)
 * `max_comments`: Limit the amount of comments to gather. Comma-separated list of integers representing `max-comments,max-parents,max-replies,max-replies-per-thread`. Default is `all,all,all,all`
@@ -1804,8 +1781,7 @@ The following extractors use this feature:
 * `raise_incomplete_data`: `Incomplete Data Received` raises an error instead of reporting a warning
 * `data_sync_id`: Overrides the account Data Sync ID used in Innertube API requests. This may be needed if you are using an account with `youtube:player_skip=webpage,configs` or `youtubetab:skip=webpage`
 * `visitor_data`: Overrides the Visitor Data used in Innertube API requests. This should be used with `player_skip=webpage,configs` and without cookies. Note: this may have adverse effects if used improperly. If a session from a browser is wanted, you should pass cookies instead (which contain the Visitor ID)
-* `po_token`:  Proof of Origin (PO) Token(s) to use. Comma seperated list of PO Tokens in the format `CLIENT.CONTEXT+PO_TOKEN`, e.g. `youtube:po_token=web.gvs+XXX,web.player=XXX,web_safari.gvs+YYY`. Context can be either `gvs` (Google Video Server URLs) or `player` (Innertube player request)
+* `po_token`:  Proof of Origin (PO) Token(s) to use for requesting video playback. Comma seperated list of PO Tokens in the format `CLIENT+PO_TOKEN`, e.g. `youtube:po_token=web+XXX,android+YYY`
-* `player_js_variant`: The player javascript variant to use for signature and nsig deciphering. The known variants are: `main`, `tce`, `tv`, `tv_es6`, `phone`, `tablet`. Only `main` is recommended as a possible workaround; the others are for debugging purposes. The default is to use what is prescribed by the site, and can be selected with `actual`
 
 #### youtubetab (YouTube playlists, channels, feeds, etc.)
 * `skip`: One or more of `webpage` (skip initial webpage download), `authcheck` (allow the download of playlists requiring authentication when no initial webpage is downloaded. This may cause unwanted behavior, see [#1122](https://github.com/yt-dlp/yt-dlp/pull/1122) for more details)
@@ -1819,9 +1795,19 @@ The following extractors use this feature:
 * `is_live`: Bypass live HLS detection and manually set `live_status` - a value of `false` will set `not_live`, any other value (or no value) will set `is_live`
 * `impersonate`: Target(s) to try and impersonate with the initial webpage request; e.g. `generic:impersonate=safari,chrome-110`. Use `generic:impersonate` to impersonate any available target, and use `generic:impersonate=false` to disable impersonation (default)
 
+#### funimation
+* `language`: Audio languages to extract, e.g. `funimation:language=english,japanese`
+* `version`: The video version to extract - `uncut` or `simulcast`
+
+#### crunchyrollbeta (Crunchyroll)
+* `hardsub`: One or more hardsub versions to extract (in order of preference), or `all` (default: `None` = no hardsubs will be extracted), e.g. `crunchyrollbeta:hardsub=en-US,de-DE`
+
 #### vikichannel
 * `video_types`: Types of videos to download - one or more of `episodes`, `movies`, `clips`, `trailers`
 
+#### niconico
+* `segment_duration`: Segment duration in milliseconds for HLS-DMC formats. Use it at your own risk since this feature **may result in your account termination.**
+
 #### youtubewebarchive
 * `check_all`: Try to check more at the cost of more requests. One or more of `thumbnails`, `captures`
 
@@ -1833,9 +1819,6 @@ The following extractors use this feature:
 * `vcodec`: vcodec to ignore - one or more of `h264`, `h265`, `dvh265`
 * `dr`: dynamic range to ignore - one or more of `sdr`, `hdr10`, `dv`
 
-#### instagram
-* `app_id`: The value of the `X-IG-App-ID` header used for API requests. Default is the web app ID, `936619743392459`
-
 #### niconicochannelplus
 * `max_comments`: Maximum number of comments to extract - default is `120`
 
@@ -1887,9 +1870,6 @@ The following extractors use this feature:
 #### sonylivseries
 * `sort_order`: Episode sort order for series extraction - one of `asc` (ascending, oldest first) or `desc` (descending, newest first). Default is `asc`
 
-#### tver
-* `backend`: Backend API to use for extraction - one of `streaks` (default) or `brightcove` (deprecated)
-
 **Note**: These options may be changed/removed in the future without concern for backward compatibility
 
 <!-- MANPAGE: MOVE "INSTALLATION" SECTION HERE -->
@@ -2173,7 +2153,7 @@ with yt_dlp.YoutubeDL(ydl_opts) as ydl:
 
 * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection than what is possible by simply using `--format` ([examples](#format-selection-examples))
 
-* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--write-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, playlist infojson etc. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.
+* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--write-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, playlist infojson etc. Note that NicoNico livestreams are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.
 
 * **YouTube improvements**:
     * Supports Clips, Stories (`ytstories:<channel UCID>`), Search (including filters)**\***, YouTube Music Search, Channel-specific search, Search prefixes (`ytsearch:`, `ytsearchdate:`)**\***, Mixes, and Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`, `:ytnotif`)
@@ -2239,7 +2219,7 @@ Some of yt-dlp's default options are different from that of youtube-dl and youtu
 * Live chats (if available) are considered as subtitles. Use `--sub-langs all,-live_chat` to download all subtitles except live chat. You can also use `--compat-options no-live-chat` to prevent any live chat/danmaku from downloading
 * YouTube channel URLs download all uploads of the channel. To download only the videos in a specific tab, pass the tab's URL. If the channel does not show the requested tab, an error will be raised. Also, `/live` URLs raise an error if there are no live videos instead of silently downloading the entire channel. You may use `--compat-options no-youtube-channel-redirect` to revert all these redirections
 * Unavailable videos are also listed for YouTube playlists. Use `--compat-options no-youtube-unavailable-videos` to remove this
-* The upload dates extracted from YouTube are in UTC.
+* The upload dates extracted from YouTube are in UTC [when available](https://github.com/yt-dlp/yt-dlp/blob/89e4d86171c7b7c997c77d4714542e0383bf0db0/yt_dlp/extractor/youtube.py#L3898-L3900). Use `--compat-options no-youtube-prefer-utc-upload-date` to prefer the non-UTC upload date.
 * If `ffmpeg` is used as the downloader, the downloading and merging of formats happen in a single step when possible. Use `--compat-options no-direct-merge` to revert this
 * Thumbnail embedding in `mp4` is done with mutagen if possible. Use `--compat-options embed-thumbnail-atomicparsley` to force the use of AtomicParsley instead
 * Some internal metadata such as filenames are removed by default from the infojson. Use `--no-clean-infojson` or `--compat-options no-clean-infojson` to revert this
@@ -2258,10 +2238,9 @@ For ease of use, a few more compat options are available:
 * `--compat-options all`: Use all compat options (**Do NOT use this!**)
 * `--compat-options youtube-dl`: Same as `--compat-options all,-multistreams,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`
 * `--compat-options youtube-dlc`: Same as `--compat-options all,-no-live-chat,-no-youtube-channel-redirect,-playlist-match-filter,-manifest-filesize-approx,-allow-unsafe-ext,-prefer-vp9-sort`
-* `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`
+* `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization,no-youtube-prefer-utc-upload-date`
 * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`
-* `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`
+* `--compat-options 2023`: Same as `--compat-options prefer-vp9-sort`. Use this to enable all future compat options
-* `--compat-options 2024`: Currently does nothing. Use this to enable all future compat options
 
 The following compat options restore vulnerable behavior from before security patches:
 

devscripts/changelog_override.json

@@ -239,20 +239,5 @@
         "action": "add",
         "when": "52c0ffe40ad6e8404d93296f575007b05b04c686",
         "short": "[priority] **Login with OAuth is no longer supported for YouTube**\nDue to a change made by the site, yt-dlp is no longer able to support OAuth login for YouTube. [Read more](https://github.com/yt-dlp/yt-dlp/issues/11462#issuecomment-2471703090)"
-    },
-    {
-        "action": "change",
-        "when": "76ac023ff02f06e8c003d104f02a03deeddebdcd",
-        "short": "[ie/youtube:tab] Improve shorts title extraction (#11997)",
-        "authors": ["bashonly", "d3d9"]
-    },
-    {
-        "action": "add",
-        "when": "88eb1e7a9a2720ac89d653c0d0e40292388823bb",
-        "short": "[priority] **New option `--preset-alias`/`-t` has been added**\nThis provides convenient predefined aliases for common use cases. Available presets include `mp4`, `mp3`, `mkv`, `aac`, and `sleep`. See [the README](https://github.com/yt-dlp/yt-dlp/blob/master/README.md#preset-aliases) for more details."
-    },
-    {
-        "action": "remove",
-        "when": "d596824c2f8428362c072518856065070616e348"
     }
 ]

devscripts/make_issue_template.py

@@ -11,13 +11,11 @@ import re
 
 from devscripts.utils import get_filename_args, read_file, write_file
 
-VERBOSE = '''
+VERBOSE_TMPL = '''
   - type: checkboxes
     id: verbose
     attributes:
       label: Provide verbose output that clearly demonstrates the problem
-      description: |
-        This is mandatory unless absolutely impossible to provide. If you are unable to provide the output, please explain why.
       options:
         - label: Run **your** yt-dlp command with **-vU** flag added (`yt-dlp -vU <your command line>`)
           required: true
@@ -49,23 +47,31 @@ VERBOSE = '''
       render: shell
     validations:
       required: true
-'''.strip()
-
-NO_SKIP = '''
   - type: markdown
     attributes:
       value: |
-        > [!IMPORTANT]
+        > [!CAUTION]
-        > Not providing the required (*) information or removing the template will result in your issue being closed and ignored.
+        > ### GitHub is experiencing a high volume of malicious spam comments.
+        > ### If you receive any replies asking you download a file, do NOT follow the download links!
+        >
+        > Note that this issue may be temporarily locked as an anti-spam measure after it is opened.
+'''.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 *intentionally* remove or skip any mandatory\\* field
+          required: true
 '''.strip()
 
 
 def main():
-    fields = {
+    fields = {'no_skip': NO_SKIP}
-        'no_skip': NO_SKIP,
+    fields['verbose'] = VERBOSE_TMPL % fields
-        'verbose': VERBOSE,
+    fields['verbose_optional'] = re.sub(r'(\n\s+validations:)?\n\s+required: true', '', fields['verbose'])
-        'verbose_optional': re.sub(r'(\n\s+validations:)?\n\s+required: true', '', VERBOSE),
-    }
 
     infile, outfile = get_filename_args(has_infile=True)
     write_file(outfile, read_file(infile) % fields)

devscripts/make_lazy_extractors.py

@@ -10,9 +10,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from inspect import getsource
 
 from devscripts.utils import get_filename_args, read_file, write_file
-from yt_dlp.extractor import import_extractors
-from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
-from yt_dlp.globals import extractors
 
 NO_ATTR = object()
 STATIC_CLASS_PROPERTIES = [
@@ -41,7 +38,8 @@ def main():
 
     lazy_extractors_filename = get_filename_args(default_outfile='yt_dlp/extractor/lazy_extractors.py')
 
-    import_extractors()
+    from yt_dlp.extractor.extractors import _ALL_CLASSES
+    from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor
 
     DummyInfoExtractor = type('InfoExtractor', (InfoExtractor,), {'IE_NAME': NO_ATTR})
     module_src = '\n'.join((
@@ -49,7 +47,7 @@ def main():
         '    _module = None',
         *extra_ie_code(DummyInfoExtractor),
         '\nclass LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-        *build_ies(list(extractors.value.values()), (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
+        *build_ies(_ALL_CLASSES, (InfoExtractor, SearchInfoExtractor), DummyInfoExtractor),
     ))
 
     write_file(lazy_extractors_filename, f'{module_src}\n')
@@ -75,7 +73,7 @@ def build_ies(ies, bases, attr_base):
         if ie in ies:
             names.append(ie.__name__)
 
-    yield '\n_CLASS_LOOKUP = {%s}' % ', '.join(f'{name!r}: {name}' for name in names)
+    yield f'\n_ALL_CLASSES = [{", ".join(names)}]'
 
 
 def sort_ies(ies, ignored_bases):

devscripts/make_supportedsites.py

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

devscripts/run_tests.py

@@ -25,8 +25,7 @@ def parse_args():
 
 
 def run_tests(*tests, pattern=None, ci=False):
-    # XXX: hatch uses `tests` if no arguments are passed
+    run_core = 'core' in tests or (not pattern and not tests)
-    run_core = 'core' in tests or 'tests' in tests or (not pattern and not tests)
     run_download = 'download' in tests
 
     pytest_args = args.pytest_args or os.getenv('HATCH_TEST_ARGS', '')

pyproject.toml

@@ -55,7 +55,8 @@ default = [
     "websockets>=13.0",
 ]
 curl-cffi = [
-    "curl-cffi>=0.5.10,!=0.6.*,!=0.7.*,!=0.8.*,!=0.9.*,<0.11; implementation_name=='cpython'",
+    "curl-cffi==0.5.10; os_name=='nt' and implementation_name=='cpython'",
+    "curl-cffi>=0.5.10,!=0.6.*,<0.7.2; os_name!='nt' and implementation_name=='cpython'",
 ]
 secretstorage = [
     "cffi",
@@ -75,14 +76,14 @@ dev = [
 ]
 static-analysis = [
     "autopep8~=2.0",
-    "ruff~=0.11.0",
+    "ruff~=0.8.0",
 ]
 test = [
     "pytest~=8.1",
     "pytest-rerunfailures~=14.0",
 ]
 pyinstaller = [
-    "pyinstaller>=6.13.0",  # Windows temp cleanup fixed in 6.13.0
+    "pyinstaller>=6.11.1",  # Windows temp cleanup fixed in 6.11.1
 ]
 
 [project.urls]
@@ -194,7 +195,6 @@ ignore = [
     "B023",    # function-uses-loop-variable (false positives)
     "B028",    # no-explicit-stacklevel
     "B904",    # raise-without-from-inside-except
-    "A005",    # stdlib-module-shadowing
     "C401",    # unnecessary-generator-set
     "C402",    # unnecessary-generator-dict
     "PIE790",  # unnecessary-placeholder
@@ -383,14 +383,9 @@ select = [
     "W391",
     "W504",
 ]
-exclude = "*/extractor/lazy_extractors.py,*venv*,*/test/testdata/sigs/player-*.js,.idea,.vscode"
 
 [tool.pytest.ini_options]
-addopts = [
+addopts = "-ra -v --strict-markers"
-    "-ra",  # summary: all except passed
-    "--verbose",
-    "--strict-markers",
-]
 markers = [
     "download",
 ]

supportedsites.md

@@ -1,13 +1,6 @@
 # Supported sites
-
-Below is a list of all extractors that are currently included with yt-dlp.
-If a site is not listed here, it might still be supported by yt-dlp's embed extraction or generic extractor.
-Not all sites listed here are guaranteed to work; websites are constantly changing and sometimes this breaks yt-dlp's support for them.
-The only reliable way to check if a site is supported is to try it.
-
  - **17live**
  - **17live:clip**
- - **17live:vod**
  - **1News**: 1news.co.nz article videos
  - **1tv**: Первый канал
  - **20min**
@@ -178,7 +171,6 @@ The only reliable way to check if a site is supported is to try it.
  - **BilibiliCheese**
  - **BilibiliCheeseSeason**
  - **BilibiliCollectionList**
- - **BiliBiliDynamic**
  - **BilibiliFavoritesList**
  - **BiliBiliPlayer**
  - **BilibiliPlaylist**
@@ -201,7 +193,7 @@ The only reliable way to check if a site is supported is to try it.
  - **blogger.com**
  - **Bloomberg**
  - **Bluesky**
- - **BokeCC**: CC视频
+ - **BokeCC**
  - **BongaCams**
  - **Boosty**
  - **BostonGlobe**
@@ -225,7 +217,6 @@ The only reliable way to check if a site is supported is to try it.
  - **bt:vestlendingen**: Bergens Tidende - Vestlendingen
  - **Bundesliga**
  - **Bundestag**
- - **BunnyCdn**
  - **BusinessInsider**
  - **BuzzFeed**
  - **BYUtv**: (**Currently broken**)
@@ -244,7 +235,6 @@ The only reliable way to check if a site is supported is to try it.
  - **CanalAlpha**
  - **canalc2.tv**
  - **Canalplus**: mycanal.fr and piwiplus.fr
- - **Canalsurmas**
  - **CaracolTvPlay**: [*caracoltv-play*](## "netrc machine")
  - **CartoonNetwork**
  - **cbc.ca**
@@ -313,6 +303,10 @@ The only reliable way to check if a site is supported is to try it.
  - **CrowdBunker**
  - **CrowdBunkerChannel**
  - **Crtvg**
+ - **crunchyroll**: [*crunchyroll*](## "netrc machine")
+ - **crunchyroll:artist**: [*crunchyroll*](## "netrc machine")
+ - **crunchyroll:music**: [*crunchyroll*](## "netrc machine")
+ - **crunchyroll:playlist**: [*crunchyroll*](## "netrc machine")
  - **CSpan**: C-SPAN
  - **CSpanCongress**
  - **CtsNews**: 華視新聞
@@ -323,8 +317,7 @@ The only reliable way to check if a site is supported is to try it.
  - **curiositystream**: [*curiositystream*](## "netrc machine")
  - **curiositystream:collections**: [*curiositystream*](## "netrc machine")
  - **curiositystream:series**: [*curiositystream*](## "netrc machine")
- - **cwtv**
+ - **CWTV**
- - **cwtv:movie**
  - **Cybrary**: [*cybrary*](## "netrc machine")
  - **CybraryCourse**: [*cybrary*](## "netrc machine")
  - **DacastPlaylist**
@@ -348,6 +341,8 @@ The only reliable way to check if a site is supported is to try it.
  - **daystar:clip**
  - **DBTV**
  - **DctpTv**
+ - **DeezerAlbum**
+ - **DeezerPlaylist**
  - **democracynow**
  - **DestinationAmerica**
  - **DetikEmbed**
@@ -357,7 +352,6 @@ The only reliable way to check if a site is supported is to try it.
  - **DigitalConcertHall**: [*digitalconcerthall*](## "netrc machine") DigitalConcertHall extractor
  - **DigitallySpeaking**
  - **Digiteka**
- - **Digiview**
  - **DiscogsReleasePlaylist**
  - **DiscoveryLife**
  - **DiscoveryNetworksDe**
@@ -380,7 +374,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Dropbox**
  - **Dropout**: [*dropout*](## "netrc machine")
  - **DropoutSeason**
- - **DrTalks**
  - **DrTuber**
  - **drtv**
  - **drtv:live**
@@ -394,15 +387,11 @@ The only reliable way to check if a site is supported is to try it.
  - **dvtv**: http://video.aktualne.cz/
  - **dw**: (**Currently broken**)
  - **dw:article**: (**Currently broken**)
- - **dzen.ru**: Дзен (dzen) formerly Яндекс.Дзен (Yandex Zen)
- - **dzen.ru:channel**
  - **EaglePlatform**
  - **EbaumsWorld**
  - **Ebay**
  - **egghead:course**: egghead.io course
  - **egghead:lesson**: egghead.io lesson
- - **eggs:artist**
- - **eggs:single**
  - **EinsUndEinsTV**: [*1und1tv*](## "netrc machine")
  - **EinsUndEinsTVLive**: [*1und1tv*](## "netrc machine")
  - **EinsUndEinsTVRecordings**: [*1und1tv*](## "netrc machine")
@@ -474,12 +463,11 @@ The only reliable way to check if a site is supported is to try it.
  - **FoxNewsVideo**
  - **FoxSports**
  - **fptplay**: fptplay.vn
- - **FrancaisFacile**
  - **FranceCulture**
  - **FranceInter**
- - **francetv**
+ - **FranceTV**
- - **francetv:site**
  - **francetvinfo.fr**
+ - **FranceTVSite**
  - **Freesound**
  - **freespeech.org**
  - **freetv:series**
@@ -488,6 +476,9 @@ The only reliable way to check if a site is supported is to try it.
  - **FrontendMastersCourse**: [*frontendmasters*](## "netrc machine")
  - **FrontendMastersLesson**: [*frontendmasters*](## "netrc machine")
  - **FujiTVFODPlus7**
+ - **Funimation**: [*funimation*](## "netrc machine")
+ - **funimation:page**: [*funimation*](## "netrc machine")
+ - **funimation:show**: [*funimation*](## "netrc machine")
  - **Funk**
  - **Funker530**
  - **Fux**
@@ -511,7 +502,7 @@ The only reliable way to check if a site is supported is to try it.
  - **GediDigital**
  - **gem.cbc.ca**: [*cbcgem*](## "netrc machine")
  - **gem.cbc.ca:live**
- - **gem.cbc.ca:playlist**: [*cbcgem*](## "netrc machine")
+ - **gem.cbc.ca:playlist**
  - **Genius**
  - **GeniusLyrics**
  - **Germanupa**: germanupa.de
@@ -613,10 +604,10 @@ The only reliable way to check if a site is supported is to try it.
  - **Inc**
  - **IndavideoEmbed**
  - **InfoQ**
- - **Instagram**
+ - **Instagram**: [*instagram*](## "netrc machine")
- - **instagram:story**
+ - **instagram:story**: [*instagram*](## "netrc machine")
- - **instagram:tag**: Instagram hashtag search URLs
+ - **instagram:tag**: [*instagram*](## "netrc machine") Instagram hashtag search URLs
- - **instagram:user**: Instagram user profile (**Currently broken**)
+ - **instagram:user**: [*instagram*](## "netrc machine") Instagram user profile (**Currently broken**)
  - **InstagramIOS**: IOS instagram:// URL
  - **Internazionale**
  - **InternetVideoArchive**
@@ -636,7 +627,6 @@ The only reliable way to check if a site is supported is to try it.
  - **ivi**: ivi.ru
  - **ivi:compilation**: ivi.ru compilations
  - **ivideon**: Ivideon TV
- - **Ivoox**
  - **IVXPlayer**
  - **iwara**: [*iwara*](## "netrc machine")
  - **iwara:playlist**: [*iwara*](## "netrc machine")
@@ -666,6 +656,7 @@ The only reliable way to check if a site is supported is to try it.
  - **KelbyOne**: (**Currently broken**)
  - **Kenh14Playlist**
  - **Kenh14Video**
+ - **Ketnet**
  - **khanacademy**
  - **khanacademy:unit**
  - **kick:clips**
@@ -674,7 +665,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Kicker**
  - **KickStarter**
  - **Kika**: KiKA.de
- - **KikaPlaylist**
  - **kinja:embed**
  - **KinoPoisk**
  - **Kommunetv**
@@ -727,7 +717,6 @@ The only reliable way to check if a site is supported is to try it.
  - **limelight:channel**
  - **limelight:channel_list**
  - **LinkedIn**: [*linkedin*](## "netrc machine")
- - **linkedin:events**: [*linkedin*](## "netrc machine")
  - **linkedin:learning**: [*linkedin*](## "netrc machine")
  - **linkedin:​learning:course**: [*linkedin*](## "netrc machine")
  - **Liputan6**
@@ -739,11 +728,9 @@ The only reliable way to check if a site is supported is to try it.
  - **Livestreamfails**
  - **Lnk**
  - **loc**: Library of Congress
- - **Loco**
  - **loom**
  - **loom:folder**
  - **LoveHomePorn**
- - **LRTRadio**
  - **LRTStream**
  - **LRTVOD**
  - **LSMLREmbed**
@@ -765,7 +752,7 @@ The only reliable way to check if a site is supported is to try it.
  - **ManotoTV**: Manoto TV (Episode)
  - **ManotoTVLive**: Manoto TV (Live)
  - **ManotoTVShow**: Manoto TV (Show)
- - **ManyVids**
+ - **ManyVids**: (**Currently broken**)
  - **MaoriTV**
  - **Markiza**: (**Currently broken**)
  - **MarkizaPage**: (**Currently broken**)
@@ -835,11 +822,11 @@ The only reliable way to check if a site is supported is to try it.
  - **MotherlessUploader**
  - **Motorsport**: motorsport.com (**Currently broken**)
  - **MovieFap**
- - **moviepilot**: Moviepilot trailer
+ - **Moviepilot**
  - **MoviewPlay**
  - **Moviezine**
  - **MovingImage**
- - **MSN**
+ - **MSN**: (**Currently broken**)
  - **mtg**: MTG services
  - **mtv**
  - **mtv.de**: (**Currently broken**)
@@ -904,8 +891,6 @@ The only reliable way to check if a site is supported is to try it.
  - **nebula:video**: [*watchnebula*](## "netrc machine")
  - **NekoHacker**
  - **NerdCubedFeed**
- - **Nest**
- - **NestClip**
  - **netease:album**: 网易云音乐 - 专辑
  - **netease:djradio**: 网易云音乐 - 电台
  - **netease:mv**: 网易云音乐 - MV
@@ -952,7 +937,7 @@ The only reliable way to check if a site is supported is to try it.
  - **nickelodeonru**
  - **niconico**: [*niconico*](## "netrc machine") ニコニコ動画
  - **niconico:history**: NicoNico user history or likes. Requires cookies.
- - **niconico:live**: [*niconico*](## "netrc machine") ニコニコ生放送
+ - **niconico:live**: ニコニコ生放送
  - **niconico:playlist**
  - **niconico:series**
  - **niconico:tag**: NicoNico video tag URLs
@@ -1059,8 +1044,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Parler**: Posts on parler.com
  - **parliamentlive.tv**: UK parliament videos
  - **Parlview**: (**Currently broken**)
- - **parti:livestream**
- - **parti:video**
  - **patreon**
  - **patreon:campaign**
  - **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)
@@ -1087,8 +1070,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Pinkbike**
  - **Pinterest**
  - **PinterestCollection**
- - **PiramideTV**
- - **PiramideTVChannel**
  - **pixiv:sketch**
  - **pixiv:​sketch:user**
  - **Pladform**
@@ -1105,7 +1086,6 @@ The only reliable way to check if a site is supported is to try it.
  - **pluralsight**: [*pluralsight*](## "netrc machine")
  - **pluralsight:course**
  - **PlutoTV**: (**Currently broken**)
- - **PlVideo**: Платформа
  - **PodbayFM**
  - **PodbayFMChannel**
  - **Podchaser**
@@ -1235,7 +1215,6 @@ The only reliable way to check if a site is supported is to try it.
  - **RoosterTeeth**: [*roosterteeth*](## "netrc machine")
  - **RoosterTeethSeries**: [*roosterteeth*](## "netrc machine")
  - **RottenTomatoes**
- - **RoyaLive**
  - **Rozhlas**
  - **RozhlasVltava**
  - **RTBF**: [*rtbf*](## "netrc machine") (**Currently broken**)
@@ -1256,10 +1235,12 @@ The only reliable way to check if a site is supported is to try it.
  - **RTVCKaltura**
  - **RTVCPlay**
  - **RTVCPlayEmbed**
- - **rtve.es:alacarta**: RTVE a la carta and Play
+ - **rtve.es:alacarta**: RTVE a la carta
  - **rtve.es:audio**: RTVE audio
+ - **rtve.es:infantil**: RTVE infantil
  - **rtve.es:live**: RTVE.es live streams
  - **rtve.es:television**
+ - **RTVS**
  - **rtvslo.si**
  - **rtvslo.si:show**
  - **RudoVideo**
@@ -1314,8 +1295,8 @@ The only reliable way to check if a site is supported is to try it.
  - **sejm**
  - **Sen**
  - **SenalColombiaLive**: (**Currently broken**)
- - **senate.gov**
+ - **SenateGov**
- - **senate.gov:isvp**
+ - **SenateISVP**
  - **SendtoNews**: (**Currently broken**)
  - **Servus**
  - **Sexu**: (**Currently broken**)
@@ -1351,7 +1332,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Smotrim**
  - **SnapchatSpotlight**
  - **Snotr**
- - **SoftWhiteUnderbelly**: [*softwhiteunderbelly*](## "netrc machine")
  - **Sohu**
  - **SohuV**
  - **SonyLIV**: [*sonyliv*](## "netrc machine")
@@ -1408,16 +1388,12 @@ The only reliable way to check if a site is supported is to try it.
  - **StoryFire**
  - **StoryFireSeries**
  - **StoryFireUser**
- - **Streaks**
  - **Streamable**
  - **StreamCZ**
  - **StreetVoice**
  - **StretchInternet**
  - **Stripchat**
  - **stv:player**
- - **stvr**: Slovak Television and Radio (formerly RTVS)
- - **Subsplash**
- - **subsplash:playlist**
  - **Substack**
  - **SunPorno**
  - **sverigesradio:episode**
@@ -1548,8 +1524,6 @@ The only reliable way to check if a site is supported is to try it.
  - **tv5unis**
  - **tv5unis:video**
  - **tv8.it**
- - **tv8.it:live**: TV8 Live
- - **tv8.it:playlist**: TV8 Playlist
  - **TVANouvelles**
  - **TVANouvellesArticle**
  - **tvaplus**: TVA+
@@ -1570,8 +1544,6 @@ The only reliable way to check if a site is supported is to try it.
  - **tvp:​vod:series**
  - **TVPlayer**
  - **TVPlayHome**
- - **tvw**
- - **tvw:tvchannels**
  - **Tweakers**
  - **TwitCasting**
  - **TwitCastingLive**
@@ -1653,6 +1625,8 @@ The only reliable way to check if a site is supported is to try it.
  - **viewlift**
  - **viewlift:embed**
  - **Viidea**
+ - **viki**: [*viki*](## "netrc machine")
+ - **viki:channel**: [*viki*](## "netrc machine")
  - **vimeo**: [*vimeo*](## "netrc machine")
  - **vimeo:album**: [*vimeo*](## "netrc machine")
  - **vimeo:channel**: [*vimeo*](## "netrc machine")
@@ -1667,6 +1641,8 @@ The only reliable way to check if a site is supported is to try it.
  - **Vimm:stream**
  - **ViMP**
  - **ViMP:Playlist**
+ - **Vine**
+ - **vine:user**
  - **Viously**
  - **Viqeo**: (**Currently broken**)
  - **Viu**
@@ -1690,12 +1666,8 @@ The only reliable way to check if a site is supported is to try it.
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **vqq:series**
  - **vqq:video**
- - **vrsquare**: VR SQUARE
- - **vrsquare:channel**
- - **vrsquare:search**
- - **vrsquare:section**
  - **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
- - **vrtmax**: [*vrtnu*](## "netrc machine") VRT MAX (formerly VRT NU)
+ - **VrtNU**: [*vrtnu*](## "netrc machine") VRT MAX
  - **VTM**: (**Currently broken**)
  - **VTV**
  - **VTVGo**
@@ -1830,12 +1802,14 @@ The only reliable way to check if a site is supported is to try it.
  - **ZattooLive**: [*zattoo*](## "netrc machine")
  - **ZattooMovies**: [*zattoo*](## "netrc machine")
  - **ZattooRecordings**: [*zattoo*](## "netrc machine")
- - **zdf**
+ - **ZDF**
- - **zdf:channel**
+ - **ZDFChannel**
  - **Zee5**: [*zee5*](## "netrc machine")
  - **zee5:series**
  - **ZeeNews**: (**Currently broken**)
  - **ZenPorn**
+ - **ZenYandex**
+ - **ZenYandexChannel**
  - **ZetlandDKArticle**
  - **Zhihu**
  - **zingmp3**: zingmp3.vn

test/helper.py

@@ -101,109 +101,87 @@ def getwebpagetestcases():
 md5 = lambda s: hashlib.md5(s.encode()).hexdigest()
 
 
-def _iter_differences(got, expected, field):
-    if isinstance(expected, str):
-        op, _, val = expected.partition(':')
-        if op in ('mincount', 'maxcount', 'count'):
-            if not isinstance(got, (list, dict)):
-                yield field, f'expected either {list.__name__} or {dict.__name__}, got {type(got).__name__}'
-                return
-
-            expected_num = int(val)
-            got_num = len(got)
-            if op == 'mincount':
-                if got_num < expected_num:
-                    yield field, f'expected at least {val} items, got {got_num}'
-                return
-
-            if op == 'maxcount':
-                if got_num > expected_num:
-                    yield field, f'expected at most {val} items, got {got_num}'
-                return
-
-            assert op == 'count'
-            if got_num != expected_num:
-                yield field, f'expected exactly {val} items, got {got_num}'
-            return
-
-        if not isinstance(got, str):
-            yield field, f'expected {str.__name__}, got {type(got).__name__}'
-            return
-
-        if op == 're':
-            if not re.match(val, got):
-                yield field, f'should match {val!r}, got {got!r}'
-            return
-
-        if op == 'startswith':
-            if not got.startswith(val):
-                yield field, f'should start with {val!r}, got {got!r}'
-            return
-
-        if op == 'contains':
-            if not val.startswith(got):
-                yield field, f'should contain {val!r}, got {got!r}'
-            return
-
-        if op == 'md5':
-            hash_val = md5(got)
-            if hash_val != val:
-                yield field, f'expected hash {val}, got {hash_val}'
-            return
-
-        if got != expected:
-            yield field, f'expected {expected!r}, got {got!r}'
-        return
-
-    if isinstance(expected, dict) and isinstance(got, dict):
-        for key, expected_val in expected.items():
-            if key not in got:
-                yield field, f'missing key: {key!r}'
-                continue
-
-            field_name = key if field is None else f'{field}.{key}'
-            yield from _iter_differences(got[key], expected_val, field_name)
-        return
-
-    if isinstance(expected, type):
-        if not isinstance(got, expected):
-            yield field, f'expected {expected.__name__}, got {type(got).__name__}'
-        return
-
-    if isinstance(expected, list) and isinstance(got, list):
-        # TODO: clever diffing algorithm lmao
-        if len(expected) != len(got):
-            yield field, f'expected length of {len(expected)}, got {len(got)}'
-            return
-
-        for index, (got_val, expected_val) in enumerate(zip(got, expected)):
-            field_name = str(index) if field is None else f'{field}.{index}'
-            yield from _iter_differences(got_val, expected_val, field_name)
-        return
-
-    if got != expected:
-        yield field, f'expected {expected!r}, got {got!r}'
-
-
-def _expect_value(message, got, expected, field):
-    mismatches = list(_iter_differences(got, expected, field))
-    if not mismatches:
-        return
-
-    fields = [field for field, _ in mismatches if field is not None]
-    return ''.join((
-        message, f' ({", ".join(fields)})' if fields else '',
-        *(f'\n\t{field}: {message}' for field, message in mismatches)))
-
-
 def expect_value(self, got, expected, field):
-    if message := _expect_value('values differ', got, expected, field):
+    if isinstance(expected, str) and expected.startswith('re:'):
-        self.fail(message)
+        match_str = expected[len('re:'):]
+        match_rex = re.compile(match_str)
+
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            match_rex.match(got),
+            f'field {field} (value: {got!r}) should match {match_str!r}')
+    elif isinstance(expected, str) and expected.startswith('startswith:'):
+        start_str = expected[len('startswith:'):]
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            got.startswith(start_str),
+            f'field {field} (value: {got!r}) should start with {start_str!r}')
+    elif isinstance(expected, str) and expected.startswith('contains:'):
+        contains_str = expected[len('contains:'):]
+        self.assertTrue(
+            isinstance(got, str),
+            f'Expected a {str.__name__} object, but got {type(got).__name__} for field {field}')
+        self.assertTrue(
+            contains_str in got,
+            f'field {field} (value: {got!r}) should contain {contains_str!r}')
+    elif isinstance(expected, type):
+        self.assertTrue(
+            isinstance(got, expected),
+            f'Expected type {expected!r} for field {field}, but got value {got!r} of type {type(got)!r}')
+    elif isinstance(expected, dict) and isinstance(got, dict):
+        expect_dict(self, got, expected)
+    elif isinstance(expected, list) and isinstance(got, list):
+        self.assertEqual(
+            len(expected), len(got),
+            f'Expect a list of length {len(expected)}, but got a list of length {len(got)} for field {field}')
+        for index, (item_got, item_expected) in enumerate(zip(got, expected)):
+            type_got = type(item_got)
+            type_expected = type(item_expected)
+            self.assertEqual(
+                type_expected, type_got,
+                f'Type mismatch for list item at index {index} for field {field}, '
+                f'expected {type_expected!r}, got {type_got!r}')
+            expect_value(self, item_got, item_expected, field)
+    else:
+        if isinstance(expected, str) and expected.startswith('md5:'):
+            self.assertTrue(
+                isinstance(got, str),
+                f'Expected field {field} to be a unicode object, but got value {got!r} of type {type(got)!r}')
+            got = 'md5:' + md5(got)
+        elif isinstance(expected, str) and re.match(r'^(?:min|max)?count:\d+', expected):
+            self.assertTrue(
+                isinstance(got, (list, dict)),
+                f'Expected field {field} to be a list or a dict, but it is of type {type(got).__name__}')
+            op, _, expected_num = expected.partition(':')
+            expected_num = int(expected_num)
+            if op == 'mincount':
+                assert_func = assertGreaterEqual
+                msg_tmpl = 'Expected %d items in field %s, but only got %d'
+            elif op == 'maxcount':
+                assert_func = assertLessEqual
+                msg_tmpl = 'Expected maximum %d items in field %s, but got %d'
+            elif op == 'count':
+                assert_func = assertEqual
+                msg_tmpl = 'Expected exactly %d items in field %s, but got %d'
+            else:
+                assert False
+            assert_func(
+                self, len(got), expected_num,
+                msg_tmpl % (expected_num, field, len(got)))
+            return
+        self.assertEqual(
+            expected, got,
+            f'Invalid value for field {field}, expected {expected!r}, got {got!r}')
 
 
 def expect_dict(self, got_dict, expected_dict):
-    if message := _expect_value('dictionaries differ', got_dict, expected_dict, None):
+    for info_field, expected in expected_dict.items():
-        self.fail(message)
+        got = got_dict.get(info_field)
+        expect_value(self, got, expected, info_field)
 
 
 def sanitize_got_info_dict(got_dict):
@@ -259,20 +237,6 @@ def sanitize_got_info_dict(got_dict):
 
 
 def expect_info_dict(self, got_dict, expected_dict):
-    ALLOWED_KEYS_SORT_ORDER = (
-        # NB: Keep in sync with the docstring of extractor/common.py
-        'id', 'ext', 'direct', 'display_id', 'title', 'alt_title', 'description', 'media_type',
-        'uploader', 'uploader_id', 'uploader_url', 'channel', 'channel_id', 'channel_url', 'channel_is_verified',
-        'channel_follower_count', 'comment_count', 'view_count', 'concurrent_view_count',
-        'like_count', 'dislike_count', 'repost_count', 'average_rating', 'age_limit', 'duration', 'thumbnail', 'heatmap',
-        'chapters', 'chapter', 'chapter_number', 'chapter_id', 'start_time', 'end_time', 'section_start', 'section_end',
-        'categories', 'tags', 'cast', 'composers', 'artists', 'album_artists', 'creators', 'genres',
-        'track', 'track_number', 'track_id', 'album', 'album_type', 'disc_number',
-        'series', 'series_id', 'season', 'season_number', 'season_id', 'episode', 'episode_number', 'episode_id',
-        'timestamp', 'upload_date', 'release_timestamp', 'release_date', 'release_year', 'modified_timestamp', 'modified_date',
-        'playable_in_embed', 'availability', 'live_status', 'location', 'license', '_old_archive_ids',
-    )
-
     expect_dict(self, got_dict, expected_dict)
     # Check for the presence of mandatory fields
     if got_dict.get('_type') not in ('playlist', 'multi_video'):
@@ -288,13 +252,7 @@ def expect_info_dict(self, got_dict, expected_dict):
 
     test_info_dict = sanitize_got_info_dict(got_dict)
 
-    # Check for invalid/misspelled field names being returned by the extractor
+    missing_keys = set(test_info_dict.keys()) - set(expected_dict.keys())
-    invalid_keys = sorted(test_info_dict.keys() - ALLOWED_KEYS_SORT_ORDER)
-    self.assertFalse(invalid_keys, f'Invalid fields returned by the extractor: {", ".join(invalid_keys)}')
-
-    missing_keys = sorted(
-        test_info_dict.keys() - expected_dict.keys(),
-        key=lambda x: ALLOWED_KEYS_SORT_ORDER.index(x))
     if missing_keys:
         def _repr(v):
             if isinstance(v, str):

test/test_InfoExtractor.py

@@ -638,7 +638,6 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                 'img_bipbop_adv_example_fmp4',
                 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
                 [{
-                    # 60kbps (bitrate not provided in m3u8); sorted as worst because it's grouped with lowest bitrate video track
                     'format_id': 'aud1-English',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a1/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
@@ -646,19 +645,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'ext': 'mp4',
                     'protocol': 'm3u8_native',
                     'audio_ext': 'mp4',
-                    'source_preference': 0,
                 }, {
-                    # 192kbps (bitrate not provided in m3u8)
-                    'format_id': 'aud3-English',
-                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a3/prog_index.m3u8',
-                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
-                    'language': 'en',
-                    'ext': 'mp4',
-                    'protocol': 'm3u8_native',
-                    'audio_ext': 'mp4',
-                    'source_preference': 1,
-                }, {
-                    # 384kbps (bitrate not provided in m3u8); sorted as best because it's grouped with the highest bitrate video track
                     'format_id': 'aud2-English',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a2/prog_index.m3u8',
                     'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
@@ -666,7 +653,14 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'ext': 'mp4',
                     'protocol': 'm3u8_native',
                     'audio_ext': 'mp4',
-                    'source_preference': 2,
+                }, {
+                    'format_id': 'aud3-English',
+                    'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/a3/prog_index.m3u8',
+                    'manifest_url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/master.m3u8',
+                    'language': 'en',
+                    'ext': 'mp4',
+                    'protocol': 'm3u8_native',
+                    'audio_ext': 'mp4',
                 }, {
                     'format_id': '530',
                     'url': 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_fmp4/v2/prog_index.m3u8',

test/test_YoutubeDL.py

@@ -6,8 +6,6 @@ import sys
 import unittest
 from unittest.mock import patch
 
-from yt_dlp.globals import all_plugins_loaded
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
@@ -488,11 +486,11 @@ class TestFormatSelection(unittest.TestCase):
 
     def test_format_filtering(self):
         formats = [
-            {'format_id': 'A', 'filesize': 500, 'width': 1000, 'aspect_ratio': 1.0},
+            {'format_id': 'A', 'filesize': 500, 'width': 1000},
-            {'format_id': 'B', 'filesize': 1000, 'width': 500, 'aspect_ratio': 1.33},
+            {'format_id': 'B', 'filesize': 1000, 'width': 500},
-            {'format_id': 'C', 'filesize': 1000, 'width': 400, 'aspect_ratio': 1.5},
+            {'format_id': 'C', 'filesize': 1000, 'width': 400},
-            {'format_id': 'D', 'filesize': 2000, 'width': 600, 'aspect_ratio': 1.78},
+            {'format_id': 'D', 'filesize': 2000, 'width': 600},
-            {'format_id': 'E', 'filesize': 3000, 'aspect_ratio': 0.56},
+            {'format_id': 'E', 'filesize': 3000},
             {'format_id': 'F'},
             {'format_id': 'G', 'filesize': 1000000},
         ]
@@ -551,31 +549,6 @@ class TestFormatSelection(unittest.TestCase):
             ydl.process_ie_result(info_dict)
         self.assertEqual(ydl.downloaded_info_dicts, [])
 
-        ydl = YDL({'format': 'best[aspect_ratio=1]'})
-        ydl.process_ie_result(info_dict)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'A')
-
-        ydl = YDL({'format': 'all[aspect_ratio > 1.00]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['D', 'C', 'B'])
-
-        ydl = YDL({'format': 'all[aspect_ratio < 1.00]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['E'])
-
-        ydl = YDL({'format': 'best[aspect_ratio=1.5]'})
-        ydl.process_ie_result(info_dict)
-        downloaded = ydl.downloaded_info_dicts[0]
-        self.assertEqual(downloaded['format_id'], 'C')
-
-        ydl = YDL({'format': 'all[aspect_ratio!=1]'})
-        ydl.process_ie_result(info_dict)
-        downloaded_ids = [info['format_id'] for info in ydl.downloaded_info_dicts]
-        self.assertEqual(downloaded_ids, ['E', 'D', 'C', 'B'])
-
     @patch('yt_dlp.postprocessor.ffmpeg.FFmpegMergerPP.available', False)
     def test_default_format_spec_without_ffmpeg(self):
         ydl = YDL({})
@@ -1429,12 +1402,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
         self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
 
-    def test_load_plugins_compat(self):
-        # Should try to reload plugins if they haven't already been loaded
-        all_plugins_loaded.value = False
-        FakeYDL().close()
-        assert all_plugins_loaded.value
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_http_proxy.py

@@ -331,6 +331,10 @@ class TestHTTPConnectProxy:
                 assert proxy_info['proxy'] == server_address
                 assert 'Proxy-Authorization' in proxy_info['headers']
 
+    @pytest.mark.skip_handler(
+        'Requests',
+        'bug in urllib3 causes unclosed socket: https://github.com/urllib3/urllib3/issues/3374',
+    )
     def test_http_connect_bad_auth(self, handler, ctx):
         with ctx.http_server(HTTPConnectProxyHandler, username='test', password='test') as server_address:
             with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'http://test:bad@{server_address}'}) as rh:

test/test_jsinterp.py

@@ -9,7 +9,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import math
 
-from yt_dlp.jsinterp import JS_Undefined, JSInterpreter, js_number_to_string
+from yt_dlp.jsinterp import JS_Undefined, JSInterpreter
 
 
 class NaN:
@@ -93,16 +93,6 @@ class TestJSInterpreter(unittest.TestCase):
         self._test('function f(){return 0 ?? 42;}', 0)
         self._test('function f(){return "life, the universe and everything" < 42;}', False)
         self._test('function f(){return 0  - 7 * - 6;}', 42)
-        self._test('function f(){return true << "5";}', 32)
-        self._test('function f(){return true << true;}', 2)
-        self._test('function f(){return "19" & "21.9";}', 17)
-        self._test('function f(){return "19" & false;}', 0)
-        self._test('function f(){return "11.0" >> "2.1";}', 2)
-        self._test('function f(){return 5 ^ 9;}', 12)
-        self._test('function f(){return 0.0 << NaN}', 0)
-        self._test('function f(){return null << undefined}', 0)
-        # TODO: Does not work due to number too large
-        # self._test('function f(){return 21 << 4294967297}', 42)
 
     def test_array_access(self):
         self._test('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}', [5, 2, 7])
@@ -118,7 +108,6 @@ class TestJSInterpreter(unittest.TestCase):
         self._test('function f(){var x = 20; x = 30 + 1; return x;}', 31)
         self._test('function f(){var x = 20; x += 30 + 1; return x;}', 51)
         self._test('function f(){var x = 20; x -= 30 + 1; return x;}', -11)
-        self._test('function f(){var x = 2; var y = ["a", "b"]; y[x%y["length"]]="z"; return y}', ['z', 'b'])
 
     @unittest.skip('Not implemented')
     def test_comments(self):
@@ -385,7 +374,7 @@ class TestJSInterpreter(unittest.TestCase):
     @unittest.skip('Not implemented')
     def test_packed(self):
         jsi = JSInterpreter('''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''')
-        self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))  # noqa: SIM905
+        self.assertEqual(jsi.call_function('f', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))
 
     def test_join(self):
         test_input = list('test')
@@ -404,8 +393,6 @@ class TestJSInterpreter(unittest.TestCase):
         test_result = list('test')
         tests = [
             'function f(a, b){return a.split(b)}',
-            'function f(a, b){return a["split"](b)}',
-            'function f(a, b){let x = ["split"]; return a[x[0]](b)}',
             'function f(a, b){return String.prototype.split.call(a, b)}',
             'function f(a, b){return String.prototype.split.apply(a, [b])}',
         ]
@@ -444,40 +431,6 @@ class TestJSInterpreter(unittest.TestCase):
         self._test('function f(){return "012345678".slice(-1, 1)}', '')
         self._test('function f(){return "012345678".slice(-3, -1)}', '67')
 
-    def test_splice(self):
-        self._test('function f(){var T = ["0", "1", "2"]; T["splice"](2, 1, "0")[0]; return T }', ['0', '1', '0'])
-
-    def test_js_number_to_string(self):
-        for test, radix, expected in [
-            (0, None, '0'),
-            (-0, None, '0'),
-            (0.0, None, '0'),
-            (-0.0, None, '0'),
-            (math.nan, None, 'NaN'),
-            (-math.nan, None, 'NaN'),
-            (math.inf, None, 'Infinity'),
-            (-math.inf, None, '-Infinity'),
-            (10 ** 21.5, 8, '526665530627250154000000'),
-            (6, 2, '110'),
-            (254, 16, 'fe'),
-            (-10, 2, '-1010'),
-            (-0xff, 2, '-11111111'),
-            (0.1 + 0.2, 16, '0.4cccccccccccd'),
-            (1234.1234, 10, '1234.1234'),
-            # (1000000000000000128, 10, '1000000000000000100')
-        ]:
-            assert js_number_to_string(test, radix) == expected
-
-    def test_extract_function(self):
-        jsi = JSInterpreter('function a(b) { return b + 1; }')
-        func = jsi.extract_function('a')
-        self.assertEqual(func([2]), 3)
-
-    def test_extract_function_with_global_stack(self):
-        jsi = JSInterpreter('function c(d) { return d + e + f + g; }')
-        func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
-        self.assertEqual(func([1]), 1111)
-
 
 if __name__ == '__main__':
     unittest.main()

test/test_networking.py

@@ -39,7 +39,6 @@ from yt_dlp.cookies import YoutubeDLCookieJar
 from yt_dlp.dependencies import brotli, curl_cffi, requests, urllib3
 from yt_dlp.networking import (
     HEADRequest,
-    PATCHRequest,
     PUTRequest,
     Request,
     RequestDirector,
@@ -615,6 +614,7 @@ class TestHTTPRequestHandler(TestRequestHandlerBase):
                 rh, Request(f'http://127.0.0.1:{self.http_port}/source_address')).read().decode()
             assert source_address == data
 
+    # Not supported by CurlCFFI
     @pytest.mark.skip_handler('CurlCFFI', 'not supported by curl-cffi')
     def test_gzip_trailing_garbage(self, handler):
         with handler() as rh:
@@ -720,15 +720,6 @@ class TestHTTPRequestHandler(TestRequestHandlerBase):
                     rh, Request(
                         f'http://127.0.0.1:{self.http_port}/headers', proxies={'all': 'http://10.255.255.255'})).close()
 
-    @pytest.mark.skip_handlers_if(lambda _, handler: handler not in ['Urllib', 'CurlCFFI'], 'handler does not support keep_header_casing')
-    def test_keep_header_casing(self, handler):
-        with handler() as rh:
-            res = validate_and_send(
-                rh, Request(
-                    f'http://127.0.0.1:{self.http_port}/headers', headers={'X-test-heaDer': 'test'}, extensions={'keep_header_casing': True})).read().decode()
-
-            assert 'X-test-heaDer: test' in res
-
 
 @pytest.mark.parametrize('handler', ['Urllib', 'Requests', 'CurlCFFI'], indirect=True)
 class TestClientCertificate:
@@ -1298,7 +1289,6 @@ class TestRequestHandlerValidation:
             ({'legacy_ssl': False}, False),
             ({'legacy_ssl': True}, False),
             ({'legacy_ssl': 'notabool'}, AssertionError),
-            ({'keep_header_casing': True}, UnsupportedRequest),
         ]),
         ('Requests', 'http', [
             ({'cookiejar': 'notacookiejar'}, AssertionError),
@@ -1309,9 +1299,6 @@ class TestRequestHandlerValidation:
             ({'legacy_ssl': False}, False),
             ({'legacy_ssl': True}, False),
             ({'legacy_ssl': 'notabool'}, AssertionError),
-            ({'keep_header_casing': False}, False),
-            ({'keep_header_casing': True}, False),
-            ({'keep_header_casing': 'notabool'}, AssertionError),
         ]),
         ('CurlCFFI', 'http', [
             ({'cookiejar': 'notacookiejar'}, AssertionError),
@@ -1857,7 +1844,6 @@ class TestRequest:
 
     def test_request_helpers(self):
         assert HEADRequest('http://example.com').method == 'HEAD'
-        assert PATCHRequest('http://example.com').method == 'PATCH'
         assert PUTRequest('http://example.com').method == 'PUT'
 
     def test_headers(self):

test/test_plugins.py

@@ -10,71 +10,22 @@ TEST_DATA_DIR = Path(os.path.dirname(os.path.abspath(__file__)), 'testdata')
 sys.path.append(str(TEST_DATA_DIR))
 importlib.invalidate_caches()
 
-from yt_dlp.plugins import (
+from yt_dlp.utils import Config
-    PACKAGE_NAME,
+from yt_dlp.plugins import PACKAGE_NAME, directories, load_plugins
-    PluginSpec,
-    directories,
-    load_plugins,
-    load_all_plugins,
-    register_plugin_spec,
-)
-
-from yt_dlp.globals import (
-    extractors,
-    postprocessors,
-    plugin_dirs,
-    plugin_ies,
-    plugin_pps,
-    all_plugins_loaded,
-    plugin_specs,
-)
-
-
-EXTRACTOR_PLUGIN_SPEC = PluginSpec(
-    module_name='extractor',
-    suffix='IE',
-    destination=extractors,
-    plugin_destination=plugin_ies,
-)
-
-POSTPROCESSOR_PLUGIN_SPEC = PluginSpec(
-    module_name='postprocessor',
-    suffix='PP',
-    destination=postprocessors,
-    plugin_destination=plugin_pps,
-)
-
-
-def reset_plugins():
-    plugin_ies.value = {}
-    plugin_pps.value = {}
-    plugin_dirs.value = ['default']
-    plugin_specs.value = {}
-    all_plugins_loaded.value = False
-    # Clearing override plugins is probably difficult
-    for module_name in tuple(sys.modules):
-        for plugin_type in ('extractor', 'postprocessor'):
-            if module_name.startswith(f'{PACKAGE_NAME}.{plugin_type}.'):
-                del sys.modules[module_name]
-
-    importlib.invalidate_caches()
 
 
 class TestPlugins(unittest.TestCase):
 
     TEST_PLUGIN_DIR = TEST_DATA_DIR / PACKAGE_NAME
 
-    def setUp(self):
-        reset_plugins()
-
-    def tearDown(self):
-        reset_plugins()
-
     def test_directories_containing_plugins(self):
         self.assertIn(self.TEST_PLUGIN_DIR, map(Path, directories()))
 
     def test_extractor_classes(self):
-        plugins_ie = load_plugins(EXTRACTOR_PLUGIN_SPEC)
+        for module_name in tuple(sys.modules):
+            if module_name.startswith(f'{PACKAGE_NAME}.extractor'):
+                del sys.modules[module_name]
+        plugins_ie = load_plugins('extractor', 'IE')
 
         self.assertIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
         self.assertIn('NormalPluginIE', plugins_ie.keys())
@@ -84,29 +35,17 @@ class TestPlugins(unittest.TestCase):
             f'{PACKAGE_NAME}.extractor._ignore' in sys.modules,
             'loaded module beginning with underscore')
         self.assertNotIn('IgnorePluginIE', plugins_ie.keys())
-        self.assertNotIn('IgnorePluginIE', plugin_ies.value)
 
         # Don't load extractors with underscore prefix
         self.assertNotIn('_IgnoreUnderscorePluginIE', plugins_ie.keys())
-        self.assertNotIn('_IgnoreUnderscorePluginIE', plugin_ies.value)
 
         # Don't load extractors not specified in __all__ (if supplied)
         self.assertNotIn('IgnoreNotInAllPluginIE', plugins_ie.keys())
-        self.assertNotIn('IgnoreNotInAllPluginIE', plugin_ies.value)
         self.assertIn('InAllPluginIE', plugins_ie.keys())
-        self.assertIn('InAllPluginIE', plugin_ies.value)
-
-        # Don't load override extractors
-        self.assertNotIn('OverrideGenericIE', plugins_ie.keys())
-        self.assertNotIn('OverrideGenericIE', plugin_ies.value)
-        self.assertNotIn('_UnderscoreOverrideGenericIE', plugins_ie.keys())
-        self.assertNotIn('_UnderscoreOverrideGenericIE', plugin_ies.value)
 
     def test_postprocessor_classes(self):
-        plugins_pp = load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
+        plugins_pp = load_plugins('postprocessor', 'PP')
         self.assertIn('NormalPluginPP', plugins_pp.keys())
-        self.assertIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-        self.assertIn('NormalPluginPP', plugin_pps.value)
 
     def test_importing_zipped_module(self):
         zip_path = TEST_DATA_DIR / 'zipped_plugins.zip'
@@ -119,10 +58,10 @@ class TestPlugins(unittest.TestCase):
                 package = importlib.import_module(f'{PACKAGE_NAME}.{plugin_type}')
                 self.assertIn(zip_path / PACKAGE_NAME / plugin_type, map(Path, package.__path__))
 
-            plugins_ie = load_plugins(EXTRACTOR_PLUGIN_SPEC)
+            plugins_ie = load_plugins('extractor', 'IE')
             self.assertIn('ZippedPluginIE', plugins_ie.keys())
 
-            plugins_pp = load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
+            plugins_pp = load_plugins('postprocessor', 'PP')
             self.assertIn('ZippedPluginPP', plugins_pp.keys())
 
         finally:
@@ -130,116 +69,23 @@ class TestPlugins(unittest.TestCase):
             os.remove(zip_path)
             importlib.invalidate_caches()  # reset the import caches
 
-    def test_reloading_plugins(self):
+    def test_plugin_dirs(self):
-        reload_plugins_path = TEST_DATA_DIR / 'reload_plugins'
+        # Internal plugin dirs hack for CLI --plugin-dirs
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
+        # To be replaced with proper system later
-        load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
+        custom_plugin_dir = TEST_DATA_DIR / 'plugin_packages'
+        Config._plugin_dirs = [str(custom_plugin_dir)]
+        importlib.invalidate_caches()  # reset the import caches
 
-        # Remove default folder and add reload_plugin path
-        sys.path.remove(str(TEST_DATA_DIR))
-        sys.path.append(str(reload_plugins_path))
-        importlib.invalidate_caches()
         try:
-            for plugin_type in ('extractor', 'postprocessor'):
+            package = importlib.import_module(f'{PACKAGE_NAME}.extractor')
-                package = importlib.import_module(f'{PACKAGE_NAME}.{plugin_type}')
+            self.assertIn(custom_plugin_dir / 'testpackage' / PACKAGE_NAME / 'extractor', map(Path, package.__path__))
-                self.assertIn(reload_plugins_path / PACKAGE_NAME / plugin_type, map(Path, package.__path__))
 
-            plugins_ie = load_plugins(EXTRACTOR_PLUGIN_SPEC)
+            plugins_ie = load_plugins('extractor', 'IE')
-            self.assertIn('NormalPluginIE', plugins_ie.keys())
+            self.assertIn('PackagePluginIE', plugins_ie.keys())
-            self.assertTrue(
-                plugins_ie['NormalPluginIE'].REPLACED,
-                msg='Reloading has not replaced original extractor plugin')
-            self.assertTrue(
-                extractors.value['NormalPluginIE'].REPLACED,
-                msg='Reloading has not replaced original extractor plugin globally')
-
-            plugins_pp = load_plugins(POSTPROCESSOR_PLUGIN_SPEC)
-            self.assertIn('NormalPluginPP', plugins_pp.keys())
-            self.assertTrue(plugins_pp['NormalPluginPP'].REPLACED,
-                            msg='Reloading has not replaced original postprocessor plugin')
-            self.assertTrue(
-                postprocessors.value['NormalPluginPP'].REPLACED,
-                msg='Reloading has not replaced original postprocessor plugin globally')
 
         finally:
-            sys.path.remove(str(reload_plugins_path))
+            Config._plugin_dirs = []
-            sys.path.append(str(TEST_DATA_DIR))
+            importlib.invalidate_caches()  # reset the import caches
-            importlib.invalidate_caches()
-
-    def test_extractor_override_plugin(self):
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-        from yt_dlp.extractor.generic import GenericIE
-
-        self.assertEqual(GenericIE.TEST_FIELD, 'override')
-        self.assertEqual(GenericIE.SECONDARY_TEST_FIELD, 'underscore-override')
-
-        self.assertEqual(GenericIE.IE_NAME, 'generic+override+underscore-override')
-        importlib.invalidate_caches()
-        #  test that loading a second time doesn't wrap a second time
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-        from yt_dlp.extractor.generic import GenericIE
-        self.assertEqual(GenericIE.IE_NAME, 'generic+override+underscore-override')
-
-    def test_load_all_plugin_types(self):
-
-        # no plugin specs registered
-        load_all_plugins()
-
-        self.assertNotIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertNotIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-
-        register_plugin_spec(EXTRACTOR_PLUGIN_SPEC)
-        register_plugin_spec(POSTPROCESSOR_PLUGIN_SPEC)
-        load_all_plugins()
-        self.assertTrue(all_plugins_loaded.value)
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-
-    def test_no_plugin_dirs(self):
-        register_plugin_spec(EXTRACTOR_PLUGIN_SPEC)
-        register_plugin_spec(POSTPROCESSOR_PLUGIN_SPEC)
-
-        plugin_dirs.value = []
-        load_all_plugins()
-
-        self.assertNotIn(f'{PACKAGE_NAME}.extractor.normal', sys.modules.keys())
-        self.assertNotIn(f'{PACKAGE_NAME}.postprocessor.normal', sys.modules.keys())
-
-    def test_set_plugin_dirs(self):
-        custom_plugin_dir = str(TEST_DATA_DIR / 'plugin_packages')
-        plugin_dirs.value = [custom_plugin_dir]
-
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.package', sys.modules.keys())
-        self.assertIn('PackagePluginIE', plugin_ies.value)
-
-    def test_invalid_plugin_dir(self):
-        plugin_dirs.value = ['invalid_dir']
-        with self.assertRaises(ValueError):
-            load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-    def test_append_plugin_dirs(self):
-        custom_plugin_dir = str(TEST_DATA_DIR / 'plugin_packages')
-
-        self.assertEqual(plugin_dirs.value, ['default'])
-        plugin_dirs.value.append(custom_plugin_dir)
-        self.assertEqual(plugin_dirs.value, ['default', custom_plugin_dir])
-
-        load_plugins(EXTRACTOR_PLUGIN_SPEC)
-
-        self.assertIn(f'{PACKAGE_NAME}.extractor.package', sys.modules.keys())
-        self.assertIn('PackagePluginIE', plugin_ies.value)
-
-    def test_get_plugin_spec(self):
-        register_plugin_spec(EXTRACTOR_PLUGIN_SPEC)
-        register_plugin_spec(POSTPROCESSOR_PLUGIN_SPEC)
-
-        self.assertEqual(plugin_specs.value.get('extractor'), EXTRACTOR_PLUGIN_SPEC)
-        self.assertEqual(plugin_specs.value.get('postprocessor'), POSTPROCESSOR_PLUGIN_SPEC)
-        self.assertIsNone(plugin_specs.value.get('invalid'))
 
 
 if __name__ == '__main__':

test/test_subtitles.py

@@ -23,6 +23,7 @@ from yt_dlp.extractor import (
     TedTalkIE,
     ThePlatformFeedIE,
     ThePlatformIE,
+    VikiIE,
     VimeoIE,
     WallaIE,
     YoutubeIE,
@@ -330,6 +331,20 @@ class TestRaiPlaySubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
 
 
+@is_download_test
+@unittest.skip('IE broken - DRM only')
+class TestVikiSubtitles(BaseTestSubtitles):
+    url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
+    IE = VikiIE
+
+    def test_allsubtitles(self):
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['allsubtitles'] = True
+        subtitles = self.getSubtitles()
+        self.assertEqual(set(subtitles.keys()), {'en'})
+        self.assertEqual(md5(subtitles['en']), '53cb083a5914b2d84ef1ab67b880d18a')
+
+
 @is_download_test
 class TestThePlatformSubtitles(BaseTestSubtitles):
     # from http://www.3playmedia.com/services-features/tools/integrations/theplatform/

test/test_utils.py

@@ -3,20 +3,19 @@
 # Allow direct execution
 import os
 import sys
+import unittest
+import unittest.mock
+import warnings
+import datetime as dt
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 import contextlib
-import datetime as dt
 import io
 import itertools
 import json
-import pickle
 import subprocess
-import unittest
-import unittest.mock
-import warnings
 import xml.etree.ElementTree
 
 from yt_dlp.compat import (
@@ -219,8 +218,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw')
         self.assertEqual(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI')
 
-    @unittest.mock.patch('sys.platform', 'win32')
     def test_sanitize_path(self):
+        with unittest.mock.patch('sys.platform', 'win32'):
+            self._test_sanitize_path()
+
+    def _test_sanitize_path(self):
         self.assertEqual(sanitize_path('abc'), 'abc')
         self.assertEqual(sanitize_path('abc/def'), 'abc\\def')
         self.assertEqual(sanitize_path('abc\\def'), 'abc\\def')
@@ -247,34 +249,17 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_path('abc/def...'), 'abc\\def..#')
         self.assertEqual(sanitize_path('abc.../def'), 'abc..#\\def')
         self.assertEqual(sanitize_path('abc.../def...'), 'abc..#\\def..#')
+
+        self.assertEqual(sanitize_path('../abc'), '..\\abc')
+        self.assertEqual(sanitize_path('../../abc'), '..\\..\\abc')
+        self.assertEqual(sanitize_path('./abc'), 'abc')
+        self.assertEqual(sanitize_path('./../abc'), '..\\abc')
+
+        self.assertEqual(sanitize_path('\\abc'), '\\abc')
+        self.assertEqual(sanitize_path('C:abc'), 'C:abc')
+        self.assertEqual(sanitize_path('C:abc\\..\\'), 'C:..')
         self.assertEqual(sanitize_path('C:\\abc:%(title)s.%(ext)s'), 'C:\\abc#%(title)s.%(ext)s')
 
-        # Check with nt._path_normpath if available
-        try:
-            from nt import _path_normpath as nt_path_normpath
-        except ImportError:
-            nt_path_normpath = None
-
-        for test, expected in [
-            ('C:\\', 'C:\\'),
-            ('../abc', '..\\abc'),
-            ('../../abc', '..\\..\\abc'),
-            ('./abc', 'abc'),
-            ('./../abc', '..\\abc'),
-            ('\\abc', '\\abc'),
-            ('C:abc', 'C:abc'),
-            ('C:abc\\..\\', 'C:'),
-            ('C:abc\\..\\def\\..\\..\\', 'C:..'),
-            ('C:\\abc\\xyz///..\\def\\', 'C:\\abc\\def'),
-            ('abc/../', '.'),
-            ('./abc/../', '.'),
-        ]:
-            result = sanitize_path(test)
-            assert result == expected, f'{test} was incorrectly resolved'
-            assert result == sanitize_path(result), f'{test} changed after sanitizing again'
-            if nt_path_normpath:
-                assert result == nt_path_normpath(test), f'{test} does not match nt._path_normpath'
-
     def test_sanitize_url(self):
         self.assertEqual(sanitize_url('//foo.bar'), 'http://foo.bar')
         self.assertEqual(sanitize_url('httpss://foo.bar'), 'https://foo.bar')
@@ -659,8 +644,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(url_or_none('mms://foo.de'), 'mms://foo.de')
         self.assertEqual(url_or_none('rtspu://foo.de'), 'rtspu://foo.de')
         self.assertEqual(url_or_none('ftps://foo.de'), 'ftps://foo.de')
-        self.assertEqual(url_or_none('ws://foo.de'), 'ws://foo.de')
-        self.assertEqual(url_or_none('wss://foo.de'), 'wss://foo.de')
 
     def test_parse_age_limit(self):
         self.assertEqual(parse_age_limit(None), None)
@@ -1262,7 +1245,6 @@ class TestUtil(unittest.TestCase):
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
-        self.assertEqual(js_to_json('{a: `${e("")}`}'), '{"a": "\\"e\\"(\\"\\")"}')
 
     def test_js_to_json_template_literal(self):
         self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
@@ -2086,26 +2068,21 @@ Line 1
         headers = HTTPHeaderDict()
         headers['ytdl-test'] = b'0'
         self.assertEqual(list(headers.items()), [('Ytdl-Test', '0')])
-        self.assertEqual(list(headers.sensitive().items()), [('ytdl-test', '0')])
         headers['ytdl-test'] = 1
         self.assertEqual(list(headers.items()), [('Ytdl-Test', '1')])
-        self.assertEqual(list(headers.sensitive().items()), [('ytdl-test', '1')])
         headers['Ytdl-test'] = '2'
         self.assertEqual(list(headers.items()), [('Ytdl-Test', '2')])
-        self.assertEqual(list(headers.sensitive().items()), [('Ytdl-test', '2')])
         self.assertTrue('ytDl-Test' in headers)
         self.assertEqual(str(headers), str(dict(headers)))
         self.assertEqual(repr(headers), str(dict(headers)))
 
         headers.update({'X-dlp': 'data'})
         self.assertEqual(set(headers.items()), {('Ytdl-Test', '2'), ('X-Dlp', 'data')})
-        self.assertEqual(set(headers.sensitive().items()), {('Ytdl-test', '2'), ('X-dlp', 'data')})
         self.assertEqual(dict(headers), {'Ytdl-Test': '2', 'X-Dlp': 'data'})
         self.assertEqual(len(headers), 2)
         self.assertEqual(headers.copy(), headers)
-        headers2 = HTTPHeaderDict({'X-dlp': 'data3'}, headers, **{'X-dlP': 'data2'})
+        headers2 = HTTPHeaderDict({'X-dlp': 'data3'}, **headers, **{'X-dlp': 'data2'})
         self.assertEqual(set(headers2.items()), {('Ytdl-Test', '2'), ('X-Dlp', 'data2')})
-        self.assertEqual(set(headers2.sensitive().items()), {('Ytdl-test', '2'), ('X-dlP', 'data2')})
         self.assertEqual(len(headers2), 2)
         headers2.clear()
         self.assertEqual(len(headers2), 0)
@@ -2113,23 +2090,16 @@ Line 1
         # ensure we prefer latter headers
         headers3 = HTTPHeaderDict({'Ytdl-TeSt': 1}, {'Ytdl-test': 2})
         self.assertEqual(set(headers3.items()), {('Ytdl-Test', '2')})
-        self.assertEqual(set(headers3.sensitive().items()), {('Ytdl-test', '2')})
         del headers3['ytdl-tesT']
         self.assertEqual(dict(headers3), {})
 
         headers4 = HTTPHeaderDict({'ytdl-test': 'data;'})
         self.assertEqual(set(headers4.items()), {('Ytdl-Test', 'data;')})
-        self.assertEqual(set(headers4.sensitive().items()), {('ytdl-test', 'data;')})
 
         # common mistake: strip whitespace from values
         # https://github.com/yt-dlp/yt-dlp/issues/8729
         headers5 = HTTPHeaderDict({'ytdl-test': ' data; '})
         self.assertEqual(set(headers5.items()), {('Ytdl-Test', 'data;')})
-        self.assertEqual(set(headers5.sensitive().items()), {('ytdl-test', 'data;')})
-
-        # test if picklable
-        headers6 = HTTPHeaderDict(a=1, b=2)
-        self.assertEqual(pickle.loads(pickle.dumps(headers6)), headers6)
 
     def test_extract_basic_auth(self):
         assert extract_basic_auth('http://:foo.bar') == ('http://:foo.bar', None)

test/test_websockets.py

@@ -44,7 +44,7 @@ def websocket_handler(websocket):
                 return websocket.send('2')
         elif isinstance(message, str):
             if message == 'headers':
-                return websocket.send(json.dumps(dict(websocket.request.headers.raw_items())))
+                return websocket.send(json.dumps(dict(websocket.request.headers)))
             elif message == 'path':
                 return websocket.send(websocket.request.path)
             elif message == 'source_address':
@@ -266,18 +266,18 @@ class TestWebsSocketRequestHandlerConformance:
         with handler(cookiejar=cookiejar) as rh:
             ws = ws_validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
-            assert HTTPHeaderDict(json.loads(ws.recv()))['cookie'] == 'test=ytdlp'
+            assert json.loads(ws.recv())['cookie'] == 'test=ytdlp'
             ws.close()
 
         with handler() as rh:
             ws = ws_validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
-            assert 'cookie' not in HTTPHeaderDict(json.loads(ws.recv()))
+            assert 'cookie' not in json.loads(ws.recv())
             ws.close()
 
             ws = ws_validate_and_send(rh, Request(self.ws_base_url, extensions={'cookiejar': cookiejar}))
             ws.send('headers')
-            assert HTTPHeaderDict(json.loads(ws.recv()))['cookie'] == 'test=ytdlp'
+            assert json.loads(ws.recv())['cookie'] == 'test=ytdlp'
             ws.close()
 
     @pytest.mark.skip_handler('Websockets', 'Set-Cookie not supported by websockets')
@@ -287,7 +287,7 @@ class TestWebsSocketRequestHandlerConformance:
             ws_validate_and_send(rh, Request(f'{self.ws_base_url}/get_cookie', extensions={'cookiejar': YoutubeDLCookieJar()}))
             ws = ws_validate_and_send(rh, Request(self.ws_base_url, extensions={'cookiejar': YoutubeDLCookieJar()}))
             ws.send('headers')
-            assert 'cookie' not in HTTPHeaderDict(json.loads(ws.recv()))
+            assert 'cookie' not in json.loads(ws.recv())
             ws.close()
 
     @pytest.mark.skip_handler('Websockets', 'Set-Cookie not supported by websockets')
@@ -298,12 +298,12 @@ class TestWebsSocketRequestHandlerConformance:
             ws_validate_and_send(rh, Request(f'{self.ws_base_url}/get_cookie'))
             ws = ws_validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
-            assert HTTPHeaderDict(json.loads(ws.recv()))['cookie'] == 'test=ytdlp'
+            assert json.loads(ws.recv())['cookie'] == 'test=ytdlp'
             ws.close()
             cookiejar.clear_session_cookies()
             ws = ws_validate_and_send(rh, Request(self.ws_base_url))
             ws.send('headers')
-            assert 'cookie' not in HTTPHeaderDict(json.loads(ws.recv()))
+            assert 'cookie' not in json.loads(ws.recv())
             ws.close()
 
     def test_source_address(self, handler):
@@ -341,14 +341,6 @@ class TestWebsSocketRequestHandlerConformance:
             assert headers['test3'] == 'test3'
             ws.close()
 
-    def test_keep_header_casing(self, handler):
-        with handler(headers=HTTPHeaderDict({'x-TeSt1': 'test'})) as rh:
-            ws = ws_validate_and_send(rh, Request(self.ws_base_url, headers={'x-TeSt2': 'test'}, extensions={'keep_header_casing': True}))
-            ws.send('headers')
-            headers = json.loads(ws.recv())
-            assert 'x-TeSt1' in headers
-            assert 'x-TeSt2' in headers
-
     @pytest.mark.parametrize('client_cert', (
         {'client_certificate': os.path.join(MTLS_CERT_DIR, 'clientwithkey.crt')},
         {

test/test_youtube_signature.py

@@ -78,61 +78,6 @@ _SIG_TESTS = [
         '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
         '0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xxAj7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJ2OySqa0q',
     ),
-    (
-        'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'AAOAOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7vgpDL0QwbdV06sCIEzpWqMGkFR20CFOS21Tp-7vj_EMu-m37KtXJoOy1',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
-    ),
 ]
 
 _NSIG_TESTS = [
@@ -256,66 +201,6 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
         'YWt1qdbe8SAfkoPHW5d', 'RrRjWQOJmBiP',
     ),
-    (
-        'https://www.youtube.com/s/player/9c6dfc4a/player_ias.vflset/en_US/base.js',
-        'jbu7ylIosQHyJyJV', 'uwI0ESiynAmhNg',
-    ),
-    (
-        'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
-        'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/d50f54ef/player_ias_tce.vflset/en_US/base.js',
-        'Ha7507LzRmH3Utygtj', 'XFTb2HoeOE5MHg',
-    ),
-    (
-        'https://www.youtube.com/s/player/074a8365/player_ias_tce.vflset/en_US/base.js',
-        'Ha7507LzRmH3Utygtj', 'ufTsrE0IVYrkl8v',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
-        'N5uAlLqm0eg1GyHO', 'dCBQOejdq5s-ww',
-    ),
-    (
-        'https://www.youtube.com/s/player/69f581a5/tv-player-ias.vflset/tv-player-ias.js',
-        '-qIP447rVlTTwaZjY', 'KNcGOksBAvwqQg',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
-        'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
-        'eWYu5d5YeY_4LyEDc', 'XJQqf-N7Xra3gg',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
-        'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias_tce.vflset/en_US/base.js',
-        'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/tv-player-ias.vflset/tv-player-ias.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
-        'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
-        'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
-    ),
 ]
 
 
@@ -329,8 +214,6 @@ class TestPlayerInfo(unittest.TestCase):
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js', 'e7567ecf'),
-            ('https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js', '643afba4'),
             # obsolete
             ('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
             ('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
@@ -363,51 +246,46 @@ def t_factory(name, sig_func, url_pattern):
     def make_tfunc(url, sig_input, expected_sig):
         m = url_pattern.match(url)
         assert m, f'{url!r} should follow URL format'
-        test_id = re.sub(r'[/.-]', '_', m.group('id') or m.group('compat_id'))
+        test_id = m.group('id')
 
         def test_func(self):
-            basename = f'player-{test_id}.js'
+            basename = f'player-{name}-{test_id}.js'
             fn = os.path.join(self.TESTDATA_DIR, basename)
 
             if not os.path.exists(fn):
                 urllib.request.urlretrieve(url, fn)
             with open(fn, encoding='utf-8') as testf:
                 jscode = testf.read()
-            self.assertEqual(sig_func(jscode, sig_input, url), expected_sig)
+            self.assertEqual(sig_func(jscode, sig_input), expected_sig)
 
         test_func.__name__ = f'test_{name}_js_{test_id}'
         setattr(TestSignature, test_func.__name__, test_func)
     return make_tfunc
 
 
-def signature(jscode, sig_input, player_url):
+def signature(jscode, sig_input):
-    func = YoutubeIE(FakeYDL())._parse_sig_js(jscode, player_url)
+    func = YoutubeIE(FakeYDL())._parse_sig_js(jscode)
     src_sig = (
         str(string.printable[:sig_input])
         if isinstance(sig_input, int) else sig_input)
     return func(src_sig)
 
 
-def n_sig(jscode, sig_input, player_url):
+def n_sig(jscode, sig_input):
     ie = YoutubeIE(FakeYDL())
-    funcname = ie._extract_n_function_name(jscode, player_url=player_url)
+    funcname = ie._extract_n_function_name(jscode)
     jsi = JSInterpreter(jscode)
-    func = jsi.extract_function_from_code(*ie._fixup_n_function_code(*jsi.extract_function_code(funcname), jscode, player_url))
+    func = jsi.extract_function_from_code(*ie._fixup_n_function_code(*jsi.extract_function_code(funcname)))
     return func([sig_input])
 
 
 make_sig_test = t_factory(
-    'signature', signature,
+    'signature', signature, re.compile(r'.*(?:-|/player/)(?P<id>[a-zA-Z0-9_-]+)(?:/.+\.js|(?:/watch_as3|/html5player)?\.[a-z]+)$'))
-    re.compile(r'''(?x)
-        .+(?:
-            /player/(?P<id>[a-zA-Z0-9_/.-]+)|
-            /html5player-(?:en_US-)?(?P<compat_id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?
-        )\.js$'''))
 for test_spec in _SIG_TESTS:
     make_sig_test(*test_spec)
 
 make_nsig_test = t_factory(
-    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_/.-]+)\.js$'))
+    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_-]+)/.+.js$'))
 for test_spec in _NSIG_TESTS:
     make_nsig_test(*test_spec)
 

test/testdata/plugin_packages/testpackage/yt_dlp_plugins/extractor/package.py

@@ -2,5 +2,4 @@ from yt_dlp.extractor.common import InfoExtractor
 
 
 class PackagePluginIE(InfoExtractor):
-    _VALID_URL = 'package'
     pass

test/testdata/reload_plugins/yt_dlp_plugins/extractor/normal.py

@@ -1,10 +0,0 @@
-from yt_dlp.extractor.common import InfoExtractor
-
-
-class NormalPluginIE(InfoExtractor):
-    _VALID_URL = 'normal'
-    REPLACED = True
-
-
-class _IgnoreUnderscorePluginIE(InfoExtractor):
-    pass

test/testdata/reload_plugins/yt_dlp_plugins/postprocessor/normal.py

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

test/testdata/yt_dlp_plugins/extractor/ignore.py

@@ -6,7 +6,6 @@ class IgnoreNotInAllPluginIE(InfoExtractor):
 
 
 class InAllPluginIE(InfoExtractor):
-    _VALID_URL = 'inallpluginie'
     pass
 
 

test/testdata/yt_dlp_plugins/extractor/normal.py

@@ -2,10 +2,8 @@ from yt_dlp.extractor.common import InfoExtractor
 
 
 class NormalPluginIE(InfoExtractor):
-    _VALID_URL = 'normalpluginie'
+    pass
-    REPLACED = False
 
 
 class _IgnoreUnderscorePluginIE(InfoExtractor):
-    _VALID_URL = 'ignoreunderscorepluginie'
     pass

test/testdata/yt_dlp_plugins/extractor/override.py

@@ -1,5 +0,0 @@
-from yt_dlp.extractor.generic import GenericIE
-
-
-class OverrideGenericIE(GenericIE, plugin_name='override'):
-    TEST_FIELD = 'override'

test/testdata/yt_dlp_plugins/extractor/overridetwo.py

@@ -1,5 +0,0 @@
-from yt_dlp.extractor.generic import GenericIE
-
-
-class _UnderscoreOverrideGenericIE(GenericIE, plugin_name='underscore-override'):
-    SECONDARY_TEST_FIELD = 'underscore-override'

test/testdata/yt_dlp_plugins/postprocessor/normal.py

@@ -2,4 +2,4 @@ from yt_dlp.postprocessor.common import PostProcessor
 
 
 class NormalPluginPP(PostProcessor):
-    REPLACED = False
+    pass

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

@@ -2,5 +2,4 @@ from yt_dlp.extractor.common import InfoExtractor
 
 
 class ZippedPluginIE(InfoExtractor):
-    _VALID_URL = 'zippedpluginie'
     pass

yt_dlp/YoutubeDL.py

@@ -30,18 +30,9 @@ from .compat import urllib_req_to_req
 from .cookies import CookieLoadError, LenientSimpleCookie, 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, import_extractors
+from .extractor import gen_extractor_classes, get_info_extractor
 from .extractor.common import UnsupportedURLIE
 from .extractor.openload import PhantomJSwrapper
-from .globals import (
-    IN_CLI,
-    LAZY_EXTRACTORS,
-    plugin_ies,
-    plugin_ies_overrides,
-    plugin_pps,
-    all_plugins_loaded,
-    plugin_dirs,
-)
 from .minicurses import format_text
 from .networking import HEADRequest, Request, RequestDirector
 from .networking.common import _REQUEST_HANDLERS, _RH_PREFERENCES
@@ -53,7 +44,8 @@ from .networking.exceptions import (
     network_exceptions,
 )
 from .networking.impersonate import ImpersonateRequestHandler
-from .plugins import directories as plugin_directories, load_all_plugins
+from .plugins import directories as plugin_directories
+from .postprocessor import _PLUGIN_CLASSES as plugin_pps
 from .postprocessor import (
     EmbedThumbnailPP,
     FFmpegFixupDuplicateMoovPP,
@@ -165,7 +157,7 @@ from .utils import (
     write_json_file,
     write_string,
 )
-from .utils._utils import _UnsafeExtensionError, _YDLLogger, _ProgressState
+from .utils._utils import _UnsafeExtensionError, _YDLLogger
 from .utils.networking import (
     HTTPHeaderDict,
     clean_headers,
@@ -291,10 +283,7 @@ class YoutubeDL:
     lazy_playlist:     Process playlist entries as they are received.
     matchtitle:        Download only matching titles.
     rejecttitle:       Reject downloads for matching titles.
-    logger:            A class having a `debug`, `warning` and `error` function where
+    logger:            Log messages to a logging.Logger instance.
-                       each has a single string parameter, the message to be logged.
-                       For compatibility reasons, both debug and info messages are passed to `debug`.
-                       A debug message will have a prefix of `[debug] ` to discern it from info messages.
     logtostderr:       Print everything to stderr instead of stdout.
     consoletitle:      Display progress in the console window's titlebar.
     writedescription:  Write the video description to a .description file
@@ -606,7 +595,7 @@ class YoutubeDL:
         # 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', 'aspect_ratio', 'resolution', 'dynamic_range', 'tbr', 'abr', 'acodec', 'asr', 'audio_channels',
-        'vbr', 'fps', 'vcodec', 'container', 'filesize', 'filesize_approx', 'rows', 'columns', 'hls_media_playlist_data',
+        'vbr', 'fps', 'vcodec', 'container', 'filesize', 'filesize_approx', 'rows', 'columns',
         'player_url', 'protocol', 'fragment_base_url', 'fragments', 'is_from_start', 'is_dash_periods', 'request_data',
         'preference', 'language', 'language_preference', 'quality', 'source_preference', 'cookies',
         'http_headers', 'stretched_ratio', 'no_resume', 'has_drm', 'extra_param_to_segment_url', 'extra_param_to_key_url',
@@ -650,15 +639,13 @@ class YoutubeDL:
         self.cache = Cache(self)
         self.__header_cookies = []
 
-        # compat for API: load plugins if they have not already
-        if not all_plugins_loaded.value:
-            load_all_plugins()
-
         stdout = sys.stderr if self.params.get('logtostderr') else sys.stdout
         self._out_files = Namespace(
             out=stdout,
             error=sys.stderr,
             screen=sys.stderr if self.params.get('quiet') else stdout,
+            console=None if os.name == 'nt' else next(
+                filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None),
         )
 
         try:
@@ -666,9 +653,6 @@ class YoutubeDL:
         except Exception as e:
             self.write_debug(f'Failed to enable VT mode: {e}')
 
-        # hehe "immutable" namespace
-        self._out_files.console = next(filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None)
-
         if self.params.get('no_color'):
             if self.params.get('color') is not None:
                 self.params.setdefault('_warnings', []).append(
@@ -969,22 +953,21 @@ class YoutubeDL:
             self._write_string(f'{self._bidi_workaround(message)}\n', self._out_files.error, only_once=only_once)
 
     def _send_console_code(self, code):
-        if not supports_terminal_sequences(self._out_files.console):
+        if os.name == 'nt' or not self._out_files.console:
-            return False
-        self._write_string(code, self._out_files.console)
-        return True
-
-    def to_console_title(self, message=None, progress_state=None, percent=None):
-        if not self.params.get('consoletitle'):
             return
+        self._write_string(code, self._out_files.console)
 
-        if message:
+    def to_console_title(self, message):
-            success = self._send_console_code(f'\033]0;{remove_terminal_sequences(message)}\007')
+        if not self.params.get('consoletitle', False):
-            if not success and os.name == 'nt' and ctypes.windll.kernel32.GetConsoleWindow():
+            return
-                ctypes.windll.kernel32.SetConsoleTitleW(message)
+        message = remove_terminal_sequences(message)
-
+        if os.name == 'nt':
-        if isinstance(progress_state, _ProgressState):
+            if ctypes.windll.kernel32.GetConsoleWindow():
-            self._send_console_code(progress_state.get_ansi_escape(percent))
+                # c_wchar_p() might not be necessary if `message` is
+                # already of type unicode()
+                ctypes.windll.kernel32.SetConsoleTitleW(ctypes.c_wchar_p(message))
+        else:
+            self._send_console_code(f'\033]0;{message}\007')
 
     def save_console_title(self):
         if not self.params.get('consoletitle') or self.params.get('simulate'):
@@ -998,7 +981,6 @@ class YoutubeDL:
 
     def __enter__(self):
         self.save_console_title()
-        self.to_console_title(progress_state=_ProgressState.INDETERMINATE)
         return self
 
     def save_cookies(self):
@@ -1007,7 +989,6 @@ class YoutubeDL:
 
     def __exit__(self, *args):
         self.restore_console_title()
-        self.to_console_title(progress_state=_ProgressState.HIDDEN)
         self.close()
 
     def close(self):
@@ -1342,7 +1323,7 @@ class YoutubeDL:
         elif (sys.platform != 'win32' and not self.params.get('restrictfilenames')
                 and self.params.get('windowsfilenames') is False):
             def sanitize(key, value):
-                return str(value).replace('/', '\u29F8').replace('\0', '')
+                return value.replace('/', '\u29F8').replace('\0', '')
         else:
             def sanitize(key, value):
                 return filename_sanitizer(key, value, restricted=self.params.get('restrictfilenames'))
@@ -2137,7 +2118,7 @@ class YoutubeDL:
         m = operator_rex.fullmatch(filter_spec)
         if m:
             try:
-                comparison_value = float(m.group('value'))
+                comparison_value = int(m.group('value'))
             except ValueError:
                 comparison_value = parse_filesize(m.group('value'))
                 if comparison_value is None:
@@ -4009,6 +3990,15 @@ 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_ies,
+            _PLUGIN_OVERRIDES as plugin_ie_overrides,
+        )
+
         def get_encoding(stream):
             ret = str(getattr(stream, 'encoding', f'missing ({type(stream).__name__})'))
             additional_info = []
@@ -4047,18 +4037,17 @@ class YoutubeDL:
             _make_label(ORIGIN, CHANNEL.partition('@')[2] or __version__, __version__),
             f'[{RELEASE_GIT_HEAD[:9]}]' if RELEASE_GIT_HEAD else '',
             '' if source == 'unknown' else f'({source})',
-            '' if IN_CLI.value else 'API' if klass == YoutubeDL else f'API:{self.__module__}.{klass.__qualname__}',
+            '' if _IN_CLI else 'API' if klass == YoutubeDL else f'API:{self.__module__}.{klass.__qualname__}',
             delim=' '))
 
-        if not IN_CLI.value:
+        if not _IN_CLI:
             write_debug(f'params: {self.params}')
 
-        import_extractors()
+        if not _LAZY_LOADER:
-        lazy_extractors = LAZY_EXTRACTORS.value
+            if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
-        if lazy_extractors is None:
-            write_debug('Lazy loading extractors is disabled')
-        elif not lazy_extractors:
                 write_debug('Lazy loading extractors is forcibly disabled')
+            else:
+                write_debug('Lazy loading extractors is disabled')
         if self.params['compat_opts']:
             write_debug('Compatibility options: {}'.format(', '.join(self.params['compat_opts'])))
 
@@ -4087,27 +4076,24 @@ class YoutubeDL:
 
         write_debug(f'Proxy map: {self.proxies}')
         write_debug(f'Request Handlers: {", ".join(rh.RH_NAME for rh in self._request_director.handlers.values())}')
+        if os.environ.get('YTDLP_NO_PLUGINS'):
+            write_debug('Plugins are forcibly disabled')
+            return
 
-        for plugin_type, plugins in (('Extractor', plugin_ies), ('Post-Processor', plugin_pps)):
+        for plugin_type, plugins in {'Extractor': plugin_ies, 'Post-Processor': plugin_pps}.items():
-            display_list = [
+            display_list = ['{}{}'.format(
-                klass.__name__ if klass.__name__ == name else f'{klass.__name__} as {name}'
+                klass.__name__, '' if klass.__name__ == name else f' as {name}')
-                for name, klass in plugins.value.items()]
+                for name, klass in plugins.items()]
             if plugin_type == 'Extractor':
                 display_list.extend(f'{plugins[-1].IE_NAME.partition("+")[2]} ({parent.__name__})'
-                                    for parent, plugins in plugin_ies_overrides.value.items())
+                                    for parent, plugins in plugin_ie_overrides.items())
             if not display_list:
                 continue
             write_debug(f'{plugin_type} Plugins: {", ".join(sorted(display_list))}')
 
-        plugin_dirs_msg = 'none'
+        plugin_dirs = plugin_directories()
-        if not plugin_dirs.value:
+        if plugin_dirs:
-            plugin_dirs_msg = 'none (disabled)'
+            write_debug(f'Plugin directories: {plugin_dirs}')
-        else:
-            found_plugin_directories = plugin_directories()
-            if found_plugin_directories:
-                plugin_dirs_msg = ', '.join(found_plugin_directories)
-
-        write_debug(f'Plugin directories: {plugin_dirs_msg}')
 
     @functools.cached_property
     def proxies(self):
@@ -4152,7 +4138,7 @@ class YoutubeDL:
             (target, rh.RH_NAME)
             for rh in self._request_director.handlers.values()
             if isinstance(rh, ImpersonateRequestHandler)
-            for target in reversed(rh.supported_targets)
+            for target in rh.supported_targets
         ]
 
     def _impersonate_target_available(self, target):

yt_dlp/__init__.py

@@ -19,9 +19,7 @@ from .downloader.external import get_external_downloader
 from .extractor import list_extractor_classes
 from .extractor.adobepass import MSO_INFO
 from .networking.impersonate import ImpersonateTarget
-from .globals import IN_CLI, plugin_dirs
 from .options import parseOpts
-from .plugins import load_all_plugins as _load_all_plugins
 from .postprocessor import (
     FFmpegExtractAudioPP,
     FFmpegMergerPP,
@@ -35,6 +33,7 @@ from .postprocessor import (
 )
 from .update import Updater
 from .utils import (
+    Config,
     NO_DEFAULT,
     POSTPROCESS_WHEN,
     DateRange,
@@ -67,6 +66,8 @@ from .utils.networking import std_headers
 from .utils._utils import _UnsafeExtensionError
 from .YoutubeDL import YoutubeDL
 
+_IN_CLI = False
+
 
 def _exit(status=0, *args):
     for msg in args:
@@ -260,11 +261,9 @@ def validate_options(opts):
         elif value in ('inf', 'infinite'):
             return float('inf')
         try:
-            int_value = int(value)
+            return int(value)
         except (TypeError, ValueError):
             validate(False, f'{name} retry count', value)
-        validate_positive(f'{name} retry count', int_value)
-        return int_value
 
     opts.retries = parse_retries('download', opts.retries)
     opts.fragment_retries = parse_retries('fragment', opts.fragment_retries)
@@ -294,20 +293,18 @@ def validate_options(opts):
             raise ValueError(f'invalid {key} retry sleep expression {expr!r}')
 
     # Bytes
-    def validate_bytes(name, value, strict_positive=False):
+    def validate_bytes(name, value):
         if value is None:
             return None
         numeric_limit = parse_bytes(value)
-        validate(numeric_limit is not None, name, value)
+        validate(numeric_limit is not None, 'rate limit', value)
-        if strict_positive:
-            validate_positive(name, numeric_limit, True)
         return numeric_limit
 
-    opts.ratelimit = validate_bytes('rate limit', opts.ratelimit, True)
+    opts.ratelimit = validate_bytes('rate limit', opts.ratelimit)
     opts.throttledratelimit = validate_bytes('throttled rate limit', opts.throttledratelimit)
     opts.min_filesize = validate_bytes('min filesize', opts.min_filesize)
     opts.max_filesize = validate_bytes('max filesize', opts.max_filesize)
-    opts.buffersize = validate_bytes('buffer size', opts.buffersize, True)
+    opts.buffersize = validate_bytes('buffer size', opts.buffersize)
     opts.http_chunk_size = validate_bytes('http chunk size', opts.http_chunk_size)
 
     # Output templates
@@ -432,10 +429,6 @@ def validate_options(opts):
     }
 
     # Other options
-    opts.plugin_dirs = opts.plugin_dirs
-    if opts.plugin_dirs is None:
-        opts.plugin_dirs = ['default']
-
     if opts.playlist_items is not None:
         try:
             tuple(PlaylistEntries.parse_playlist_items(opts.playlist_items))
@@ -976,6 +969,11 @@ def _real_main(argv=None):
 
     parser, opts, all_urls, ydl_opts = parse_options(argv)
 
+    # HACK: Set the plugin dirs early on
+    # TODO(coletdjnz): remove when plugin globals system is implemented
+    if opts.plugin_dirs is not None:
+        Config._plugin_dirs = list(map(expand_path, opts.plugin_dirs))
+
     # Dump user agent
     if opts.dump_user_agent:
         ua = traverse_obj(opts.headers, 'User-Agent', casesense=False, default=std_headers['User-Agent'])
@@ -990,11 +988,6 @@ def _real_main(argv=None):
     if opts.ffmpeg_location:
         FFmpegPostProcessor._ffmpeg_location.set(opts.ffmpeg_location)
 
-    # load all plugins into the global lookup
-    plugin_dirs.value = opts.plugin_dirs
-    if plugin_dirs.value:
-        _load_all_plugins()
-
     with YoutubeDL(ydl_opts) as ydl:
         pre_process = opts.update_self or opts.rm_cachedir
         actual_use = all_urls or opts.load_info_filename
@@ -1021,9 +1014,8 @@ def _real_main(argv=None):
                 # List of simplified targets we know are supported,
                 # to help users know what dependencies may be required.
                 (ImpersonateTarget('chrome'), 'curl_cffi'),
-                (ImpersonateTarget('safari'), 'curl_cffi'),
-                (ImpersonateTarget('firefox'), 'curl_cffi>=0.10'),
                 (ImpersonateTarget('edge'), 'curl_cffi'),
+                (ImpersonateTarget('safari'), 'curl_cffi'),
             ]
 
             available_targets = ydl._get_available_impersonate_targets()
@@ -1039,12 +1031,12 @@ def _real_main(argv=None):
 
             for known_target, known_handler in known_targets:
                 if not any(
-                    known_target in target and known_handler.startswith(handler)
+                    known_target in target and handler == known_handler
                     for target, handler in available_targets
                 ):
-                    rows.insert(0, [
+                    rows.append([
                         ydl._format_out(text, ydl.Styles.SUPPRESS)
-                        for text in make_row(known_target, f'{known_handler} (unavailable)')
+                        for text in make_row(known_target, f'{known_handler} (not available)')
                     ])
 
             ydl.to_screen('[info] Available impersonate targets')
@@ -1095,7 +1087,8 @@ def _real_main(argv=None):
 
 
 def main(argv=None):
-    IN_CLI.value = True
+    global _IN_CLI
+    _IN_CLI = True
     try:
         _exit(*variadic(_real_main(argv)))
     except (CookieLoadError, DownloadError):

yt_dlp/aes.py

@@ -83,7 +83,7 @@ def aes_ecb_encrypt(data, key, iv=None):
     @returns {int[]}           encrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
+    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
 
     encrypted_data = []
     for i in range(block_count):
@@ -103,7 +103,7 @@ def aes_ecb_decrypt(data, key, iv=None):
     @returns {int[]}           decrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
+    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
 
     encrypted_data = []
     for i in range(block_count):
@@ -134,7 +134,7 @@ def aes_ctr_encrypt(data, key, iv):
     @returns {int[]}           encrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
+    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
     counter = iter_vector(iv)
 
     encrypted_data = []
@@ -158,7 +158,7 @@ def aes_cbc_decrypt(data, key, iv):
     @returns {int[]}           decrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
+    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
 
     decrypted_data = []
     previous_cipher_block = iv
@@ -183,7 +183,7 @@ def aes_cbc_encrypt(data, key, iv, *, padding_mode='pkcs7'):
     @returns {int[]}           encrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
+    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
 
     encrypted_data = []
     previous_cipher_block = iv

yt_dlp/downloader/__init__.py

@@ -30,12 +30,11 @@ from .hls import HlsFD
 from .http import HttpFD
 from .ism import IsmFD
 from .mhtml import MhtmlFD
-from .niconico import NiconicoLiveFD
+from .niconico import NiconicoDmcFD, NiconicoLiveFD
 from .rtmp import RtmpFD
 from .rtsp import RtspFD
 from .websocket import WebSocketFragmentFD
 from .youtube_live_chat import YoutubeLiveChatFD
-from .bunnycdn import BunnyCdnFD
 
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,
@@ -50,12 +49,12 @@ PROTOCOL_MAP = {
     'http_dash_segments_generator': DashSegmentsFD,
     'ism': IsmFD,
     'mhtml': MhtmlFD,
+    'niconico_dmc': NiconicoDmcFD,
     'niconico_live': NiconicoLiveFD,
     'fc2_live': FC2LiveFD,
     'websocket_frag': WebSocketFragmentFD,
     'youtube_live_chat': YoutubeLiveChatFD,
     'youtube_live_chat_replay': YoutubeLiveChatFD,
-    'bunnycdn': BunnyCdnFD,
 }
 
 
@@ -66,6 +65,7 @@ def shorten_protocol_name(proto, simplify=False):
         'rtmp_ffmpeg': 'rtmpF',
         'http_dash_segments': 'dash',
         'http_dash_segments_generator': 'dashG',
+        'niconico_dmc': 'dmc',
         'websocket_frag': 'WSfrag',
     }
     if simplify:

yt_dlp/downloader/bunnycdn.py

@@ -1,50 +0,0 @@
-import hashlib
-import random
-import threading
-
-from .common import FileDownloader
-from . import HlsFD
-from ..networking import Request
-from ..networking.exceptions import network_exceptions
-
-
-class BunnyCdnFD(FileDownloader):
-    """
-    Downloads from BunnyCDN with required pings
-    Note, this is not a part of public API, and will be removed without notice.
-    DO NOT USE
-    """
-
-    def real_download(self, filename, info_dict):
-        self.to_screen(f'[{self.FD_NAME}] Downloading from BunnyCDN')
-
-        fd = HlsFD(self.ydl, self.params)
-
-        stop_event = threading.Event()
-        ping_thread = threading.Thread(target=self.ping_thread, args=(stop_event,), kwargs=info_dict['_bunnycdn_ping_data'])
-        ping_thread.start()
-
-        try:
-            return fd.real_download(filename, info_dict)
-        finally:
-            stop_event.set()
-
-    def ping_thread(self, stop_event, url, headers, secret, context_id):
-        # Site sends ping every 4 seconds, but this throttles the download. Pinging every 2 seconds seems to work.
-        ping_interval = 2
-        # Hard coded resolution as it doesn't seem to matter
-        res = 1080
-        paused = 'false'
-        current_time = 0
-
-        while not stop_event.wait(ping_interval):
-            current_time += ping_interval
-
-            time = current_time + round(random.random(), 6)
-            md5_hash = hashlib.md5(f'{secret}_{context_id}_{time}_{paused}_{res}'.encode()).hexdigest()
-            ping_url = f'{url}?hash={md5_hash}&time={time}&paused={paused}&resolution={res}'
-
-            try:
-                self.ydl.urlopen(Request(ping_url, headers=headers)).read()
-            except network_exceptions as e:
-                self.to_screen(f'[{self.FD_NAME}] Ping failed: {e}')

yt_dlp/downloader/common.py

@@ -31,7 +31,6 @@ from ..utils import (
     timetuple_from_msec,
     try_call,
 )
-from ..utils._utils import _ProgressState
 
 
 class FileDownloader:
@@ -334,7 +333,7 @@ class FileDownloader:
             progress_dict), s.get('progress_idx') or 0)
         self.to_console_title(self.ydl.evaluate_outtmpl(
             progress_template.get('download-title') or 'yt-dlp %(progress._default_template)s',
-            progress_dict), _ProgressState.from_dict(s), s.get('_percent'))
+            progress_dict))
 
     def _format_progress(self, *args, **kwargs):
         return self.ydl._format_text(
@@ -358,7 +357,6 @@ class FileDownloader:
                 '_speed_str': self.format_speed(speed).strip(),
                 '_total_bytes_str': _format_bytes('total_bytes'),
                 '_elapsed_str': self.format_seconds(s.get('elapsed')),
-                '_percent': 100.0,
                 '_percent_str': self.format_percent(100),
             })
             self._report_progress_status(s, join_nonempty(
@@ -377,15 +375,13 @@ class FileDownloader:
                     return
                 self._progress_delta_time += update_delta
 
-        progress = 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)
         s.update({
             '_eta_str': self.format_eta(s.get('eta')).strip(),
             '_speed_str': self.format_speed(s.get('speed')),
-            '_percent': progress,
+            '_percent_str': self.format_percent(try_call(
-            '_percent_str': self.format_percent(progress),
+                lambda: 100 * s['downloaded_bytes'] / s['total_bytes'],
+                lambda: 100 * s['downloaded_bytes'] / s['total_bytes_estimate'],
+                lambda: s['downloaded_bytes'] == 0 and 0)),
             '_total_bytes_str': _format_bytes('total_bytes'),
             '_total_bytes_estimate_str': _format_bytes('total_bytes_estimate'),
             '_downloaded_bytes_str': _format_bytes('downloaded_bytes'),

yt_dlp/downloader/external.py

@@ -457,6 +457,8 @@ class FFmpegFD(ExternalFD):
 
     @classmethod
     def available(cls, path=None):
+        # TODO: Fix path for ffmpeg
+        # Fixme: This may be wrong when --ffmpeg-location is used
         return FFmpegPostProcessor().available
 
     def on_process_started(self, proc, stdin):

yt_dlp/downloader/hls.py

@@ -16,7 +16,6 @@ from ..utils import (
     update_url_query,
     urljoin,
 )
-from ..utils._utils import _request_dump_filename
 
 
 class HlsFD(FragmentFD):
@@ -73,23 +72,11 @@ class HlsFD(FragmentFD):
 
     def real_download(self, filename, info_dict):
         man_url = info_dict['url']
-
-        s = info_dict.get('hls_media_playlist_data')
-        if s:
-            self.to_screen(f'[{self.FD_NAME}] Using m3u8 manifest from extracted info')
-        else:
         self.to_screen(f'[{self.FD_NAME}] Downloading m3u8 manifest')
+
         urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
         man_url = urlh.url
-            s_bytes = urlh.read()
+        s = urlh.read().decode('utf-8', 'ignore')
-            if self.params.get('write_pages'):
-                dump_filename = _request_dump_filename(
-                    man_url, info_dict['id'], None,
-                    trim_length=self.params.get('trim_file_name'))
-                self.to_screen(f'[{self.FD_NAME}] Saving request to {dump_filename}')
-                with open(dump_filename, 'wb') as outf:
-                    outf.write(s_bytes)
-            s = s_bytes.decode('utf-8', 'ignore')
 
         can_download, message = self.can_download(s, info_dict, self.params.get('allow_unplayable_formats')), None
         if can_download:
@@ -190,7 +177,6 @@ class HlsFD(FragmentFD):
         if external_aes_iv:
             external_aes_iv = binascii.unhexlify(remove_start(external_aes_iv, '0x').zfill(32))
         byte_range = {}
-        byte_range_offset = 0
         discontinuity_count = 0
         frag_index = 0
         ad_frag_next = False
@@ -218,11 +204,6 @@ class HlsFD(FragmentFD):
                     })
                     media_sequence += 1
 
-                    # If the byte_range is truthy, reset it after appending a fragment that uses it
-                    if byte_range:
-                        byte_range_offset = byte_range['end']
-                        byte_range = {}
-
                 elif line.startswith('#EXT-X-MAP'):
                     if format_index and discontinuity_count != format_index:
                         continue
@@ -236,12 +217,10 @@ class HlsFD(FragmentFD):
                     if extra_segment_query:
                         frag_url = update_url_query(frag_url, extra_segment_query)
 
-                    map_byte_range = {}
-
                     if map_info.get('BYTERANGE'):
                         splitted_byte_range = map_info.get('BYTERANGE').split('@')
-                        sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else 0
+                        sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else byte_range['end']
-                        map_byte_range = {
+                        byte_range = {
                             'start': sub_range_start,
                             'end': sub_range_start + int(splitted_byte_range[0]),
                         }
@@ -250,7 +229,7 @@ class HlsFD(FragmentFD):
                         'frag_index': frag_index,
                         'url': frag_url,
                         'decrypt_info': decrypt_info,
-                        'byte_range': map_byte_range,
+                        'byte_range': byte_range,
                         'media_sequence': media_sequence,
                     })
                     media_sequence += 1
@@ -278,7 +257,7 @@ class HlsFD(FragmentFD):
                     media_sequence = int(line[22:])
                 elif line.startswith('#EXT-X-BYTERANGE'):
                     splitted_byte_range = line[17:].split('@')
-                    sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else byte_range_offset
+                    sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else byte_range['end']
                     byte_range = {
                         'start': sub_range_start,
                         'end': sub_range_start + int(splitted_byte_range[0]),

yt_dlp/downloader/niconico.py

@@ -2,12 +2,60 @@ import json
 import threading
 import time
 
+from . import get_suitable_downloader
 from .common import FileDownloader
 from .external import FFmpegFD
 from ..networking import Request
 from ..utils import DownloadError, str_or_none, try_get
 
 
+class NiconicoDmcFD(FileDownloader):
+    """ Downloading niconico douga from DMC with heartbeat """
+
+    def real_download(self, filename, info_dict):
+        from ..extractor.niconico import NiconicoIE
+
+        self.to_screen(f'[{self.FD_NAME}] Downloading from DMC')
+        ie = NiconicoIE(self.ydl)
+        info_dict, heartbeat_info_dict = ie._get_heartbeat_info(info_dict)
+
+        fd = get_suitable_downloader(info_dict, params=self.params)(self.ydl, self.params)
+
+        success = download_complete = False
+        timer = [None]
+        heartbeat_lock = threading.Lock()
+        heartbeat_url = heartbeat_info_dict['url']
+        heartbeat_data = heartbeat_info_dict['data'].encode()
+        heartbeat_interval = heartbeat_info_dict.get('interval', 30)
+
+        request = Request(heartbeat_url, heartbeat_data)
+
+        def heartbeat():
+            try:
+                self.ydl.urlopen(request).read()
+            except Exception:
+                self.to_screen(f'[{self.FD_NAME}] Heartbeat failed')
+
+            with heartbeat_lock:
+                if not download_complete:
+                    timer[0] = threading.Timer(heartbeat_interval, heartbeat)
+                    timer[0].start()
+
+        heartbeat_info_dict['ping']()
+        self.to_screen('[%s] Heartbeat with %d second interval ...' % (self.FD_NAME, heartbeat_interval))
+        try:
+            heartbeat()
+            if type(fd).__name__ == 'HlsFD':
+                info_dict.update(ie._extract_m3u8_formats(info_dict['url'], info_dict['id'])[0])
+            success = fd.real_download(filename, info_dict)
+        finally:
+            if heartbeat_lock:
+                with heartbeat_lock:
+                    timer[0].cancel()
+                    download_complete = True
+        return success
+
+
 class NiconicoLiveFD(FileDownloader):
     """ Downloads niconico live without being stopped """
 
@@ -37,7 +85,6 @@ class NiconicoLiveFD(FileDownloader):
                             'quality': live_quality,
                             'protocol': 'hls+fmp4',
                             'latency': live_latency,
-                            'accessRightMethod': 'single_cookie',
                             'chasePlay': False,
                         },
                         'room': {

yt_dlp/extractor/__init__.py

@@ -1,25 +1,16 @@
 from ..compat.compat_utils import passthrough_module
-from ..globals import extractors as _extractors_context
-from ..globals import plugin_ies as _plugin_ies_context
-from ..plugins import PluginSpec, register_plugin_spec
 
 passthrough_module(__name__, '.extractors')
 del passthrough_module
 
-register_plugin_spec(PluginSpec(
-    module_name='extractor',
-    suffix='IE',
-    destination=_extractors_context,
-    plugin_destination=_plugin_ies_context,
-))
-
 
 def gen_extractor_classes():
     """ Return a list of supported extractors.
     The order does matter; the first extractor matched is the one handling the URL.
     """
-    import_extractors()
+    from .extractors import _ALL_CLASSES
-    return list(_extractors_context.value.values())
+
+    return _ALL_CLASSES
 
 
 def gen_extractors():
@@ -46,9 +37,6 @@ def list_extractors(age_limit=None):
 
 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""
-    import_extractors()
+    from . import extractors
-    return _extractors_context.value[f'{ie_name}IE']
 
-
+    return getattr(extractors, f'{ie_name}IE')
-def import_extractors():
-    from . import extractors  # noqa: F401

yt_dlp/extractor/_extractors.py

@@ -256,7 +256,6 @@ from .bilibili import (
     BilibiliCheeseIE,
     BilibiliCheeseSeasonIE,
     BilibiliCollectionListIE,
-    BiliBiliDynamicIE,
     BilibiliFavoritesListIE,
     BiliBiliIE,
     BiliBiliPlayerIE,
@@ -312,7 +311,6 @@ from .brilliantpala import (
 )
 from .bundesliga import BundesligaIE
 from .bundestag import BundestagIE
-from .bunnycdn import BunnyCdnIE
 from .businessinsider import BusinessInsiderIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
@@ -336,7 +334,6 @@ from .canal1 import Canal1IE
 from .canalalpha import CanalAlphaIE
 from .canalc2 import Canalc2IE
 from .canalplus import CanalplusIE
-from .canalsurmas import CanalsurmasIE
 from .caracoltv import CaracolTvPlayIE
 from .cartoonnetwork import CartoonNetworkIE
 from .cbc import (
@@ -443,6 +440,12 @@ from .crowdbunker import (
     CrowdBunkerIE,
 )
 from .crtvg import CrtvgIE
+from .crunchyroll import (
+    CrunchyrollArtistIE,
+    CrunchyrollBetaIE,
+    CrunchyrollBetaShowIE,
+    CrunchyrollMusicIE,
+)
 from .cspan import (
     CSpanCongressIE,
     CSpanIE,
@@ -456,10 +459,7 @@ from .curiositystream import (
     CuriosityStreamIE,
     CuriosityStreamSeriesIE,
 )
-from .cwtv import (
+from .cwtv import CWTVIE
-    CWTVIE,
-    CWTVMovieIE,
-)
 from .cybrary import (
     CybraryCourseIE,
     CybraryIE,
@@ -496,6 +496,10 @@ from .daum import (
 from .daystar import DaystarClipIE
 from .dbtv import DBTVIE
 from .dctp import DctpTvIE
+from .deezer import (
+    DeezerAlbumIE,
+    DeezerPlaylistIE,
+)
 from .democracynow import DemocracynowIE
 from .detik import DetikEmbedIE
 from .deuxm import (
@@ -506,7 +510,6 @@ from .dfb import DFBIE
 from .dhm import DHMIE
 from .digitalconcerthall import DigitalConcertHallIE
 from .digiteka import DigitekaIE
-from .digiview import DigiviewIE
 from .discogs import DiscogsReleasePlaylistIE
 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
@@ -552,7 +555,6 @@ from .dropout import (
     DropoutIE,
     DropoutSeasonIE,
 )
-from .drtalks import DrTalksIE
 from .drtuber import DrTuberIE
 from .drtv import (
     DRTVIE,
@@ -582,10 +584,6 @@ from .egghead import (
     EggheadCourseIE,
     EggheadLessonIE,
 )
-from .eggs import (
-    EggsArtistIE,
-    EggsIE,
-)
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elementorembed import ElementorEmbedIE
@@ -683,7 +681,6 @@ from .foxnews import (
 )
 from .foxsports import FoxSportsIE
 from .fptplay import FptplayIE
-from .francaisfacile import FrancaisFacileIE
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,
@@ -702,6 +699,11 @@ from .frontendmasters import (
     FrontendMastersLessonIE,
 )
 from .fujitv import FujiTVFODPlus7IE
+from .funimation import (
+    FunimationIE,
+    FunimationPageIE,
+    FunimationShowIE,
+)
 from .funk import FunkIE
 from .funker530 import Funker530IE
 from .fuyintv import FuyinTVIE
@@ -840,7 +842,6 @@ from .icareus import IcareusIE
 from .ichinanalive import (
     IchinanaLiveClipIE,
     IchinanaLiveIE,
-    IchinanaLiveVODIE,
 )
 from .idolplus import IdolPlusIE
 from .ign import (
@@ -903,7 +904,6 @@ from .ivi import (
     IviIE,
 )
 from .ivideon import IvideonIE
-from .ivoox import IvooxIE
 from .iwara import (
     IwaraIE,
     IwaraPlaylistIE,
@@ -961,10 +961,7 @@ from .kick import (
 )
 from .kicker import KickerIE
 from .kickstarter import KickStarterIE
-from .kika import (
+from .kika import KikaIE
-    KikaIE,
-    KikaPlaylistIE,
-)
 from .kinja import KinjaEmbedIE
 from .kinopoisk import KinoPoiskIE
 from .kommunetv import KommunetvIE
@@ -1042,7 +1039,6 @@ from .limelight import (
     LimelightMediaIE,
 )
 from .linkedin import (
-    LinkedInEventsIE,
     LinkedInIE,
     LinkedInLearningCourseIE,
     LinkedInLearningIE,
@@ -1058,7 +1054,6 @@ from .livestream import (
 )
 from .livestreamfails import LivestreamfailsIE
 from .lnk import LnkIE
-from .loco import LocoIE
 from .loom import (
     LoomFolderIE,
     LoomIE,
@@ -1066,7 +1061,6 @@ from .loom import (
 from .lovehomeporn import LoveHomePornIE
 from .lrt import (
     LRTVODIE,
-    LRTRadioIE,
     LRTStreamIE,
 )
 from .lsm import (
@@ -1284,10 +1278,6 @@ from .nebula import (
 )
 from .nekohacker import NekoHackerIE
 from .nerdcubed import NerdCubedFeedIE
-from .nest import (
-    NestClipIE,
-    NestIE,
-)
 from .neteasemusic import (
     NetEaseMusicAlbumIE,
     NetEaseMusicDjRadioIE,
@@ -1499,10 +1489,6 @@ from .paramountplus import (
 )
 from .parler import ParlerIE
 from .parlview import ParlviewIE
-from .parti import (
-    PartiLivestreamIE,
-    PartiVideoIE,
-)
 from .patreon import (
     PatreonCampaignIE,
     PatreonIE,
@@ -1546,10 +1532,6 @@ from .pinterest import (
     PinterestCollectionIE,
     PinterestIE,
 )
-from .piramidetv import (
-    PiramideTVChannelIE,
-    PiramideTVIE,
-)
 from .pixivsketch import (
     PixivSketchIE,
     PixivSketchUserIE,
@@ -1569,7 +1551,6 @@ from .pluralsight import (
     PluralsightIE,
 )
 from .plutotv import PlutoTVIE
-from .plvideo import PlVideoIE
 from .podbayfm import (
     PodbayFMChannelIE,
     PodbayFMIE,
@@ -1749,7 +1730,6 @@ from .roosterteeth import (
     RoosterTeethSeriesIE,
 )
 from .rottentomatoes import RottenTomatoesIE
-from .roya import RoyaLiveIE
 from .rozhlas import (
     MujRozhlasIE,
     RozhlasIE,
@@ -1784,6 +1764,7 @@ from .rtvcplay import (
 from .rtve import (
     RTVEALaCartaIE,
     RTVEAudioIE,
+    RTVEInfantilIE,
     RTVELiveIE,
     RTVETelevisionIE,
 )
@@ -1892,8 +1873,6 @@ from .skyit import (
     SkyItVideoIE,
     SkyItVideoLiveIE,
     TV8ItIE,
-    TV8ItLiveIE,
-    TV8ItPlaylistIE,
 )
 from .skylinewebcams import SkylineWebcamsIE
 from .skynewsarabia import (
@@ -1907,7 +1886,6 @@ from .slutload import SlutloadIE
 from .smotrim import SmotrimIE
 from .snapchat import SnapchatSpotlightIE
 from .snotr import SnotrIE
-from .softwhiteunderbelly import SoftWhiteUnderbellyIE
 from .sohu import (
     SohuIE,
     SohuVIE,
@@ -1997,17 +1975,12 @@ from .storyfire import (
     StoryFireSeriesIE,
     StoryFireUserIE,
 )
-from .streaks import StreaksIE
 from .streamable import StreamableIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE
 from .stripchat import StripchatIE
 from .stv import STVPlayerIE
-from .subsplash import (
-    SubsplashIE,
-    SubsplashPlaylistIE,
-)
 from .substack import SubstackIE
 from .sunporno import SunPornoIE
 from .sverigesradio import (
@@ -2237,10 +2210,6 @@ from .tvplay import (
     TVPlayIE,
 )
 from .tvplayer import TVPlayerIE
-from .tvw import (
-    TvwIE,
-    TvwTvChannelsIE,
-)
 from .tweakers import TweakersIE
 from .twentymin import TwentyMinutenIE
 from .twentythreevideo import TwentyThreeVideoIE
@@ -2364,6 +2333,10 @@ from .viewlift import (
     ViewLiftIE,
 )
 from .viidea import ViideaIE
+from .viki import (
+    VikiChannelIE,
+    VikiIE,
+)
 from .vimeo import (
     VHXEmbedIE,
     VimeoAlbumIE,
@@ -2381,6 +2354,10 @@ from .vimm import (
     VimmIE,
     VimmRecordingIE,
 )
+from .vine import (
+    VineIE,
+    VineUserIE,
+)
 from .viously import ViouslyIE
 from .viqeo import ViqeoIE
 from .viu import (
@@ -2408,15 +2385,10 @@ from .voxmedia import (
     VoxMediaIE,
     VoxMediaVolumeIE,
 )
-from .vrsquare import (
-    VrSquareChannelIE,
-    VrSquareIE,
-    VrSquareSearchIE,
-    VrSquareSectionIE,
-)
 from .vrt import (
     VRTIE,
     DagelijkseKostIE,
+    KetnetIE,
     Radio1BeIE,
     VrtNUIE,
 )

yt_dlp/extractor/abematv.py

@@ -21,7 +21,6 @@ from ..utils import (
     int_or_none,
     time_seconds,
     traverse_obj,
-    update_url,
     update_url_query,
 )
 
@@ -418,23 +417,18 @@ class AbemaTVIE(AbemaTVBaseIE):
             'is_live': is_live,
             'availability': availability,
         })
-
-        if thumbnail := update_url(self._og_search_thumbnail(webpage, default=''), query=None):
-            info['thumbnails'] = [{'url': thumbnail}]
-
         return info
 
 
 class AbemaTVTitleIE(AbemaTVBaseIE):
-    _VALID_URL = r'https?://abema\.tv/video/title/(?P<id>[^?/#]+)/?(?:\?(?:[^#]+&)?s=(?P<season>[^&#]+))?'
+    _VALID_URL = r'https?://abema\.tv/video/title/(?P<id>[^?/]+)'
     _PAGE_SIZE = 25
 
     _TESTS = [{
-        'url': 'https://abema.tv/video/title/90-1887',
+        'url': 'https://abema.tv/video/title/90-1597',
         'info_dict': {
-            'id': '90-1887',
+            'id': '90-1597',
             'title': 'シャッフルアイランド',
-            'description': 'md5:61b2425308f41a5282a926edda66f178',
         },
         'playlist_mincount': 2,
     }, {
@@ -442,54 +436,41 @@ class AbemaTVTitleIE(AbemaTVBaseIE):
         'info_dict': {
             'id': '193-132',
             'title': '真心が届く~僕とスターのオフィス・ラブ!?~',
-            'description': 'md5:9b59493d1f3a792bafbc7319258e7af8',
         },
         'playlist_mincount': 16,
     }, {
-        'url': 'https://abema.tv/video/title/25-1nzan-whrxe',
+        'url': 'https://abema.tv/video/title/25-102',
         'info_dict': {
-            'id': '25-1nzan-whrxe',
+            'id': '25-102',
-            'title': 'ソードアート・オンライン',
+            'title': 'ソードアート・オンライン アリシゼーション',
-            'description': 'md5:c094904052322e6978495532bdbf06e6',
         },
-        'playlist_mincount': 25,
+        'playlist_mincount': 24,
-    }, {
-        'url': 'https://abema.tv/video/title/26-2mzbynr-cph?s=26-2mzbynr-cph_s40',
-        'info_dict': {
-            'title': '〈物語〉シリーズ',
-            'id': '26-2mzbynr-cph',
-            'description': 'md5:e67873de1c88f360af1f0a4b84847a52',
-        },
-        'playlist_count': 59,
     }]
 
-    def _fetch_page(self, playlist_id, series_version, season_id, page):
+    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),
-        }
+            })
-        if season_id:
-            query['seasonId'] = season_id
-        programs = self._call_api(
-            f'v1/video/series/{playlist_id}/programs', playlist_id,
-            note=f'Downloading page {page + 1}',
-            query=query)
         yield from (
             self.url_result(f'https://abema.tv/video/episode/{x}')
             for x in traverse_obj(programs, ('programs', ..., 'id')))
 
-    def _entries(self, playlist_id, series_version, season_id):
+    def _entries(self, playlist_id, series_version):
         return OnDemandPagedList(
-            functools.partial(self._fetch_page, playlist_id, series_version, season_id),
+            functools.partial(self._fetch_page, playlist_id, series_version),
             self._PAGE_SIZE)
 
     def _real_extract(self, url):
-        playlist_id, season_id = self._match_valid_url(url).group('id', 'season')
+        playlist_id = self._match_id(url)
         series_info = self._call_api(f'v1/video/series/{playlist_id}', playlist_id)
 
         return self.playlist_result(
-            self._entries(playlist_id, series_info['version'], season_id), playlist_id=playlist_id,
+            self._entries(playlist_id, series_info['version']), playlist_id=playlist_id,
             playlist_title=series_info.get('title'),
             playlist_description=series_info.get('content'))

yt_dlp/extractor/acast.py

@@ -43,14 +43,14 @@ class ACastIE(ACastBaseIE):
     _VALID_URL = r'''(?x:
                     https?://
                         (?:
-                            (?:(?:embed|www|shows)\.)?acast\.com/|
+                            (?:(?:embed|www)\.)?acast\.com/|
                             play\.acast\.com/s/
                         )
-                        (?P<channel>[^/?#]+)/(?:episodes/)?(?P<id>[^/#?"]+)
+                        (?P<channel>[^/]+)/(?P<id>[^/#?"]+)
                     )'''
     _EMBED_REGEX = [rf'(?x)<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL})']
     _TESTS = [{
-        'url': 'https://shows.acast.com/sparpodcast/episodes/2.raggarmordet-rosterurdetforflutna',
+        'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',
         'info_dict': {
             'id': '2a92b283-1a75-4ad8-8396-499c641de0d9',
             'ext': 'mp3',
@@ -59,7 +59,7 @@ class ACastIE(ACastBaseIE):
             'timestamp': 1477346700,
             'upload_date': '20161024',
             'duration': 2766,
-            'creators': ['Third Ear Studio'],
+            'creator': 'Third Ear Studio',
             'series': 'Spår',
             'episode': '2. Raggarmordet - Röster ur det förflutna',
             'thumbnail': 'https://assets.pippa.io/shows/616ebe1886d7b1398620b943/616ebe33c7e6e70013cae7da.jpg',
@@ -74,9 +74,6 @@ class ACastIE(ACastBaseIE):
     }, {
         'url': 'https://play.acast.com/s/rattegangspodden/s04e09styckmordetihelenelund-del2-2',
         'only_matching': True,
-    }, {
-        'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',
-        'only_matching': True,
     }, {
         'url': 'https://play.acast.com/s/sparpodcast/2a92b283-1a75-4ad8-8396-499c641de0d9',
         'only_matching': True,
@@ -113,7 +110,7 @@ class ACastChannelIE(ACastBaseIE):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
-                            (?:(?:www|shows)\.)?acast\.com/|
+                            (?:www\.)?acast\.com/|
                             play\.acast\.com/s/
                         )
                         (?P<id>[^/#?]+)
@@ -123,15 +120,12 @@ class ACastChannelIE(ACastBaseIE):
         'info_dict': {
             'id': '4efc5294-5385-4847-98bd-519799ce5786',
             'title': 'Today in Focus',
-            'description': 'md5:feca253de9947634605080cd9eeea2bf',
+            'description': 'md5:c09ce28c91002ce4ffce71d6504abaae',
         },
         'playlist_mincount': 200,
     }, {
         'url': 'http://play.acast.com/s/ft-banking-weekly',
         'only_matching': True,
-    }, {
-        'url': 'https://shows.acast.com/sparpodcast',
-        'only_matching': True,
     }]
 
     @classmethod

yt_dlp/extractor/afreecatv.py

@@ -1,4 +1,3 @@
-import datetime as dt
 import functools
 
 from .common import InfoExtractor
@@ -11,7 +10,7 @@ from ..utils import (
     filter_dict,
     int_or_none,
     orderedSet,
-    parse_iso8601,
+    unified_timestamp,
     url_or_none,
     urlencode_postdata,
     urljoin,
@@ -88,9 +87,9 @@ class AfreecaTVIE(AfreecaTVBaseIE):
             'uploader_id': 'rlantnghks',
             'uploader': '페이즈으',
             'duration': 10840,
-            'thumbnail': r're:https?://videoimg\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
+            'thumbnail': r're:https?://videoimg\.sooplive\.co/.kr/.+',
             'upload_date': '20230108',
-            'timestamp': 1673186405,
+            'timestamp': 1673218805,
             'title': '젠지 페이즈',
         },
         'params': {
@@ -103,7 +102,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
             'id': '20170411_BE689A0E_190960999_1_2_h',
             'ext': 'mp4',
             'title': '혼자사는여자집',
-            'thumbnail': r're:https?://(?:video|st)img\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
+            'thumbnail': r're:https?://(?:video|st)img\.sooplive\.co\.kr/.+',
             'uploader': '♥이슬이',
             'uploader_id': 'dasl8121',
             'upload_date': '20170411',
@@ -120,7 +119,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
             'id': '20180327_27901457_202289533_1',
             'ext': 'mp4',
             'title': '[생]빨개요♥ (part 1)',
-            'thumbnail': r're:https?://(?:video|st)img\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
+            'thumbnail': r're:https?://(?:video|st)img\.sooplive\.co\.kr/.+',
             'uploader': '[SA]서아',
             'uploader_id': 'bjdyrksu',
             'upload_date': '20180327',
@@ -188,7 +187,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
                 'formats': formats,
                 **traverse_obj(file_element, {
                     'duration': ('duration', {int_or_none(scale=1000)}),
-                    'timestamp': ('file_start', {parse_iso8601(delimiter=' ', timezone=dt.timedelta(hours=9))}),
+                    'timestamp': ('file_start', {unified_timestamp}),
                 }),
             })
 
@@ -371,7 +370,7 @@ class AfreecaTVLiveIE(AfreecaTVBaseIE):
             'title': channel_info.get('TITLE') or station_info.get('station_title'),
             'uploader': channel_info.get('BJNICK') or station_info.get('station_name'),
             'uploader_id': broadcaster_id,
-            'timestamp': parse_iso8601(station_info.get('broad_start'), delimiter=' ', timezone=dt.timedelta(hours=9)),
+            'timestamp': unified_timestamp(station_info.get('broad_start')),
             'formats': formats,
             'is_live': True,
             'http_headers': {'Referer': url},

yt_dlp/extractor/agora.py

@@ -146,7 +146,7 @@ class TokFMPodcastIE(InfoExtractor):
         'url': 'https://audycje.tokfm.pl/podcast/91275,-Systemowy-rasizm-Czy-zamieszki-w-USA-po-morderstwie-w-Minneapolis-doprowadza-do-zmian-w-sluzbach-panstwowych',
         'info_dict': {
             'id': '91275',
-            'ext': 'mp3',
+            'ext': 'aac',
             'title': 'md5:a9b15488009065556900169fb8061cce',
             'episode': 'md5:a9b15488009065556900169fb8061cce',
             'series': 'Analizy',
@@ -164,20 +164,23 @@ class TokFMPodcastIE(InfoExtractor):
             raise ExtractorError('No such podcast', expected=True)
         metadata = metadata[0]
 
-        mp3_url = self._download_json(
+        formats = []
-            'https://api.podcast.radioagora.pl/api4/getSongUrl',
+        for ext in ('aac', 'mp3'):
-            media_id, 'Downloading podcast mp3 URL', query={
+            url_data = self._download_json(
-                'podcast_id': media_id,
+                f'https://api.podcast.radioagora.pl/api4/getSongUrl?podcast_id={media_id}&device_id={uuid.uuid4()}&ppre=false&audio={ext}',
-                'device_id': str(uuid.uuid4()),
+                media_id, f'Downloading podcast {ext} URL')
-                'ppre': 'false',
+            # prevents inserting the mp3 (default) multiple times
-                'audio': 'mp3',
+            if 'link_ssl' in url_data and f'.{ext}' in url_data['link_ssl']:
-            })['link_ssl']
+                formats.append({
+                    'url': url_data['link_ssl'],
+                    'ext': ext,
+                    'vcodec': 'none',
+                    'acodec': ext,
+                })
 
         return {
             'id': media_id,
-            'url': mp3_url,
+            'formats': formats,
-            'vcodec': 'none',
-            'ext': 'mp3',
             'title': metadata.get('podcast_name'),
             'series': metadata.get('series_name'),
             'episode': metadata.get('podcast_name'),

yt_dlp/extractor/atresplayer.py

@@ -1,105 +1,64 @@
-import urllib.parse
-
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     int_or_none,
-    parse_age_limit,
-    url_or_none,
     urlencode_postdata,
 )
-from ..utils.traversal import traverse_obj
 
 
 class AtresPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/(?:[^/?#]+/){4}(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
+    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/[^/]+/[^/]+/[^/]+/[^/]+/(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
     _NETRC_MACHINE = 'atresplayer'
-    _TESTS = [{
+    _TESTS = [
-        'url': 'https://www.atresplayer.com/lasexta/programas/el-objetivo/clips/mbappe-describe-como-entrenador-a-carlo-ancelotti-sabe-cuando-tiene-que-ser-padre-jefe-amigo-entrenador_67f2dfb2fb6ab0e4c7203849/',
+        {
+            'url': 'https://www.atresplayer.com/antena3/series/pequenas-coincidencias/temporada-1/capitulo-7-asuntos-pendientes_5d4aa2c57ed1a88fc715a615/',
             'info_dict': {
+                'id': '5d4aa2c57ed1a88fc715a615',
                 'ext': 'mp4',
-            'id': '67f2dfb2fb6ab0e4c7203849',
+                'title': 'Capítulo 7: Asuntos pendientes',
-            'display_id': 'md5:c203f8d4e425ed115ba56a1c6e4b3e6c',
+                'description': 'md5:7634cdcb4d50d5381bedf93efb537fbc',
-            'title': 'Mbappé describe como entrenador a Carlo Ancelotti: "Sabe cuándo tiene que ser padre, jefe, amigo, entrenador..."',
+                'duration': 3413,
-            'channel': 'laSexta',
-            'duration': 31,
-            'thumbnail': 'https://imagenes.atresplayer.com/atp/clipping/cmsimages02/2025/04/06/B02DBE1E-D59B-4683-8404-1A9595D15269/1920x1080.jpg',
-            'tags': ['Entrevista informativa', 'Actualidad', 'Debate informativo', 'Política', 'Economía', 'Sociedad', 'Cara a cara', 'Análisis', 'Más periodismo'],
-            'series': 'El Objetivo',
-            'season': 'Temporada 12',
-            'timestamp': 1743970079,
-            'upload_date': '20250406',
             },
-    }, {
+            'skip': 'This video is only available for registered users',
-        'url': 'https://www.atresplayer.com/antena3/programas/el-hormiguero/clips/revive-la-entrevista-completa-a-miguel-bose-en-el-hormiguero_67f836baa4a5b0e4147ca59a/',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': '67f836baa4a5b0e4147ca59a',
-            'display_id': 'revive-la-entrevista-completa-a-miguel-bose-en-el-hormiguero',
-            'title': 'Revive la entrevista completa a Miguel Bosé en El Hormiguero',
-            'description': 'md5:c6d2b591408d45a7bc2986dfb938eb72',
-            'channel': 'Antena 3',
-            'duration': 2556,
-            'thumbnail': 'https://imagenes.atresplayer.com/atp/clipping/cmsimages02/2025/04/10/9076395F-F1FD-48BE-9F18-540DBA10EBAD/1920x1080.jpg',
-            'tags': ['Entrevista', 'Variedades', 'Humor', 'Entretenimiento', 'Te sigo', 'Buen rollo', 'Cara a cara'],
-            'series': 'El Hormiguero ',
-            'season': 'Temporada 14',
-            'timestamp': 1744320111,
-            'upload_date': '20250410',
         },
-    }, {
+        {
-        'url': 'https://www.atresplayer.com/flooxer/series/biara-proyecto-lazarus/temporada-1/capitulo-3-supervivientes_67a6038b64ceca00070f4f69/',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': '67a6038b64ceca00070f4f69',
-            'display_id': 'capitulo-3-supervivientes',
-            'title': 'Capítulo 3: Supervivientes',
-            'description': 'md5:65b231f20302f776c2b0dd24594599a1',
-            'channel': 'Flooxer',
-            'duration': 1196,
-            'thumbnail': 'https://imagenes.atresplayer.com/atp/clipping/cmsimages01/2025/02/14/17CF90D3-FE67-40C5-A941-7825B3E13992/1920x1080.jpg',
-            'tags': ['Juvenil', 'Terror', 'Piel de gallina', 'Te sigo', 'Un break', 'Del tirón'],
-            'series': 'BIARA: Proyecto Lázarus',
-            'season': 'Temporada 1',
-            'season_number': 1,
-            'episode': 'Episode 3',
-            'episode_number': 3,
-            'timestamp': 1743095191,
-            'upload_date': '20250327',
-        },
-    }, {
             'url': 'https://www.atresplayer.com/lasexta/programas/el-club-de-la-comedia/temporada-4/capitulo-10-especial-solidario-nochebuena_5ad08edf986b2855ed47adc4/',
             'only_matching': True,
-    }, {
+        },
+        {
             'url': 'https://www.atresplayer.com/antena3/series/el-secreto-de-puente-viejo/el-chico-de-los-tres-lunares/capitulo-977-29-12-14_5ad51046986b2886722ccdea/',
             'only_matching': True,
-    }]
+        },
+    ]
     _API_BASE = 'https://api.atresplayer.com/'
 
     def _perform_login(self, username, password):
+        self._request_webpage(
+            self._API_BASE + 'login', None, 'Downloading login page')
+
         try:
-            self._download_webpage(
+            target_url = self._download_json(
-                'https://account.atresplayer.com/auth/v1/login', None,
+                'https://account.atresmedia.com/api/login', None,
-                'Logging in', 'Failed to log in', data=urlencode_postdata({
+                'Logging in', headers={
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }, data=urlencode_postdata({
                     'username': username,
                     'password': password,
-                }))
+                }))['targetUrl']
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 400:
                 raise ExtractorError('Invalid username and/or password', expected=True)
             raise
 
+        self._request_webpage(target_url, None, 'Following Target URL')
+
     def _real_extract(self, url):
         display_id, video_id = self._match_valid_url(url).groups()
 
-        metadata_url = self._download_json(
-            self._API_BASE + 'client/v1/url', video_id, 'Downloading API endpoint data',
-            query={'href': urllib.parse.urlparse(url).path})['href']
-        metadata = self._download_json(metadata_url, video_id)
-
         try:
-            video_data = self._download_json(metadata['urlVideo'], video_id, 'Downloading video data')
+            episode = self._download_json(
+                self._API_BASE + 'client/v1/player/episode/' + video_id, video_id)
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 403:
                 error = self._parse_json(e.cause.response.read(), None)
@@ -108,45 +67,37 @@ class AtresPlayerIE(InfoExtractor):
                 raise ExtractorError(error['error_description'], expected=True)
             raise
 
+        title = episode['titulo']
+
         formats = []
         subtitles = {}
-        for source in traverse_obj(video_data, ('sources', lambda _, v: url_or_none(v['src']))):
+        for source in episode.get('sources', []):
-            src_url = source['src']
+            src = source.get('src')
-            src_type = source.get('type')
+            if not src:
-            if src_type in ('application/vnd.apple.mpegurl', 'application/hls+legacy', 'application/hls+hevc'):
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    src_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
-            elif src_type in ('application/dash+xml', 'application/dash+hevc'):
-                fmts, subs = self._extract_mpd_formats_and_subtitles(
-                    src_url, video_id, mpd_id='dash', fatal=False)
-            else:
                 continue
-            formats.extend(fmts)
+            src_type = source.get('type')
-            self._merge_subtitles(subs, target=subtitles)
+            if src_type == 'application/vnd.apple.mpegurl':
+                formats, subtitles = self._extract_m3u8_formats(
+                    src, video_id, 'mp4', 'm3u8_native',
+                    m3u8_id='hls', fatal=False)
+            elif src_type == 'application/dash+xml':
+                formats, subtitles = self._extract_mpd_formats(
+                    src, video_id, mpd_id='dash', fatal=False)
+
+        heartbeat = episode.get('heartbeat') or {}
+        omniture = episode.get('omniture') or {}
+        get_meta = lambda x: heartbeat.get(x) or omniture.get(x)
 
         return {
             'display_id': display_id,
             'id': video_id,
+            'title': title,
+            'description': episode.get('descripcion'),
+            'thumbnail': episode.get('imgPoster'),
+            'duration': int_or_none(episode.get('duration')),
             'formats': formats,
+            'channel': get_meta('channel'),
+            'season': get_meta('season'),
+            'episode_number': int_or_none(get_meta('episodeNumber')),
             'subtitles': subtitles,
-            **traverse_obj(video_data, {
-                'title': ('titulo', {str}),
-                'description': ('descripcion', {str}),
-                'duration': ('duration', {int_or_none}),
-                'thumbnail': ('imgPoster', {url_or_none}, {lambda v: f'{v}1920x1080.jpg'}),
-                'age_limit': ('ageRating', {parse_age_limit}),
-            }),
-            **traverse_obj(metadata, {
-                'title': ('title', {str}),
-                'description': ('description', {str}),
-                'duration': ('duration', {int_or_none}),
-                'tags': ('tags', ..., 'title', {str}),
-                'age_limit': ('ageRating', {parse_age_limit}),
-                'series': ('format', 'title', {str}),
-                'season': ('currentSeason', 'title', {str}),
-                'season_number': ('currentSeason', 'seasonNumber', {int_or_none}),
-                'episode_number': ('numberOfEpisode', {int_or_none}),
-                'timestamp': ('publicationDate', {int_or_none(scale=1000)}),
-                'channel': ('channel', 'title', {str}),
-            }),
         }

yt_dlp/extractor/azmedien.py

@@ -1,6 +1,7 @@
+import json
+
 from .common import InfoExtractor
 from .kaltura import KalturaIE
-from ..utils.traversal import require, traverse_obj
 
 
 class AZMedienIE(InfoExtractor):
@@ -8,15 +9,15 @@ class AZMedienIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:www\.|tv\.)?
-                        (?:
+                        (?P<host>
                             telezueri\.ch|
                             telebaern\.tv|
                             telem1\.ch|
                             tvo-online\.ch
                         )/
-                        [^/?#]+/
+                        [^/]+/
                         (?P<id>
-                            [^/?#]+-\d+
+                            [^/]+-(?P<article_id>\d+)
                         )
                         (?:
                             \#video=
@@ -46,17 +47,19 @@ class AZMedienIE(InfoExtractor):
         'url': 'https://www.telebaern.tv/telebaern-news/montag-1-oktober-2018-ganze-sendung-133531189#video=0_7xjo9lf1',
         'only_matching': True,
     }]
+    _API_TEMPL = 'https://www.%s/api/pub/gql/%s/NewsArticleTeaser/a4016f65fe62b81dc6664dd9f4910e4ab40383be'
     _PARTNER_ID = '1719221'
 
     def _real_extract(self, url):
-        display_id, entry_id = self._match_valid_url(url).groups()
+        host, display_id, article_id, entry_id = self._match_valid_url(url).groups()
 
         if not entry_id:
-            webpage = self._download_webpage(url, display_id)
+            entry_id = self._download_json(
-            data = self._search_json(
+                self._API_TEMPL % (host, host.split('.')[0]), display_id, query={
-                r'window\.__APOLLO_STATE__\s*=', webpage, 'video data', display_id)
+                    'variables': json.dumps({
-            entry_id = traverse_obj(data, (
+                        'contextId': 'NewsArticle:' + article_id,
-                lambda _, v: v['__typename'] == 'KalturaData', 'kalturaId', any, {require('kaltura id')}))
+                    }),
+                })['data']['context']['mainAsset']['video']['kaltura']['kalturaId']
 
         return self.url_result(
             f'kaltura:{self._PARTNER_ID}:{entry_id}',

yt_dlp/extractor/bandlab.py

@@ -86,7 +86,7 @@ class BandlabBaseIE(InfoExtractor):
                 'webpage_url': (
                     'id', ({value(url)}, {format_field(template='https://www.bandlab.com/post/%s')}), filter, any),
                 'url': ('video', 'url', {url_or_none}),
-                'title': ('caption', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}),
+                'title': ('caption', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=50)}),
                 'description': ('caption', {str}),
                 'thumbnail': ('video', 'picture', 'url', {url_or_none}),
                 'view_count': ('video', 'counters', 'plays', {int_or_none}),
@@ -120,7 +120,7 @@ class BandlabIE(BandlabBaseIE):
             'duration': 54.629999999999995,
             'title': 'sweet black',
             'upload_date': '20231210',
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
             'genres': ['Lofi'],
             'uploader': 'ender milze',
             'comment_count': int,
@@ -142,7 +142,7 @@ class BandlabIE(BandlabBaseIE):
             'duration': 54.629999999999995,
             'title': 'sweet black',
             'upload_date': '20231210',
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
             'genres': ['Lofi'],
             'uploader': 'ender milze',
             'comment_count': int,
@@ -158,7 +158,7 @@ class BandlabIE(BandlabBaseIE):
             'comment_count': int,
             'genres': ['Other'],
             'uploader_id': 'user8353034818103753',
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/51b18363-da23-4b9b-a29c-2933a3e561ca/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/51b18363-da23-4b9b-a29c-2933a3e561ca/',
             'timestamp': 1709625771,
             'track': 'PodcastMaerchen4b',
             'duration': 468.14,
@@ -178,7 +178,7 @@ class BandlabIE(BandlabBaseIE):
             'id': '110343fc-148b-ea11-96d2-0003ffd1fc09',
             'ext': 'm4a',
             'timestamp': 1588273294,
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/users/b612e533-e4f7-4542-9f50-3fcfd8dd822c/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/users/b612e533-e4f7-4542-9f50-3fcfd8dd822c/',
             'description': 'Final Revision.',
             'title': 'Replay ( Instrumental)',
             'uploader': 'David R Sparks',
@@ -200,7 +200,7 @@ class BandlabIE(BandlabBaseIE):
             'id': '5cdf9036-3857-ef11-991a-6045bd36e0d9',
             'ext': 'mp4',
             'duration': 44.705,
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/videos/67c6cef1-cef6-40d3-831e-a55bc1dcb972/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/videos/67c6cef1-cef6-40d3-831e-a55bc1dcb972/',
             'comment_count': int,
             'title': 'backing vocals',
             'uploader_id': 'marliashya',
@@ -224,7 +224,7 @@ class BandlabIE(BandlabBaseIE):
             'view_count': int,
             'track': 'Positronic Meltdown',
             'duration': 318.55,
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/87165bc3-5439-496e-b1f7-a9f13b541ff2/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/87165bc3-5439-496e-b1f7-a9f13b541ff2/',
             'description': 'Checkout my tracks at AOMX http://aomxsounds.com/',
             'uploader_id': 'microfreaks',
             'title': 'Positronic Meltdown',
@@ -246,7 +246,7 @@ class BandlabIE(BandlabBaseIE):
             'comment_count': int,
             'uploader': 'Sorakime',
             'uploader_id': 'sorakime',
-            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/users/572a351a-0f3a-4c6a-ac39-1a5defdeeb1c/',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/users/572a351a-0f3a-4c6a-ac39-1a5defdeeb1c/',
             'timestamp': 1691162128,
             'upload_date': '20230804',
             'media_type': 'track',

yt_dlp/extractor/bilibili.py

@@ -4,9 +4,7 @@ import hashlib
 import itertools
 import json
 import math
-import random
 import re
-import string
 import time
 import urllib.parse
 import uuid
@@ -1179,26 +1177,28 @@ class BilibiliSpaceBaseIE(BilibiliBaseIE):
 
 
 class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
-    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)(?P<video>(?:/upload)?/video)?/?(?:[?#]|$)'
+    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)(?P<video>/video)?/?(?:[?#]|$)'
     _TESTS = [{
         'url': 'https://space.bilibili.com/3985676/video',
         'info_dict': {
             'id': '3985676',
         },
         'playlist_mincount': 178,
+        'skip': 'login required',
     }, {
         'url': 'https://space.bilibili.com/313580179/video',
         'info_dict': {
             'id': '313580179',
         },
         'playlist_mincount': 92,
+        'skip': 'login required',
     }]
 
     def _real_extract(self, url):
         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 "/upload/audio" to the URL')
+                           'To download audios, add a "/audio" to the URL')
 
         def fetch_page(page_idx):
             query = {
@@ -1211,12 +1211,6 @@ class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
                 'ps': 30,
                 'tid': 0,
                 'web_location': 1550101,
-                'dm_img_list': '[]',
-                'dm_img_str': base64.b64encode(
-                    ''.join(random.choices(string.printable, k=random.randint(16, 64))).encode())[:-2].decode(),
-                'dm_cover_img_str': base64.b64encode(
-                    ''.join(random.choices(string.printable, k=random.randint(32, 128))).encode())[:-2].decode(),
-                'dm_img_inter': '{"ds":[],"wh":[6093,6631,31],"of":[430,760,380]}',
             }
 
             try:
@@ -1227,14 +1221,14 @@ class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 412:
                     raise ExtractorError(
-                        'Request is blocked by server (412), please wait and try later.', expected=True)
+                        'Request is blocked by server (412), please add cookies, wait and try later.', expected=True)
                 raise
             status_code = response['code']
             if status_code == -401:
                 raise ExtractorError(
-                    'Request is blocked by server (401), please wait and try later.', expected=True)
+                    'Request is blocked by server (401), please add cookies, wait and try later.', expected=True)
-            elif status_code == -352:
+            elif status_code == -352 and not self.is_logged_in:
-                raise ExtractorError('Request is rejected by server (352)', expected=True)
+                self.raise_login_required('Request is rejected, you need to login to access playlist')
             elif status_code != 0:
                 raise ExtractorError(f'Request failed ({status_code}): {response.get("message") or "Unknown error"}')
             return response['data']
@@ -1256,9 +1250,9 @@ class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
 
 
 class BilibiliSpaceAudioIE(BilibiliSpaceBaseIE):
-    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)/(?:upload/)?audio'
+    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)/audio'
     _TESTS = [{
-        'url': 'https://space.bilibili.com/313580179/upload/audio',
+        'url': 'https://space.bilibili.com/313580179/audio',
         'info_dict': {
             'id': '313580179',
         },
@@ -1281,8 +1275,7 @@ class BilibiliSpaceAudioIE(BilibiliSpaceBaseIE):
             }
 
         def get_entries(page_data):
-            # data is None when the playlist is empty
+            for entry in page_data.get('data', []):
-            for entry in page_data.get('data') or []:
                 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)
@@ -1306,43 +1299,30 @@ class BilibiliSpaceListBaseIE(BilibiliSpaceBaseIE):
 
 
 class BilibiliCollectionListIE(BilibiliSpaceListBaseIE):
-    _VALID_URL = [
+    _VALID_URL = r'https?://space\.bilibili\.com/(?P<mid>\d+)/channel/collectiondetail/?\?sid=(?P<sid>\d+)'
-        r'https?://space\.bilibili\.com/(?P<mid>\d+)/channel/collectiondetail/?\?sid=(?P<sid>\d+)',
-        r'https?://space\.bilibili\.com/(?P<mid>\d+)/lists/(?P<sid>\d+)',
-    ]
     _TESTS = [{
-        'url': 'https://space.bilibili.com/2142762/lists/3662502?type=season',
+        'url': 'https://space.bilibili.com/2142762/channel/collectiondetail?sid=57445',
         'info_dict': {
-            'id': '2142762_3662502',
+            'id': '2142762_57445',
-            'title': '合集·《黑神话悟空》流程解说',
+            'title': '【完结】《底特律 变人》全结局流程解说',
-            'description': '黑神话悟空 相关节目',
+            'description': '',
             'uploader': '老戴在此',
             'uploader_id': '2142762',
             'timestamp': int,
             'upload_date': str,
-            'thumbnail': 'https://archive.biliimg.com/bfs/archive/22302e17dc849dd4533606d71bc89df162c3a9bf.jpg',
+            'thumbnail': 'https://archive.biliimg.com/bfs/archive/e0e543ae35ad3df863ea7dea526bc32e70f4c091.jpg',
         },
-        'playlist_mincount': 62,
+        'playlist_mincount': 31,
-    }, {
-        'url': 'https://space.bilibili.com/2142762/lists/3662502',
-        'only_matching': True,
-    }, {
-        'url': 'https://space.bilibili.com/2142762/channel/collectiondetail?sid=57445',
-        'only_matching': True,
     }]
 
-    @classmethod
-    def suitable(cls, url):
-        return False if BilibiliSeriesListIE.suitable(url) else super().suitable(url)
-
     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/web-space/seasons_archives_list',
+                'https://api.bilibili.com/x/polymer/space/seasons_archives_list',
-                playlist_id, note=f'Downloading page {page_idx}', headers={'Referer': url},
+                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):
@@ -1369,12 +1349,9 @@ class BilibiliCollectionListIE(BilibiliSpaceListBaseIE):
 
 
 class BilibiliSeriesListIE(BilibiliSpaceListBaseIE):
-    _VALID_URL = [
+    _VALID_URL = r'https?://space\.bilibili\.com/(?P<mid>\d+)/channel/seriesdetail/?\?\bsid=(?P<sid>\d+)'
-        r'https?://space\.bilibili\.com/(?P<mid>\d+)/channel/seriesdetail/?\?\bsid=(?P<sid>\d+)',
-        r'https?://space\.bilibili\.com/(?P<mid>\d+)/lists/(?P<sid>\d+)/?\?(?:[^#]+&)?type=series(?:[&#]|$)',
-    ]
     _TESTS = [{
-        'url': 'https://space.bilibili.com/1958703906/lists/547718?type=series',
+        'url': 'https://space.bilibili.com/1958703906/channel/seriesdetail?sid=547718&ctype=0',
         'info_dict': {
             'id': '1958703906_547718',
             'title': '直播回放',
@@ -1387,9 +1364,6 @@ class BilibiliSeriesListIE(BilibiliSpaceListBaseIE):
             'modified_date': str,
         },
         'playlist_mincount': 513,
-    }, {
-        'url': 'https://space.bilibili.com/1958703906/channel/seriesdetail?sid=547718&ctype=0',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -1408,7 +1382,7 @@ class BilibiliSeriesListIE(BilibiliSpaceListBaseIE):
         def fetch_page(page_idx):
             return self._download_json(
                 'https://api.bilibili.com/x/series/archives',
-                playlist_id, note=f'Downloading page {page_idx}', headers={'Referer': url},
+                playlist_id, note=f'Downloading page {page_idx}',
                 query={'mid': mid, 'series_id': sid, 'pn': page_idx + 1, 'ps': 30})['data']
 
         def get_metadata(page_data):
@@ -1596,16 +1570,16 @@ class BilibiliPlaylistIE(BilibiliSpaceListBaseIE):
 
         webpage = self._download_webpage(url, list_id)
         initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', list_id)
-        error = traverse_obj(initial_state, (('error', 'listError'), all, lambda _, v: v['code'], any))
+        if traverse_obj(initial_state, ('error', 'code', {int_or_none})) != 200:
-        if error and error['code'] != 200:
+            error_code = traverse_obj(initial_state, ('error', 'trueCode', {int_or_none}))
-            error_code = error.get('trueCode')
+            error_message = traverse_obj(initial_state, ('error', 'message', {str_or_none}))
             if error_code == -400 and list_id == 'watchlater':
                 self.raise_login_required('You need to login to access your watchlater playlist')
             elif error_code == -403:
                 self.raise_login_required('This is a private playlist. You need to login as its owner')
             elif error_code == 11010:
                 raise ExtractorError('Playlist is no longer available', expected=True)
-            raise ExtractorError(f'Could not access playlist: {error_code} {error.get("message")}')
+            raise ExtractorError(f'Could not access playlist: {error_code} {error_message}')
 
         query = {
             'ps': 20,
@@ -1887,47 +1861,6 @@ class BiliBiliPlayerIE(InfoExtractor):
             ie=BiliBiliIE.ie_key(), video_id=video_id)
 
 
-class BiliBiliDynamicIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:t\.bilibili\.com|(?:www\.)?bilibili\.com/opus)/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://t.bilibili.com/998134289197432852',
-        'info_dict': {
-            'id': 'BV1TAmBYVEJr',
-            'ext': 'mp4',
-            'uploader_id': '1192648858',
-            'comment_count': int,
-            '_old_archive_ids': ['bilibili 113457567568273_part1'],
-            'thumbnail': 'http://i2.hdslb.com/bfs/archive/50091efd965d9f13ff6814f7ad374f90ab21e77d.jpg',
-            'duration': 929.238,
-            'upload_date': '20241110',
-            'uploader': '何同学工作室',
-            'like_count': int,
-            'view_count': int,
-            'title': '美国小朋友就玩这个？！何同学工作室11月开箱',
-            'description': '本期产品信息：\n机器狗\n气味模拟器\nCloudboom Strike LS\n无弦吉他\n蓝牙磁带音箱\n神奇画板',
-            'timestamp': 1731232800,
-            'tags': list,
-            'chapters': list,
-        },
-    }]
-
-    def _real_extract(self, url):
-        post_id = self._match_id(url)
-        # Without the newer chrome UA, the API will return an error (-352)
-        post_data = self._download_json(
-            'https://api.bilibili.com/x/polymer/web-dynamic/v1/detail', post_id,
-            query={'id': post_id}, headers={
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-            })
-        video_url = traverse_obj(post_data, (
-            'data', 'item', (None, 'orig'), 'modules', 'module_dynamic',
-            (('major', ('archive', 'pgc')), ('additional', ('reserve', 'common'))),
-            'jump_url', {url_or_none}, any, {self._proto_relative_url}))
-        if not video_url or (self.suitable(video_url) and post_id == self._match_id(video_url)):
-            raise ExtractorError('No valid video URL found', expected=True)
-        return self.url_result(video_url)
-
-
 class BiliIntlBaseIE(InfoExtractor):
     _API_URL = 'https://api.bilibili.tv/intl/gateway'
     _NETRC_MACHINE = 'biliintl'

yt_dlp/extractor/bitchute.py

@@ -1,32 +1,30 @@
 import functools
-import json
 import re
 
 from .common import InfoExtractor
 from ..networking import HEADRequest
-from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     OnDemandPagedList,
     clean_html,
-    determine_ext,
+    extract_attributes,
-    format_field,
     get_element_by_class,
+    get_element_by_id,
+    get_element_html_by_class,
     get_elements_html_by_class,
     int_or_none,
     orderedSet,
     parse_count,
     parse_duration,
-    parse_iso8601,
+    traverse_obj,
-    url_or_none,
+    unified_strdate,
     urlencode_postdata,
     urljoin,
 )
-from ..utils.traversal import traverse_obj
 
 
 class BitChuteIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www|old)\.)?bitchute\.com/(?:video|embed|torrent/[^/?#]+)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:(?:www|old)\.)?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/',
@@ -36,17 +34,12 @@ class BitChuteIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'This is the first video on #BitChute !',
             'description': 'md5:a0337e7b1fe39e32336974af8173a034',
-            'thumbnail': r're:https?://.+/.+\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'BitChute',
             'upload_date': '20170103',
             'uploader_url': 'https://www.bitchute.com/profile/I5NgtHZn9vPj/',
             'channel': 'BitChute',
             'channel_url': 'https://www.bitchute.com/channel/bitchute/',
-            'uploader_id': 'I5NgtHZn9vPj',
-            'channel_id': '1VBwRfyNcKdX',
-            'view_count': int,
-            'duration': 16.0,
-            'timestamp': 1483425443,
         },
     }, {
         # test case: video with different channel and uploader
@@ -56,18 +49,13 @@ class BitChuteIE(InfoExtractor):
             'id': 'Yti_j9A-UZ4',
             'ext': 'mp4',
             'title': 'Israel at War | Full Measure',
-            'description': 'md5:e60198b89971966d6030d22b3268f08f',
+            'description': 'md5:38cf7bc6f42da1a877835539111c69ef',
-            'thumbnail': r're:https?://.+/.+\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'sharylattkisson',
             'upload_date': '20231106',
             'uploader_url': 'https://www.bitchute.com/profile/9K0kUWA9zmd9/',
             'channel': 'Full Measure with Sharyl Attkisson',
             'channel_url': 'https://www.bitchute.com/channel/sharylattkisson/',
-            'uploader_id': '9K0kUWA9zmd9',
-            'channel_id': 'NpdxoCRv3ZLb',
-            'view_count': int,
-            'duration': 554.0,
-            'timestamp': 1699296106,
         },
     }, {
         # video not downloadable in browser, but we can recover it
@@ -78,21 +66,25 @@ class BitChuteIE(InfoExtractor):
             'ext': 'mp4',
             'filesize': 71537926,
             'title': 'STYXHEXENHAMMER666 - Election Fraud, Clinton 2020, EU Armies, and Gun Control',
-            'description': 'md5:2029c7c212ccd4b040f52bb2d036ef4e',
+            'description': 'md5:228ee93bd840a24938f536aeac9cf749',
-            'thumbnail': r're:https?://.+/.+\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'BitChute',
             'upload_date': '20181113',
             'uploader_url': 'https://www.bitchute.com/profile/I5NgtHZn9vPj/',
             'channel': 'BitChute',
             'channel_url': 'https://www.bitchute.com/channel/bitchute/',
-            'uploader_id': 'I5NgtHZn9vPj',
-            'channel_id': '1VBwRfyNcKdX',
-            'view_count': int,
-            'duration': 1701.0,
-            'tags': ['bitchute'],
-            'timestamp': 1542130287,
         },
         'params': {'check_formats': None},
+    }, {
+        # restricted video
+        'url': 'https://www.bitchute.com/video/WEnQU7XGcTdl/',
+        'info_dict': {
+            'id': 'WEnQU7XGcTdl',
+            'ext': 'mp4',
+            'title': 'Impartial Truth - Ein Letzter Appell an die Vernunft',
+        },
+        'params': {'skip_download': True},
+        'skip': 'Georestricted in DE',
     }, {
         'url': 'https://www.bitchute.com/embed/lbb5G1hjPhw/',
         'only_matching': True,
@@ -104,8 +96,11 @@ class BitChuteIE(InfoExtractor):
         'only_matching': True,
     }]
     _GEO_BYPASS = False
-    _UPLOADER_URL_TMPL = 'https://www.bitchute.com/profile/%s/'
+
-    _CHANNEL_URL_TMPL = 'https://www.bitchute.com/channel/%s/'
+    _HEADERS = {
+        'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.57 Safari/537.36',
+        'Referer': 'https://www.bitchute.com/',
+    }
 
     def _check_format(self, video_url, video_id):
         urls = orderedSet(
@@ -117,7 +112,7 @@ class BitChuteIE(InfoExtractor):
         for url in urls:
             try:
                 response = self._request_webpage(
-                    HEADRequest(url), video_id=video_id, note=f'Checking {url}')
+                    HEADRequest(url), video_id=video_id, note=f'Checking {url}', headers=self._HEADERS)
             except ExtractorError as e:
                 self.to_screen(f'{video_id}: URL is invalid, skipping: {e.cause}')
                 continue
@@ -126,79 +121,54 @@ class BitChuteIE(InfoExtractor):
                 'filesize': int_or_none(response.headers.get('Content-Length')),
             }
 
-    def _call_api(self, endpoint, data, display_id, fatal=True):
+    def _raise_if_restricted(self, webpage):
-        note = endpoint.rpartition('/')[2]
+        page_title = clean_html(get_element_by_class('page-title', webpage)) or ''
-        try:
+        if re.fullmatch(r'(?:Channel|Video) Restricted', page_title):
-            return self._download_json(
+            reason = clean_html(get_element_by_id('page-detail', webpage)) or page_title
-                f'https://api.bitchute.com/api/beta/{endpoint}', display_id,
+            self.raise_geo_restricted(reason)
-                f'Downloading {note} API JSON', f'Unable to download {note} API JSON',
+
-                data=json.dumps(data).encode(),
+    @staticmethod
-                headers={
+    def _make_url(html):
-                    'Accept': 'application/json',
+        path = extract_attributes(get_element_html_by_class('spa', html) or '').get('href')
-                    'Content-Type': 'application/json',
+        return urljoin('https://www.bitchute.com', path)
-                })
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 403:
-                errors = '. '.join(traverse_obj(e.cause.response.read().decode(), (
-                    {json.loads}, 'errors', lambda _, v: v['context'] == 'reason', 'message', {str})))
-                if errors and 'location' in errors:
-                    # Can always be fatal since the video/media call will reach this code first
-                    self.raise_geo_restricted(errors)
-            if fatal:
-                raise
-            self.report_warning(e.msg)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        data = {'video_id': video_id}
+        webpage = self._download_webpage(
-        media_url = self._call_api('video/media', data, video_id)['media_url']
+            f'https://old.bitchute.com/video/{video_id}', video_id, headers=self._HEADERS)
+
+        self._raise_if_restricted(webpage)
+        publish_date = clean_html(get_element_by_class('video-publish-date', webpage))
+        entries = self._parse_html5_media_entries(url, webpage, video_id)
 
         formats = []
-        if determine_ext(media_url) == 'm3u8':
+        for format_ in traverse_obj(entries, (0, 'formats', ...)):
-            formats.extend(
-                self._extract_m3u8_formats(media_url, video_id, 'mp4', m3u8_id='hls', live=True))
-        else:
             if self.get_param('check_formats') is not False:
-                if fmt := self._check_format(media_url, video_id):
+                format_.update(self._check_format(format_.pop('url'), video_id) or {})
-                    formats.append(fmt)
+                if 'url' not in format_:
-            else:
+                    continue
-                formats.append({'url': media_url})
+            formats.append(format_)
 
         if not formats:
             self.raise_no_formats(
                 'Video is unavailable. Please make sure this video is playable in the browser '
                 'before reporting this issue.', expected=True, video_id=video_id)
 
-        video = self._call_api('video', data, video_id, fatal=False)
+        details = get_element_by_class('details', webpage) or ''
-        channel = None
+        uploader_html = get_element_html_by_class('creator', details) or ''
-        if channel_id := traverse_obj(video, ('channel', 'channel_id', {str})):
+        channel_html = get_element_html_by_class('name', details) or ''
-            channel = self._call_api('channel', {'channel_id': channel_id}, video_id, fatal=False)
 
         return {
-            **traverse_obj(video, {
-                'title': ('video_name', {str}),
-                'description': ('description', {str}),
-                'thumbnail': ('thumbnail_url', {url_or_none}),
-                'channel': ('channel', 'channel_name', {str}),
-                'channel_id': ('channel', 'channel_id', {str}),
-                'channel_url': ('channel', 'channel_url', {urljoin('https://www.bitchute.com/')}),
-                'uploader_id': ('profile_id', {str}),
-                'uploader_url': ('profile_id', {format_field(template=self._UPLOADER_URL_TMPL)}, filter),
-                'timestamp': ('date_published', {parse_iso8601}),
-                'duration': ('duration', {parse_duration}),
-                'tags': ('hashtags', ..., {str}, filter, all, filter),
-                'view_count': ('view_count', {int_or_none}),
-                'is_live': ('state_id', {lambda x: x == 'live'}),
-            }),
-            **traverse_obj(channel, {
-                'channel': ('channel_name', {str}),
-                'channel_id': ('channel_id', {str}),
-                'channel_url': ('url_slug', {format_field(template=self._CHANNEL_URL_TMPL)}, filter),
-                'uploader': ('profile_name', {str}),
-                'uploader_id': ('profile_id', {str}),
-                'uploader_url': ('profile_id', {format_field(template=self._UPLOADER_URL_TMPL)}, filter),
-            }),
             'id': video_id,
+            'title': self._html_extract_title(webpage) or self._og_search_title(webpage),
+            'description': self._og_search_description(webpage, default=None),
+            'thumbnail': self._og_search_thumbnail(webpage),
+            'uploader': clean_html(uploader_html),
+            'uploader_url': self._make_url(uploader_html),
+            'channel': clean_html(channel_html),
+            'channel_url': self._make_url(channel_html),
+            'upload_date': unified_strdate(self._search_regex(
+                r'at \d+:\d+ UTC on (.+?)\.', publish_date, 'upload date', fatal=False)),
             'formats': formats,
         }
 
@@ -220,7 +190,7 @@ class BitChuteChannelIE(InfoExtractor):
                     'ext': 'mp4',
                     'title': 'This is the first video on #BitChute !',
                     'description': 'md5:a0337e7b1fe39e32336974af8173a034',
-                    'thumbnail': r're:https?://.+/.+\.jpg$',
+                    'thumbnail': r're:^https?://.*\.jpg$',
                     'uploader': 'BitChute',
                     'upload_date': '20170103',
                     'uploader_url': 'https://www.bitchute.com/profile/I5NgtHZn9vPj/',
@@ -228,9 +198,6 @@ class BitChuteChannelIE(InfoExtractor):
                     'channel_url': 'https://www.bitchute.com/channel/bitchute/',
                     'duration': 16,
                     'view_count': int,
-                    'uploader_id': 'I5NgtHZn9vPj',
-                    'channel_id': '1VBwRfyNcKdX',
-                    'timestamp': 1483425443,
                 },
             },
         ],
@@ -246,7 +213,6 @@ class BitChuteChannelIE(InfoExtractor):
             'title': 'Bruce MacDonald and "The Light of Darkness"',
             'description': 'md5:747724ef404eebdfc04277714f81863e',
         },
-        'skip': '404 Not Found',
     }, {
         'url': 'https://old.bitchute.com/playlist/wV9Imujxasw9/',
         'only_matching': True,

yt_dlp/extractor/bluesky.py

@@ -53,7 +53,7 @@ class BlueskyIE(InfoExtractor):
             'channel_id': 'did:plc:z72i7hdynmk6r22z27h6tvur',
             'channel_url': 'https://bsky.app/profile/did:plc:z72i7hdynmk6r22z27h6tvur',
             'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
-            'title': 'Bluesky now has video! Update your app to version 1.91 or refresh on ...',
+            'title': 'Bluesky now has video! Update your app to versi...',
             'alt_title': 'Bluesky video feature announcement',
             'description': r're:(?s)Bluesky now has video! .{239}',
             'upload_date': '20240911',
@@ -88,7 +88,7 @@ class BlueskyIE(InfoExtractor):
         },
     }, {
         'url': 'https://bsky.app/profile/de1.pds.tentacle.expert/post/3l3w4tnezek2e',
-        'md5': 'cc0110ed1f6b0247caac8234cc1e861d',
+        'md5': '1af9c7fda061cf7593bbffca89e43d1c',
         'info_dict': {
             'id': '3l3w4tnezek2e',
             'ext': 'mp4',
@@ -133,8 +133,6 @@ class BlueskyIE(InfoExtractor):
             'channel_follower_count': int,
             'categories': ['Entertainment'],
             'tags': [],
-            'chapters': list,
-            'heatmap': 'count:100',
         },
         'add_ie': ['Youtube'],
     }, {
@@ -172,7 +170,7 @@ class BlueskyIE(InfoExtractor):
             'channel_id': 'did:plc:z72i7hdynmk6r22z27h6tvur',
             'channel_url': 'https://bsky.app/profile/did:plc:z72i7hdynmk6r22z27h6tvur',
             'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
-            'title': 'Bluesky now has video! Update your app to version 1.91 or refresh on ...',
+            'title': 'Bluesky now has video! Update your app to versi...',
             'alt_title': 'Bluesky video feature announcement',
             'description': r're:(?s)Bluesky now has video! .{239}',
             'upload_date': '20240911',
@@ -186,14 +184,14 @@ class BlueskyIE(InfoExtractor):
             },
         },
     }, {
-        'url': 'https://bsky.app/profile/cinny.bun.how/post/3l7rdfxhyds2f',
+        'url': 'https://bsky.app/profile/alt.bun.how/post/3l7rdfxhyds2f',
         'md5': '8775118b235cf9fa6b5ad30f95cda75c',
         'info_dict': {
             'id': '3l7rdfxhyds2f',
             'ext': 'mp4',
-            'uploader': 'cinnamon 🐇 🏳️‍⚧️',
+            'uploader': 'cinnamon',
-            'uploader_id': 'cinny.bun.how',
+            'uploader_id': 'alt.bun.how',
-            'uploader_url': 'https://bsky.app/profile/cinny.bun.how',
+            'uploader_url': 'https://bsky.app/profile/alt.bun.how',
             'channel_id': 'did:plc:7x6rtuenkuvxq3zsvffp2ide',
             'channel_url': 'https://bsky.app/profile/did:plc:7x6rtuenkuvxq3zsvffp2ide',
             'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
@@ -255,7 +253,7 @@ class BlueskyIE(InfoExtractor):
             'info_dict': {
                 'id': '3l77u64l7le2e',
                 'ext': 'mp4',
-                'title': "hearing people on twitter say that bluesky isn't funny yet  so post t...",
+                'title': 'hearing people on twitter say that bluesky isn\'...',
                 'like_count': int,
                 'uploader_id': 'thafnine.net',
                 'uploader_url': 'https://bsky.app/profile/thafnine.net',
@@ -286,19 +284,17 @@ class BlueskyIE(InfoExtractor):
             services, ('service', lambda _, x: x['type'] == 'AtprotoPersonalDataServer',
                        'serviceEndpoint', {url_or_none}, any)) or 'https://bsky.social'
 
-    def _extract_post(self, handle, post_id):
+    def _real_extract(self, url):
-        return self._download_json(
+        handle, video_id = self._match_valid_url(url).group('handle', 'id')
+
+        post = self._download_json(
             'https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread',
-            post_id, query={
+            video_id, query={
-                'uri': f'at://{handle}/app.bsky.feed.post/{post_id}',
+                'uri': f'at://{handle}/app.bsky.feed.post/{video_id}',
                 'depth': 0,
                 'parentHeight': 0,
             })['thread']['post']
 
-    def _real_extract(self, url):
-        handle, video_id = self._match_valid_url(url).group('handle', 'id')
-        post = self._extract_post(handle, video_id)
-
         entries = []
         # app.bsky.embed.video.view/app.bsky.embed.external.view
         entries.extend(self._extract_videos(post, video_id))
@@ -345,7 +341,6 @@ class BlueskyIE(InfoExtractor):
 
             formats.append({
                 'format_id': 'blob',
-                'quality': 1,
                 'url': update_url_query(
                     self._BLOB_URL_TMPL.format(endpoint), {'did': did, 'cid': video_cid}),
                 **traverse_obj(root, (*embed_path, 'aspectRatio', {
@@ -387,7 +382,7 @@ class BlueskyIE(InfoExtractor):
                 'age_limit': (
                     'labels', ..., 'val', {lambda x: 18 if x in ('sexual', 'porn', 'graphic-media') else None}, any),
                 'description': (*record_path, 'text', {str}, filter),
-                'title': (*record_path, 'text', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}),
+                'title': (*record_path, 'text', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=50)}),
             }),
         })
         return entries

yt_dlp/extractor/bokecc.py

@@ -24,7 +24,7 @@ class BokeCCBaseIE(InfoExtractor):
 
 
 class BokeCCIE(BokeCCBaseIE):
-    IE_DESC = 'CC视频'
+    _IE_DESC = 'CC视频'
     _VALID_URL = r'https?://union\.bokecc\.com/playvideo\.bo\?(?P<query>.*)'
 
     _TESTS = [{

yt_dlp/extractor/bpb.py

@@ -7,7 +7,6 @@ from ..utils import (
     join_nonempty,
     js_to_json,
     mimetype2ext,
-    parse_resolution,
     unified_strdate,
     url_or_none,
     urljoin,
@@ -111,23 +110,24 @@ class BpbIE(InfoExtractor):
 
         return attributes
 
-    def _process_source(self, source):
+    @staticmethod
+    def _process_source(source):
         url = url_or_none(source['src'])
         if not url:
             return None
 
         source_type = source.get('type', '')
         extension = mimetype2ext(source_type)
-        note = self._search_regex(r'[_-]([a-z]+)\.[\da-z]+(?:$|\?)', url, 'note', default=None)
+        is_video = source_type.startswith('video')
+        note = url.rpartition('.')[0].rpartition('_')[2] if is_video else None
 
         return {
             'url': url,
             'ext': extension,
-            'vcodec': None if source_type.startswith('video') else 'none',
+            'vcodec': None if is_video else 'none',
             'quality': 10 if note == 'high' else 0,
             'format_note': note,
             'format_id': join_nonempty(extension, note),
-            **parse_resolution(source.get('label')),
         }
 
     def _real_extract(self, url):

yt_dlp/extractor/bunnycdn.py

@@ -1,178 +0,0 @@
-import json
-
-from .common import InfoExtractor
-from ..networking import HEADRequest
-from ..utils import (
-    ExtractorError,
-    extract_attributes,
-    int_or_none,
-    parse_qs,
-    smuggle_url,
-    unsmuggle_url,
-    url_or_none,
-    urlhandle_detect_ext,
-)
-from ..utils.traversal import find_element, traverse_obj
-
-
-class BunnyCdnIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:iframe\.mediadelivery\.net|video\.bunnycdn\.com)/(?:embed|play)/(?P<library_id>\d+)/(?P<id>[\da-f-]+)'
-    _EMBED_REGEX = [rf'<iframe[^>]+src=[\'"](?P<url>{_VALID_URL}[^\'"]*)[\'"]']
-    _TESTS = [{
-        'url': 'https://iframe.mediadelivery.net/embed/113933/e73edec1-e381-4c8b-ae73-717a140e0924',
-        'info_dict': {
-            'id': 'e73edec1-e381-4c8b-ae73-717a140e0924',
-            'ext': 'mp4',
-            'title': 'mistress morgana (3).mp4',
-            'description': '',
-            'timestamp': 1693251673,
-            'thumbnail': r're:^https?://.*\.b-cdn\.net/e73edec1-e381-4c8b-ae73-717a140e0924/thumbnail\.jpg',
-            'duration': 7.0,
-            'upload_date': '20230828',
-        },
-        'params': {'skip_download': True},
-    }, {
-        'url': 'https://iframe.mediadelivery.net/play/136145/32e34c4b-0d72-437c-9abb-05e67657da34',
-        'info_dict': {
-            'id': '32e34c4b-0d72-437c-9abb-05e67657da34',
-            'ext': 'mp4',
-            'timestamp': 1691145748,
-            'thumbnail': r're:^https?://.*\.b-cdn\.net/32e34c4b-0d72-437c-9abb-05e67657da34/thumbnail_9172dc16\.jpg',
-            'duration': 106.0,
-            'description': 'md5:981a3e899a5c78352b21ed8b2f1efd81',
-            'upload_date': '20230804',
-            'title': 'Sanela ist Teil der #arbeitsmarktkraft',
-        },
-        'params': {'skip_download': True},
-    }, {
-        # Stream requires activation and pings
-        'url': 'https://iframe.mediadelivery.net/embed/200867/2e8545ec-509d-4571-b855-4cf0235ccd75',
-        'info_dict': {
-            'id': '2e8545ec-509d-4571-b855-4cf0235ccd75',
-            'ext': 'mp4',
-            'timestamp': 1708497752,
-            'title': 'netflix part 1',
-            'duration': 3959.0,
-            'description': '',
-            'upload_date': '20240221',
-            'thumbnail': r're:^https?://.*\.b-cdn\.net/2e8545ec-509d-4571-b855-4cf0235ccd75/thumbnail\.jpg',
-        },
-        'params': {'skip_download': True},
-    }]
-    _WEBPAGE_TESTS = [{
-        # Stream requires Referer
-        'url': 'https://conword.io/',
-        'info_dict': {
-            'id': '3a5d863e-9cd6-447e-b6ef-e289af50b349',
-            'ext': 'mp4',
-            'title': 'Conword bei der Stadt Köln und Stadt Dortmund',
-            'description': '',
-            'upload_date': '20231031',
-            'duration': 31.0,
-            'thumbnail': 'https://video.watchuh.com/3a5d863e-9cd6-447e-b6ef-e289af50b349/thumbnail.jpg',
-            'timestamp': 1698783879,
-        },
-        'params': {'skip_download': True},
-    }, {
-        # URL requires token and expires
-        'url': 'https://www.stockphotos.com/video/moscow-subway-the-train-is-arriving-at-the-park-kultury-station-10017830',
-        'info_dict': {
-            'id': '0b02fa20-4e8c-4140-8f87-f64d820a3386',
-            'ext': 'mp4',
-            'thumbnail': r're:^https?://.*\.b-cdn\.net/0b02fa20-4e8c-4140-8f87-f64d820a3386/thumbnail\.jpg',
-            'title': 'Moscow subway. The train is arriving at the Park Kultury station.',
-            'upload_date': '20240531',
-            'duration': 18.0,
-            'timestamp': 1717152269,
-            'description': '',
-        },
-        'params': {'skip_download': True},
-    }]
-
-    @classmethod
-    def _extract_embed_urls(cls, url, webpage):
-        for embed_url in super()._extract_embed_urls(url, webpage):
-            yield smuggle_url(embed_url, {'Referer': url})
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-
-        video_id, library_id = self._match_valid_url(url).group('id', 'library_id')
-        webpage = self._download_webpage(
-            f'https://iframe.mediadelivery.net/embed/{library_id}/{video_id}', video_id,
-            headers=traverse_obj(smuggled_data, {'Referer': 'Referer'}),
-            query=traverse_obj(parse_qs(url), {'token': 'token', 'expires': 'expires'}))
-
-        if html_title := self._html_extract_title(webpage, default=None) == '403':
-            raise ExtractorError(
-                'This video is inaccessible. Setting a Referer header '
-                'might be required to access the video', expected=True)
-        elif html_title == '404':
-            raise ExtractorError('This video does not exist', expected=True)
-
-        headers = {'Referer': url}
-
-        info = traverse_obj(self._parse_html5_media_entries(url, webpage, video_id, _headers=headers), 0) or {}
-        formats = info.get('formats') or []
-        subtitles = info.get('subtitles') or {}
-
-        original_url = self._search_regex(
-            r'(?:var|const|let)\s+originalUrl\s*=\s*["\']([^"\']+)["\']', webpage, 'original url', default=None)
-        if url_or_none(original_url):
-            urlh = self._request_webpage(
-                HEADRequest(original_url), video_id=video_id, note='Checking original',
-                headers=headers, fatal=False, expected_status=(403, 404))
-            if urlh and urlh.status == 200:
-                formats.append({
-                    'url': original_url,
-                    'format_id': 'source',
-                    'quality': 1,
-                    'http_headers': headers,
-                    'ext': urlhandle_detect_ext(urlh, default='mp4'),
-                    'filesize': int_or_none(urlh.get_header('Content-Length')),
-                })
-
-        # MediaCage Streams require activation and pings
-        src_url = self._search_regex(
-            r'\.setAttribute\([\'"]src[\'"],\s*[\'"]([^\'"]+)[\'"]\)', webpage, 'src url', default=None)
-        activation_url = self._search_regex(
-            r'loadUrl\([\'"]([^\'"]+/activate)[\'"]', webpage, 'activation url', default=None)
-        ping_url = self._search_regex(
-            r'loadUrl\([\'"]([^\'"]+/ping)[\'"]', webpage, 'ping url', default=None)
-        secret = traverse_obj(parse_qs(src_url), ('secret', 0))
-        context_id = traverse_obj(parse_qs(src_url), ('contextId', 0))
-        ping_data = {}
-        if src_url and activation_url and ping_url and secret and context_id:
-            self._download_webpage(
-                activation_url, video_id, headers=headers, note='Downloading activation data')
-
-            fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                src_url, video_id, 'mp4', headers=headers, m3u8_id='hls', fatal=False)
-            for fmt in fmts:
-                fmt.update({
-                    'protocol': 'bunnycdn',
-                    'http_headers': headers,
-                })
-            formats.extend(fmts)
-            self._merge_subtitles(subs, target=subtitles)
-
-            ping_data = {
-                '_bunnycdn_ping_data': {
-                    'url': ping_url,
-                    'headers': headers,
-                    'secret': secret,
-                    'context_id': context_id,
-                },
-            }
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'subtitles': subtitles,
-            **traverse_obj(webpage, ({find_element(id='main-video', html=True)}, {extract_attributes}, {
-                'title': ('data-plyr-config', {json.loads}, 'title', {str}),
-                'thumbnail': ('data-poster', {url_or_none}),
-            })),
-            **ping_data,
-            **self._search_json_ld(webpage, video_id, fatal=False),
-        }

yt_dlp/extractor/canalsurmas.py

@@ -1,84 +0,0 @@
-import json
-import time
-
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    float_or_none,
-    jwt_decode_hs256,
-    parse_iso8601,
-    url_or_none,
-    variadic,
-)
-from ..utils.traversal import traverse_obj
-
-
-class CanalsurmasIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?canalsurmas\.es/videos/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.canalsurmas.es/videos/44006-el-gran-queo-1-lora-del-rio-sevilla-20072014',
-        'md5': '861f86fdc1221175e15523047d0087ef',
-        'info_dict': {
-            'id': '44006',
-            'ext': 'mp4',
-            'title': 'Lora del Río (Sevilla)',
-            'description': 'md5:3d9ee40a9b1b26ed8259e6b71ed27b8b',
-            'thumbnail': 'https://cdn2.rtva.interactvty.com/content_cards/00f3e8f67b0a4f3b90a4a14618a48b0d.jpg',
-            'timestamp': 1648123182,
-            'upload_date': '20220324',
-        },
-    }]
-    _API_BASE = 'https://api-rtva.interactvty.com'
-    _access_token = None
-
-    @staticmethod
-    def _is_jwt_expired(token):
-        return jwt_decode_hs256(token)['exp'] - time.time() < 300
-
-    def _call_api(self, endpoint, video_id, fields=None):
-        if not self._access_token or self._is_jwt_expired(self._access_token):
-            self._access_token = self._download_json(
-                f'{self._API_BASE}/jwt/token/', None,
-                'Downloading access token', 'Failed to download access token',
-                headers={'Content-Type': 'application/json'},
-                data=json.dumps({
-                    'username': 'canalsur_demo',
-                    'password': 'dsUBXUcI',
-                }).encode())['access']
-
-        return self._download_json(
-            f'{self._API_BASE}/api/2.0/contents/{endpoint}/{video_id}/', video_id,
-            f'Downloading {endpoint} API JSON', f'Failed to download {endpoint} API JSON',
-            headers={'Authorization': f'jwtok {self._access_token}'},
-            query={'optional_fields': ','.join(variadic(fields))} if fields else None)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_info = self._call_api('content', video_id, fields=[
-            'description', 'image', 'duration', 'created_at', 'tags',
-        ])
-        stream_info = self._call_api('content_resources', video_id, 'media_url')
-
-        formats, subtitles = [], {}
-        for stream_url in traverse_obj(stream_info, ('results', ..., 'media_url', {url_or_none})):
-            if determine_ext(stream_url) == 'm3u8':
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    stream_url, video_id, m3u8_id='hls', fatal=False)
-                formats.extend(fmts)
-                self._merge_subtitles(subs, target=subtitles)
-            else:
-                formats.append({'url': stream_url})
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'subtitles': subtitles,
-            **traverse_obj(video_info, {
-                'title': ('name', {str.strip}),
-                'description': ('description', {str}),
-                'thumbnail': ('image', {url_or_none}),
-                'duration': ('duration', {float_or_none}),
-                'timestamp': ('created_at', {parse_iso8601}),
-                'tags': ('tags', ..., {str}),
-            }),
-        }

yt_dlp/extractor/cbc.py

@@ -1,32 +1,29 @@
+import base64
 import functools
+import json
 import re
 import time
 import urllib.parse
 
 from .common import InfoExtractor
 from ..networking import HEADRequest
-from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     float_or_none,
     int_or_none,
     js_to_json,
-    jwt_decode_hs256,
     mimetype2ext,
     orderedSet,
-    parse_age_limit,
     parse_iso8601,
     replace_extension,
     smuggle_url,
     strip_or_none,
+    traverse_obj,
     try_get,
-    unified_timestamp,
     update_url,
     url_basename,
     url_or_none,
-    urlencode_postdata,
 )
-from ..utils.traversal import require, traverse_obj, trim_str
 
 
 class CBCIE(InfoExtractor):
@@ -519,43 +516,9 @@ class CBCPlayerPlaylistIE(InfoExtractor):
         return self.playlist_result(entries(), playlist_id)
 
 
-class CBCGemBaseIE(InfoExtractor):
+class CBCGemIE(InfoExtractor):
-    _NETRC_MACHINE = 'cbcgem'
-    _GEO_COUNTRIES = ['CA']
-
-    def _call_show_api(self, item_id, display_id=None):
-        return self._download_json(
-            f'https://services.radio-canada.ca/ott/catalog/v2/gem/show/{item_id}',
-            display_id or item_id, query={'device': 'web'})
-
-    def _extract_item_info(self, item_info):
-        episode_number = None
-        title = traverse_obj(item_info, ('title', {str}))
-        if title and (mobj := re.match(r'(?P<episode>\d+)\. (?P<title>.+)', title)):
-            episode_number = int_or_none(mobj.group('episode'))
-            title = mobj.group('title')
-
-        return {
-            'episode_number': episode_number,
-            **traverse_obj(item_info, {
-                'id': ('url', {str}),
-                'episode_id': ('url', {str}),
-                'description': ('description', {str}),
-                'thumbnail': ('images', 'card', 'url', {url_or_none}, {update_url(query=None)}),
-                'episode_number': ('episodeNumber', {int_or_none}),
-                'duration': ('metadata', 'duration', {int_or_none}),
-                'release_timestamp': ('metadata', 'airDate', {unified_timestamp}),
-                'timestamp': ('metadata', 'availabilityDate', {unified_timestamp}),
-                'age_limit': ('metadata', 'rating', {trim_str(start='C')}, {parse_age_limit}),
-            }),
-            'episode': title,
-            'title': title,
-        }
-
-
-class CBCGemIE(CBCGemBaseIE):
     IE_NAME = 'gem.cbc.ca'
-    _VALID_URL = r'https?://gem\.cbc\.ca/(?:media/)?(?P<id>[0-9a-z-]+/s(?P<season>[0-9]+)[a-z][0-9]+)'
+    _VALID_URL = r'https?://gem\.cbc\.ca/(?:media/)?(?P<id>[0-9a-z-]+/s[0-9]+[a-z][0-9]+)'
     _TESTS = [{
         # This is a normal, public, TV show video
         'url': 'https://gem.cbc.ca/media/schitts-creek/s06e01',
@@ -566,7 +529,7 @@ class CBCGemIE(CBCGemBaseIE):
             'description': 'md5:929868d20021c924020641769eb3e7f1',
             'thumbnail': r're:https://images\.radio-canada\.ca/[^#?]+/cbc_schitts_creek_season_06e01_thumbnail_v01\.jpg',
             'duration': 1324,
-            'genres': ['Comédie et humour'],
+            'categories': ['comedy'],
             'series': 'Schitt\'s Creek',
             'season': 'Season 6',
             'season_number': 6,
@@ -574,10 +537,9 @@ class CBCGemIE(CBCGemBaseIE):
             'episode_number': 1,
             'episode_id': 'schitts-creek/s06e01',
             'upload_date': '20210618',
-            'timestamp': 1623974400,
+            'timestamp': 1623988800,
             'release_date': '20200107',
-            'release_timestamp': 1578355200,
+            'release_timestamp': 1578427200,
-            'age_limit': 14,
         },
         'params': {'format': 'bv'},
     }, {
@@ -595,13 +557,12 @@ class CBCGemIE(CBCGemBaseIE):
             'episode_number': 1,
             'episode': 'The Cup Runneth Over',
             'episode_id': 'schitts-creek/s01e01',
-            'duration': 1308,
+            'duration': 1309,
-            'genres': ['Comédie et humour'],
+            'categories': ['comedy'],
             'upload_date': '20210617',
-            'timestamp': 1623888000,
+            'timestamp': 1623902400,
-            'release_date': '20151123',
+            'release_date': '20151124',
-            'release_timestamp': 1448236800,
+            'release_timestamp': 1448323200,
-            'age_limit': 14,
         },
         'params': {'format': 'bv'},
     }, {
@@ -609,107 +570,82 @@ class CBCGemIE(CBCGemBaseIE):
         'only_matching': True,
     }]
 
-    _CLIENT_ID = 'fc05b0ee-3865-4400-a3cc-3da82c330c23'
+    _GEO_COUNTRIES = ['CA']
-    _refresh_token = None
+    _TOKEN_API_KEY = '3f4beddd-2061-49b0-ae80-6f1f2ed65b37'
-    _access_token = None
+    _NETRC_MACHINE = 'cbcgem'
     _claims_token = None
 
-    @functools.cached_property
+    def _new_claims_token(self, email, password):
-    def _ropc_settings(self):
+        data = json.dumps({
-        return self._download_json(
+            'email': email,
-            'https://services.radio-canada.ca/ott/catalog/v1/gem/settings', None,
-            'Downloading site settings', query={'device': 'web'})['identityManagement']['ropc']
-
-    def _is_jwt_expired(self, token):
-        return jwt_decode_hs256(token)['exp'] - time.time() < 300
-
-    def _call_oauth_api(self, oauth_data, note='Refreshing access token'):
-        response = self._download_json(
-            self._ropc_settings['url'], None, note, data=urlencode_postdata({
-                'client_id': self._CLIENT_ID,
-                **oauth_data,
-                'scope': self._ropc_settings['scopes'],
-            }))
-        self._refresh_token = response['refresh_token']
-        self._access_token = response['access_token']
-        self.cache.store(self._NETRC_MACHINE, 'token_data', [self._refresh_token, self._access_token])
-
-    def _perform_login(self, username, password):
-        if not self._refresh_token:
-            self._refresh_token, self._access_token = self.cache.load(
-                self._NETRC_MACHINE, 'token_data', default=[None, None])
-
-        if self._refresh_token and self._access_token:
-            self.write_debug('Using cached refresh token')
-            if not self._claims_token:
-                self._claims_token = self.cache.load(self._NETRC_MACHINE, 'claims_token')
-            return
-
-        try:
-            self._call_oauth_api({
-                'grant_type': 'password',
-                'username': username,
             'password': password,
-            }, note='Logging in')
+        }).encode()
-        except ExtractorError as e:
+        headers = {'content-type': 'application/json'}
-            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+        query = {'apikey': self._TOKEN_API_KEY}
-                raise ExtractorError('Invalid username and/or password', expected=True)
+        resp = self._download_json('https://api.loginradius.com/identity/v2/auth/login',
-            raise
+                                   None, data=data, headers=headers, query=query)
+        access_token = resp['access_token']
 
-    def _fetch_access_token(self):
+        query = {
-        if self._is_jwt_expired(self._access_token):
+            'access_token': access_token,
-            try:
+            'apikey': self._TOKEN_API_KEY,
-                self._call_oauth_api({
+            'jwtapp': 'jwt',
-                    'grant_type': 'refresh_token',
+        }
-                    'refresh_token': self._refresh_token,
+        resp = self._download_json('https://cloud-api.loginradius.com/sso/jwt/api/token',
-                })
+                                   None, headers=headers, query=query)
-            except ExtractorError:
+        sig = resp['signature']
-                self._refresh_token, self._access_token = None, None
-                self.cache.store(self._NETRC_MACHINE, 'token_data', [None, None])
-                self.report_warning('Refresh token has been invalidated; retrying with credentials')
-                self._perform_login(*self._get_login_info())
 
-        return self._access_token
+        data = json.dumps({'jwt': sig}).encode()
+        headers = {'content-type': 'application/json', 'ott-device-type': 'web'}
+        resp = self._download_json('https://services.radio-canada.ca/ott/cbc-api/v2/token',
+                                   None, data=data, headers=headers, expected_status=426)
+        cbc_access_token = resp['accessToken']
 
-    def _fetch_claims_token(self):
+        headers = {'content-type': 'application/json', 'ott-device-type': 'web', 'ott-access-token': cbc_access_token}
-        if not self._get_login_info()[0]:
+        resp = self._download_json('https://services.radio-canada.ca/ott/cbc-api/v2/profile',
-            return None
+                                   None, headers=headers, expected_status=426)
+        return resp['claimsToken']
 
-        if not self._claims_token or self._is_jwt_expired(self._claims_token):
+    def _get_claims_token_expiry(self):
-            self._claims_token = self._download_json(
+        # Token is a JWT
-                'https://services.radio-canada.ca/ott/subscription/v2/gem/Subscriber/profile',
+        # JWT is decoded here and 'exp' field is extracted
-                None, 'Downloading claims token', query={'device': 'web'},
+        # It is a Unix timestamp for when the token expires
-                headers={'Authorization': f'Bearer {self._fetch_access_token()}'})['claimsToken']
+        b64_data = self._claims_token.split('.')[1]
+        data = base64.urlsafe_b64decode(b64_data + '==')
+        return json.loads(data)['exp']
+
+    def claims_token_expired(self):
+        exp = self._get_claims_token_expiry()
+        # It will expire in less than 10 seconds, or has already expired
+        return exp - time.time() < 10
+
+    def claims_token_valid(self):
+        return self._claims_token is not None and not self.claims_token_expired()
+
+    def _get_claims_token(self, email, password):
+        if not self.claims_token_valid():
+            self._claims_token = self._new_claims_token(email, password)
             self.cache.store(self._NETRC_MACHINE, 'claims_token', self._claims_token)
-        else:
-            self.write_debug('Using cached claims token')
-
         return self._claims_token
 
+    def _real_initialize(self):
+        if self.claims_token_valid():
+            return
+        self._claims_token = self.cache.load(self._NETRC_MACHINE, 'claims_token')
+
     def _real_extract(self, url):
-        video_id, season_number = self._match_valid_url(url).group('id', 'season')
+        video_id = self._match_id(url)
-        video_info = self._call_show_api(video_id)
+        video_info = self._download_json(
-        item_info = traverse_obj(video_info, (
+            f'https://services.radio-canada.ca/ott/cbc-api/v2/assets/{video_id}',
-            'content', ..., 'lineups', ..., 'items',
+            video_id, expected_status=426)
-            lambda _, v: v['url'] == video_id, any, {require('item info')}))
 
+        email, password = self._get_login_info()
+        if email and password:
+            claims_token = self._get_claims_token(email, password)
+            headers = {'x-claims-token': claims_token}
+        else:
             headers = {}
-        if claims_token := self._fetch_claims_token():
+        m3u8_info = self._download_json(video_info['playSession']['url'], video_id, headers=headers)
-            headers['x-claims-token'] = claims_token
-
-        m3u8_info = self._download_json(
-            'https://services.radio-canada.ca/media/validation/v2/',
-            video_id, headers=headers, query={
-                'appCode': 'gem',
-                'connectionType': 'hd',
-                'deviceType': 'ipad',
-                'multibitrate': 'true',
-                'output': 'json',
-                'tech': 'hls',
-                'manifestVersion': '2',
-                'manifestType': 'desktop',
-                'idMedia': item_info['idMedia'],
-            })
 
         if m3u8_info.get('errorCode') == 1:
             self.raise_geo_restricted(countries=['CA'])
@@ -735,20 +671,26 @@ class CBCGemIE(CBCGemBaseIE):
                     fmt['preference'] = -2
 
         return {
-            'season_number': int_or_none(season_number),
-            **traverse_obj(video_info, {
-                'series': ('title', {str}),
-                'season_number': ('structuredMetadata', 'partofSeason', 'seasonNumber', {int_or_none}),
-                'genres': ('structuredMetadata', 'genre', ..., {str}),
-            }),
-            **self._extract_item_info(item_info),
             'id': video_id,
             'episode_id': video_id,
             'formats': formats,
+            **traverse_obj(video_info, {
+                'title': ('title', {str}),
+                'episode': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('image', {url_or_none}),
+                'series': ('series', {str}),
+                'season_number': ('season', {int_or_none}),
+                'episode_number': ('episode', {int_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'categories': ('category', {str}, all),
+                'release_timestamp': ('airDate', {int_or_none(scale=1000)}),
+                'timestamp': ('availableDate', {int_or_none(scale=1000)}),
+            }),
         }
 
 
-class CBCGemPlaylistIE(CBCGemBaseIE):
+class CBCGemPlaylistIE(InfoExtractor):
     IE_NAME = 'gem.cbc.ca:playlist'
     _VALID_URL = r'https?://gem\.cbc\.ca/(?:media/)?(?P<id>(?P<show>[0-9a-z-]+)/s(?P<season>[0-9]+))/?(?:[?#]|$)'
     _TESTS = [{
@@ -758,35 +700,70 @@ class CBCGemPlaylistIE(CBCGemBaseIE):
         'info_dict': {
             'id': 'schitts-creek/s06',
             'title': 'Season 6',
+            'description': 'md5:6a92104a56cbeb5818cc47884d4326a2',
             'series': 'Schitt\'s Creek',
             'season_number': 6,
             'season': 'Season 6',
+            'thumbnail': 'https://images.radio-canada.ca/v1/synps-cbc/season/perso/cbc_schitts_creek_season_06_carousel_v03.jpg?impolicy=ott&im=Resize=(_Size_)&quality=75',
         },
     }, {
         'url': 'https://gem.cbc.ca/schitts-creek/s06',
         'only_matching': True,
     }]
-
+    _API_BASE = 'https://services.radio-canada.ca/ott/cbc-api/v2/shows/'
-    def _entries(self, season_info):
-        for episode in traverse_obj(season_info, ('items', lambda _, v: v['url'])):
-            yield self.url_result(
-                f'https://gem.cbc.ca/media/{episode["url"]}', CBCGemIE,
-                **self._extract_item_info(episode))
 
     def _real_extract(self, url):
-        season_id, show, season = self._match_valid_url(url).group('id', 'show', 'season')
+        match = self._match_valid_url(url)
-        show_info = self._call_show_api(show, display_id=season_id)
+        season_id = match.group('id')
-        season_info = traverse_obj(show_info, (
+        show = match.group('show')
-            'content', ..., 'lineups',
+        show_info = self._download_json(self._API_BASE + show, season_id, expected_status=426)
-            lambda _, v: v['seasonNumber'] == int(season), any, {require('season info')}))
+        season = int(match.group('season'))
 
-        return self.playlist_result(
+        season_info = next((s for s in show_info['seasons'] if s.get('season') == season), None)
-            self._entries(season_info), season_id,
+
-            **traverse_obj(season_info, {
+        if season_info is None:
-                'title': ('title', {str}),
+            raise ExtractorError(f'Couldn\'t find season {season} of {show}')
-                'season': ('title', {str}),
+
-                'season_number': ('seasonNumber', {int_or_none}),
+        episodes = []
-            }), series=traverse_obj(show_info, ('title', {str})))
+        for episode in season_info['assets']:
+            episodes.append({
+                '_type': 'url_transparent',
+                'ie_key': 'CBCGem',
+                'url': 'https://gem.cbc.ca/media/' + episode['id'],
+                'id': episode['id'],
+                'title': episode.get('title'),
+                'description': episode.get('description'),
+                'thumbnail': episode.get('image'),
+                'series': episode.get('series'),
+                'season_number': episode.get('season'),
+                'season': season_info['title'],
+                'season_id': season_info.get('id'),
+                'episode_number': episode.get('episode'),
+                'episode': episode.get('title'),
+                'episode_id': episode['id'],
+                'duration': episode.get('duration'),
+                'categories': [episode.get('category')],
+            })
+
+        thumbnail = None
+        tn_uri = season_info.get('image')
+        # the-national was observed to use a "data:image/png;base64"
+        # URI for their 'image' value. The image was 1x1, and is
+        # probably just a placeholder, so it is ignored.
+        if tn_uri is not None and not tn_uri.startswith('data:'):
+            thumbnail = tn_uri
+
+        return {
+            '_type': 'playlist',
+            'entries': episodes,
+            'id': season_id,
+            'title': season_info['title'],
+            'description': season_info.get('description'),
+            'thumbnail': thumbnail,
+            'series': show_info.get('title'),
+            'season_number': season_info.get('season'),
+            'season': season_info['title'],
+        }
 
 
 class CBCGemLiveIE(InfoExtractor):

yt_dlp/extractor/cda.py

@@ -13,17 +13,16 @@ from ..compat import compat_ord
 from ..utils import (
     ExtractorError,
     OnDemandPagedList,
-    determine_ext,
     float_or_none,
     int_or_none,
     merge_dicts,
     multipart_encode,
     parse_duration,
+    traverse_obj,
     try_call,
-    url_or_none,
+    try_get,
     urljoin,
 )
-from ..utils.traversal import traverse_obj
 
 
 class CDAIE(InfoExtractor):
@@ -122,7 +121,10 @@ class CDAIE(InfoExtractor):
             }, **kwargs)
 
     def _perform_login(self, username, password):
-        app_version = '1.2.255 build 21541'
+        app_version = random.choice((
+            '1.2.88 build 15306',
+            '1.2.174 build 18469',
+        ))
         android_version = random.randrange(8, 14)
         phone_model = random.choice((
             # x-kom.pl top selling Android smartphones, as of 2022-12-26
@@ -188,7 +190,7 @@ class CDAIE(InfoExtractor):
         meta = self._download_json(
             f'{self._BASE_API_URL}/video/{video_id}', video_id, headers=self._API_HEADERS)['video']
 
-        uploader = traverse_obj(meta, ('author', 'login', {str}))
+        uploader = traverse_obj(meta, 'author', 'login')
 
         formats = [{
             'url': quality['file'],
@@ -291,16 +293,15 @@ class CDAIE(InfoExtractor):
             if not video or 'file' not in video:
                 self.report_warning(f'Unable to extract {version} version information')
                 return
-            video_quality = video.get('quality')
-            qualities = video.get('qualities', {})
-            video_quality = next((k for k, v in qualities.items() if v == video_quality), video_quality)
-            if video.get('file'):
             if video['file'].startswith('uggc'):
                 video['file'] = codecs.decode(video['file'], 'rot_13')
                 if video['file'].endswith('adc.mp4'):
                     video['file'] = video['file'].replace('adc.mp4', '.mp4')
             elif not video['file'].startswith('http'):
                 video['file'] = decrypt_file(video['file'])
+            video_quality = video.get('quality')
+            qualities = video.get('qualities', {})
+            video_quality = next((k for k, v in qualities.items() if v == video_quality), video_quality)
             info_dict['formats'].append({
                 'url': video['file'],
                 'format_id': video_quality,
@@ -312,26 +313,14 @@ class CDAIE(InfoExtractor):
                 data = {'jsonrpc': '2.0', 'method': 'videoGetLink', 'id': 2,
                         'params': [video_id, cda_quality, video.get('ts'), video.get('hash2'), {}]}
                 data = json.dumps(data).encode()
-                response = self._download_json(
+                video_url = self._download_json(
                     f'https://www.cda.pl/video/{video_id}', video_id, headers={
                         'Content-Type': 'application/json',
                         'X-Requested-With': 'XMLHttpRequest',
                     }, data=data, note=f'Fetching {quality} url',
                     errnote=f'Failed to fetch {quality} url', fatal=False)
-                if (
+                if try_get(video_url, lambda x: x['result']['status']) == 'ok':
-                    traverse_obj(response, ('result', 'status')) != 'ok'
+                    video_url = try_get(video_url, lambda x: x['result']['resp'])
-                    or not traverse_obj(response, ('result', 'resp', {url_or_none}))
-                ):
-                    continue
-                video_url = response['result']['resp']
-                ext = determine_ext(video_url)
-                if ext == 'mpd':
-                    info_dict['formats'].extend(self._extract_mpd_formats(
-                        video_url, video_id, mpd_id='dash', fatal=False))
-                elif ext == 'm3u8':
-                    info_dict['formats'].extend(self._extract_m3u8_formats(
-                        video_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
-                else:
                     info_dict['formats'].append({
                         'url': video_url,
                         'format_id': quality,
@@ -367,7 +356,7 @@ class CDAIE(InfoExtractor):
 
 class CDAFolderIE(InfoExtractor):
     _MAX_PAGE_SIZE = 36
-    _VALID_URL = r'https?://(?:www\.)?cda\.pl/(?P<channel>[\w-]+)/folder/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?cda\.pl/(?P<channel>\w+)/folder/(?P<id>\d+)'
     _TESTS = [
         {
             'url': 'https://www.cda.pl/domino264/folder/31188385',
@@ -392,9 +381,6 @@ class CDAFolderIE(InfoExtractor):
                 'title': 'TESTY KOSMETYKÓW',
             },
             'playlist_mincount': 139,
-        }, {
-            'url': 'https://www.cda.pl/FILMY-SERIALE-ANIME-KRESKOWKI-BAJKI/folder/18493422',
-            'only_matching': True,
         }]
 
     def _real_extract(self, url):

yt_dlp/extractor/chzzk.py

@@ -21,7 +21,7 @@ class CHZZKLiveIE(InfoExtractor):
             'channel': '진짜도현',
             'channel_id': 'c68b8ef525fb3d2fa146344d84991753',
             'channel_is_verified': False,
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'timestamp': 1705510344,
             'upload_date': '20240117',
             'live_status': 'is_live',
@@ -98,7 +98,7 @@ class CHZZKVideoIE(InfoExtractor):
             'channel': '침착맨',
             'channel_id': 'bb382c2c0cc9fa7c86ab3b037fb5799c',
             'channel_is_verified': False,
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 15577,
             'timestamp': 1702970505.417,
             'upload_date': '20231219',
@@ -115,7 +115,7 @@ class CHZZKVideoIE(InfoExtractor):
             'channel': '라디유radiyu',
             'channel_id': '68f895c59a1043bc5019b5e08c83a5c5',
             'channel_is_verified': False,
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 95,
             'timestamp': 1703102631.722,
             'upload_date': '20231220',
@@ -131,30 +131,12 @@ class CHZZKVideoIE(InfoExtractor):
             'channel': '강지',
             'channel_id': 'b5ed5db484d04faf4d150aedd362f34b',
             'channel_is_verified': True,
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 4433,
             'timestamp': 1703307460.214,
             'upload_date': '20231223',
             'view_count': int,
         },
-    }, {
-        # video_status == 'NONE' but is downloadable
-        'url': 'https://chzzk.naver.com/video/6325166',
-        'info_dict': {
-            'id': '6325166',
-            'ext': 'mp4',
-            'title': '와이프 숙제빼주기',
-            'channel': '이 다',
-            'channel_id': '0076a519f147ee9fd0959bf02f9571ca',
-            'channel_is_verified': False,
-            'view_count': int,
-            'duration': 28167,
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1742139216.86,
-            'upload_date': '20250316',
-            'live_status': 'was_live',
-        },
-        'params': {'skip_download': 'm3u8'},
     }]
 
     def _real_extract(self, url):
@@ -165,7 +147,11 @@ class CHZZKVideoIE(InfoExtractor):
 
         live_status = 'was_live' if video_meta.get('liveOpenDate') else 'not_live'
         video_status = video_meta.get('vodStatus')
-        if video_status == 'ABR_HLS':
+        if video_status == 'UPLOAD':
+            playback = self._parse_json(video_meta['liveRewindPlaybackJson'], video_id)
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                playback['media'][0]['path'], video_id, 'mp4', m3u8_id='hls')
+        elif video_status == 'ABR_HLS':
             formats, subtitles = self._extract_mpd_formats_and_subtitles(
                 f'https://apis.naver.com/neonplayer/vodplay/v1/playback/{video_meta["videoId"]}',
                 video_id, query={
@@ -175,13 +161,6 @@ class CHZZKVideoIE(InfoExtractor):
                     'cpl': 'en_US',
                 })
         else:
-            fatal = video_status == 'UPLOAD'
-            playback = self._parse_json(video_meta['liveRewindPlaybackJson'], video_id, fatal=fatal)
-            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-                traverse_obj(playback, ('media', 0, 'path')), video_id, 'mp4', m3u8_id='hls', fatal=fatal)
-            if formats and video_status != 'UPLOAD':
-                self.write_debug(f'Video found with status: "{video_status}"')
-            elif not formats:
             self.raise_no_formats(
                 f'Unknown video status detected: "{video_status}"', expected=True, video_id=video_id)
             formats, subtitles = [], {}

yt_dlp/extractor/common.py

@@ -2,6 +2,7 @@ import base64
 import collections
 import functools
 import getpass
+import hashlib
 import http.client
 import http.cookiejar
 import http.cookies
@@ -29,7 +30,6 @@ from ..compat import (
 from ..cookies import LenientSimpleCookie
 from ..downloader.f4m import get_base_url, remove_encrypted_media
 from ..downloader.hls import HlsFD
-from ..globals import plugin_ies_overrides
 from ..networking import HEADRequest, Request
 from ..networking.exceptions import (
     HTTPError,
@@ -78,7 +78,7 @@ from ..utils import (
     parse_iso8601,
     parse_m3u8_attributes,
     parse_resolution,
-    qualities,
+    sanitize_filename,
     sanitize_url,
     smuggle_url,
     str_or_none,
@@ -100,7 +100,6 @@ from ..utils import (
     xpath_text,
     xpath_with_ns,
 )
-from ..utils._utils import _request_dump_filename
 
 
 class InfoExtractor:
@@ -202,11 +201,6 @@ class InfoExtractor:
                                             fragment_base_url
                                  * "duration" (optional, int or float)
                                  * "filesize" (optional, int)
-                    * hls_media_playlist_data
-                                 The M3U8 media playlist data as a string.
-                                 Only use if the data must be modified during extraction and
-                                 the native HLS downloader should bypass requesting the URL.
-                                 Does not apply if ffmpeg is used as external downloader
                     * is_from_start  Is a live format that can be downloaded
                                 from the start. Boolean
                     * preference Order number of this format. If this field is
@@ -1023,6 +1017,23 @@ class InfoExtractor:
                 'Visit http://blocklist.rkn.gov.ru/ for a block reason.',
                 expected=True)
 
+    def _request_dump_filename(self, url, video_id, data=None):
+        if data is not None:
+            data = hashlib.md5(data).hexdigest()
+        basen = join_nonempty(video_id, data, url, delim='_')
+        trim_length = self.get_param('trim_file_name') or 240
+        if len(basen) > trim_length:
+            h = '___' + hashlib.md5(basen.encode()).hexdigest()
+            basen = basen[:trim_length - len(h)] + h
+        filename = sanitize_filename(f'{basen}.dump', restricted=True)
+        # Working around MAX_PATH limitation on Windows (see
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)
+        if os.name == 'nt':
+            absfilepath = os.path.abspath(filename)
+            if len(absfilepath) > 259:
+                filename = fR'\\?\{absfilepath}'
+        return filename
+
     def __decode_webpage(self, webpage_bytes, encoding, headers):
         if not encoding:
             encoding = self._guess_encoding_from_content(headers.get('Content-Type', ''), webpage_bytes)
@@ -1051,9 +1062,7 @@ class InfoExtractor:
         if self.get_param('write_pages'):
             if isinstance(url_or_request, Request):
                 data = self._create_request(url_or_request, data).data
-            filename = _request_dump_filename(
+            filename = self._request_dump_filename(urlh.url, video_id, data)
-                urlh.url, video_id, data,
-                trim_length=self.get_param('trim_file_name'))
             self.to_screen(f'Saving request to {filename}')
             with open(filename, 'wb') as outf:
                 outf.write(webpage_bytes)
@@ -1114,9 +1123,7 @@ class InfoExtractor:
                              impersonate=None, require_impersonation=False):
             if self.get_param('load_pages'):
                 url_or_request = self._create_request(url_or_request, data, headers, query)
-                filename = _request_dump_filename(
+                filename = self._request_dump_filename(url_or_request.url, video_id, url_or_request.data)
-                    url_or_request.url, video_id, url_or_request.data,
-                    trim_length=self.get_param('trim_file_name'))
                 self.to_screen(f'Loading request from {filename}')
                 try:
                     with open(filename, 'rb') as dumpf:
@@ -1570,8 +1577,6 @@ class InfoExtractor:
         """Yield all json ld objects in the html"""
         if default is not NO_DEFAULT:
             fatal = False
-        if not fatal and not isinstance(html, str):
-            return
         for mobj in re.finditer(JSON_LD_RE, html):
             json_ld_item = self._parse_json(
                 mobj.group('json_ld'), video_id, fatal=fatal,
@@ -2180,8 +2185,6 @@ class InfoExtractor:
             media_url = media.get('URI')
             if media_url:
                 manifest_url = format_url(media_url)
-                is_audio = media_type == 'AUDIO'
-                is_alternate = media.get('DEFAULT') == 'NO' or media.get('AUTOSELECT') == 'NO'
                 formats.extend({
                     'format_id': join_nonempty(m3u8_id, group_id, name, idx),
                     'format_note': name,
@@ -2194,11 +2197,7 @@ class InfoExtractor:
                     'preference': preference,
                     'quality': quality,
                     'has_drm': has_drm,
-                    'vcodec': 'none' if is_audio else None,
+                    'vcodec': 'none' if media_type == 'AUDIO' else None,
-                    # Alternate audio formats (e.g. audio description) should be deprioritized
-                    'source_preference': -2 if is_audio and is_alternate else None,
-                    # Save this to assign source_preference based on associated video stream
-                    '_audio_group_id': group_id if is_audio and not is_alternate else None,
                 } for idx in _extract_m3u8_playlist_indices(manifest_url))
 
         def build_stream_name():
@@ -2293,8 +2292,6 @@ class InfoExtractor:
                     # ignore references to rendition groups and treat them
                     # as complete formats.
                     if audio_group_id and codecs and f.get('vcodec') != 'none':
-                        # Save this to determine quality of audio formats that only have a GROUP-ID
-                        f['_audio_group_id'] = audio_group_id
                         audio_group = groups.get(audio_group_id)
                         if audio_group and audio_group[0].get('URI'):
                             # TODO: update acodec for audio only formats with
@@ -2317,28 +2314,6 @@ class InfoExtractor:
                         formats.append(http_f)
 
                 last_stream_inf = {}
-
-        # Some audio-only formats only have a GROUP-ID without any other quality/bitrate/codec info
-        # Each audio GROUP-ID corresponds with one or more video formats' AUDIO attribute
-        # For sorting purposes, set source_preference based on the quality of the video formats they are grouped with
-        # See https://github.com/yt-dlp/yt-dlp/issues/11178
-        audio_groups_by_quality = orderedSet(f['_audio_group_id'] for f in sorted(
-            traverse_obj(formats, lambda _, v: v.get('vcodec') != 'none' and v['_audio_group_id']),
-            key=lambda x: (x.get('tbr') or 0, x.get('width') or 0)))
-        audio_quality_map = {
-            audio_groups_by_quality[0]: 'low',
-            audio_groups_by_quality[-1]: 'high',
-        } if len(audio_groups_by_quality) > 1 else None
-        audio_preference = qualities(audio_groups_by_quality)
-        for fmt in formats:
-            audio_group_id = fmt.pop('_audio_group_id', None)
-            if not audio_quality_map or not audio_group_id or fmt.get('vcodec') != 'none':
-                continue
-            # Use source_preference since quality and preference are set by params
-            fmt['source_preference'] = audio_preference(audio_group_id)
-            fmt['format_note'] = join_nonempty(
-                fmt.get('format_note'), audio_quality_map.get(audio_group_id), delim=', ')
-
         return formats, subtitles
 
     def _extract_m3u8_vod_duration(
@@ -2968,7 +2943,8 @@ class InfoExtractor:
                             segment_duration = None
                             if 'total_number' not in representation_ms_info and 'segment_duration' in representation_ms_info:
                                 segment_duration = float_or_none(representation_ms_info['segment_duration'], representation_ms_info['timescale'])
-                                representation_ms_info['total_number'] = math.ceil(float_or_none(period_duration, segment_duration, default=0))
+                                representation_ms_info['total_number'] = int(math.ceil(
+                                    float_or_none(period_duration, segment_duration, default=0)))
                             representation_ms_info['fragments'] = [{
                                 media_location_key: media_template % {
                                     'Number': segment_number,
@@ -3987,18 +3963,14 @@ class InfoExtractor:
     def __init_subclass__(cls, *, plugin_name=None, **kwargs):
         if plugin_name:
             mro = inspect.getmro(cls)
-            next_mro_class = super_class = mro[mro.index(cls) + 1]
+            super_class = cls.__wrapped__ = mro[mro.index(cls) + 1]
-
+            cls.PLUGIN_NAME, cls.ie_key = plugin_name, super_class.ie_key
+            cls.IE_NAME = f'{super_class.IE_NAME}+{plugin_name}'
             while getattr(super_class, '__wrapped__', None):
                 super_class = super_class.__wrapped__
-
-            if not any(override.PLUGIN_NAME == plugin_name for override in plugin_ies_overrides.value[super_class]):
-                cls.__wrapped__ = next_mro_class
-                cls.PLUGIN_NAME, cls.ie_key = plugin_name, next_mro_class.ie_key
-                cls.IE_NAME = f'{next_mro_class.IE_NAME}+{plugin_name}'
-
             setattr(sys.modules[super_class.__module__], super_class.__name__, cls)
-                plugin_ies_overrides.value[super_class].append(cls)
+            _PLUGIN_OVERRIDES[super_class].append(cls)
+
         return super().__init_subclass__(**kwargs)
 
 
@@ -4054,3 +4026,6 @@ class UnsupportedURLIE(InfoExtractor):
 
     def _real_extract(self, url):
         raise UnsupportedError(url)
+
+
+_PLUGIN_OVERRIDES = collections.defaultdict(list)

yt_dlp/extractor/crowdbunker.py

@@ -5,9 +5,7 @@ from ..utils import (
     int_or_none,
     try_get,
     unified_strdate,
-    url_or_none,
 )
-from ..utils.traversal import traverse_obj
 
 
 class CrowdBunkerIE(InfoExtractor):
@@ -46,15 +44,16 @@ class CrowdBunkerIE(InfoExtractor):
                 'url': sub_url,
             })
 
-        if mpd_url := traverse_obj(video_json, ('dashManifest', 'url', {url_or_none})):
+        mpd_url = try_get(video_json, lambda x: x['dashManifest']['url'])
-            fmts, subs = self._extract_mpd_formats_and_subtitles(mpd_url, video_id, mpd_id='dash', fatal=False)
+        if mpd_url:
+            fmts, subs = self._extract_mpd_formats_and_subtitles(mpd_url, video_id)
             formats.extend(fmts)
-            self._merge_subtitles(subs, target=subtitles)
+            subtitles = self._merge_subtitles(subtitles, subs)
-
+        m3u8_url = try_get(video_json, lambda x: x['hlsManifest']['url'])
-        if m3u8_url := traverse_obj(video_json, ('hlsManifest', 'url', {url_or_none})):
+        if m3u8_url:
-            fmts, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, m3u8_id='hls', fatal=False)
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(mpd_url, video_id)
             formats.extend(fmts)
-            self._merge_subtitles(subs, target=subtitles)
+            subtitles = self._merge_subtitles(subtitles, subs)
 
         thumbnails = [{
             'url': image['url'],

yt_dlp/extractor/crunchyroll.py

@@ -0,0 +1,692 @@
+import base64
+import uuid
+
+from .common import InfoExtractor
+from ..networking import Request
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    format_field,
+    int_or_none,
+    jwt_decode_hs256,
+    parse_age_limit,
+    parse_count,
+    parse_iso8601,
+    qualities,
+    time_seconds,
+    traverse_obj,
+    url_or_none,
+    urlencode_postdata,
+)
+
+
+class CrunchyrollBaseIE(InfoExtractor):
+    _BASE_URL = 'https://www.crunchyroll.com'
+    _API_BASE = 'https://api.crunchyroll.com'
+    _NETRC_MACHINE = 'crunchyroll'
+    _SWITCH_USER_AGENT = 'Crunchyroll/1.8.0 Nintendo Switch/12.3.12.0 UE4/4.27'
+    _REFRESH_TOKEN = None
+    _AUTH_HEADERS = None
+    _AUTH_EXPIRY = None
+    _API_ENDPOINT = None
+    _BASIC_AUTH = 'Basic ' + base64.b64encode(':'.join((
+        't-kdgp2h8c3jub8fn0fq',
+        'yfLDfMfrYvKXh4JXS1LEI2cCqu1v5Wan',
+    )).encode()).decode()
+    _IS_PREMIUM = None
+    _LOCALE_LOOKUP = {
+        'ar': 'ar-SA',
+        'de': 'de-DE',
+        '': 'en-US',
+        'es': 'es-419',
+        'es-es': 'es-ES',
+        'fr': 'fr-FR',
+        'it': 'it-IT',
+        'pt-br': 'pt-BR',
+        'pt-pt': 'pt-PT',
+        'ru': 'ru-RU',
+        'hi': 'hi-IN',
+    }
+
+    def _set_auth_info(self, response):
+        CrunchyrollBaseIE._IS_PREMIUM = 'cr_premium' in traverse_obj(response, ('access_token', {jwt_decode_hs256}, 'benefits', ...))
+        CrunchyrollBaseIE._AUTH_HEADERS = {'Authorization': response['token_type'] + ' ' + response['access_token']}
+        CrunchyrollBaseIE._AUTH_EXPIRY = time_seconds(seconds=traverse_obj(response, ('expires_in', {float_or_none}), default=300) - 10)
+
+    def _request_token(self, headers, data, note='Requesting token', errnote='Failed to request token'):
+        try:
+            return self._download_json(
+                f'{self._BASE_URL}/auth/v1/token', None, note=note, errnote=errnote,
+                headers=headers, data=urlencode_postdata(data), impersonate=True)
+        except ExtractorError as error:
+            if not isinstance(error.cause, HTTPError) or error.cause.status != 403:
+                raise
+            if target := error.cause.response.extensions.get('impersonate'):
+                raise ExtractorError(f'Got HTTP Error 403 when using impersonate target "{target}"')
+            raise ExtractorError(
+                'Request blocked by Cloudflare. '
+                'Install the required impersonation dependency if possible, '
+                'or else navigate to Crunchyroll in your browser, '
+                'then pass the fresh cookies (with --cookies-from-browser or --cookies) '
+                'and your browser\'s User-Agent (with --user-agent)', expected=True)
+
+    def _perform_login(self, username, password):
+        if not CrunchyrollBaseIE._REFRESH_TOKEN:
+            CrunchyrollBaseIE._REFRESH_TOKEN = self.cache.load(self._NETRC_MACHINE, username)
+        if CrunchyrollBaseIE._REFRESH_TOKEN:
+            return
+
+        try:
+            login_response = self._request_token(
+                headers={'Authorization': self._BASIC_AUTH}, data={
+                    'username': username,
+                    'password': password,
+                    'grant_type': 'password',
+                    'scope': 'offline_access',
+                }, note='Logging in', errnote='Failed to log in')
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 401:
+                raise ExtractorError('Invalid username and/or password', expected=True)
+            raise
+
+        CrunchyrollBaseIE._REFRESH_TOKEN = login_response['refresh_token']
+        self.cache.store(self._NETRC_MACHINE, username, CrunchyrollBaseIE._REFRESH_TOKEN)
+        self._set_auth_info(login_response)
+
+    def _update_auth(self):
+        if CrunchyrollBaseIE._AUTH_HEADERS and CrunchyrollBaseIE._AUTH_EXPIRY > time_seconds():
+            return
+
+        auth_headers = {'Authorization': self._BASIC_AUTH}
+        if CrunchyrollBaseIE._REFRESH_TOKEN:
+            data = {
+                'refresh_token': CrunchyrollBaseIE._REFRESH_TOKEN,
+                'grant_type': 'refresh_token',
+                'scope': 'offline_access',
+            }
+        else:
+            data = {'grant_type': 'client_id'}
+            auth_headers['ETP-Anonymous-ID'] = uuid.uuid4()
+        try:
+            auth_response = self._request_token(auth_headers, data)
+        except ExtractorError as error:
+            username, password = self._get_login_info()
+            if not username or not isinstance(error.cause, HTTPError) or error.cause.status != 400:
+                raise
+            self.to_screen('Refresh token has expired. Re-logging in')
+            CrunchyrollBaseIE._REFRESH_TOKEN = None
+            self.cache.store(self._NETRC_MACHINE, username, None)
+            self._perform_login(username, password)
+            return
+
+        self._set_auth_info(auth_response)
+
+    def _locale_from_language(self, language):
+        config_locale = self._configuration_arg('metadata', ie_key=CrunchyrollBetaIE, casesense=True)
+        return config_locale[0] if config_locale else self._LOCALE_LOOKUP.get(language)
+
+    def _call_base_api(self, endpoint, internal_id, lang, note=None, query={}):
+        self._update_auth()
+
+        if not endpoint.startswith('/'):
+            endpoint = f'/{endpoint}'
+
+        query = query.copy()
+        locale = self._locale_from_language(lang)
+        if locale:
+            query['locale'] = locale
+
+        return self._download_json(
+            f'{self._BASE_URL}{endpoint}', internal_id, note or f'Calling API: {endpoint}',
+            headers=CrunchyrollBaseIE._AUTH_HEADERS, query=query)
+
+    def _call_api(self, path, internal_id, lang, note='api', query={}):
+        if not path.startswith(f'/content/v2/{self._API_ENDPOINT}/'):
+            path = f'/content/v2/{self._API_ENDPOINT}/{path}'
+
+        try:
+            result = self._call_base_api(
+                path, internal_id, lang, f'Downloading {note} JSON ({self._API_ENDPOINT})', query=query)
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 404:
+                return None
+            raise
+
+        if not result:
+            raise ExtractorError(f'Unexpected response when downloading {note} JSON')
+        return result
+
+    def _extract_chapters(self, internal_id):
+        # if no skip events are available, a 403 xml error is returned
+        skip_events = self._download_json(
+            f'https://static.crunchyroll.com/skip-events/production/{internal_id}.json',
+            internal_id, note='Downloading chapter info', fatal=False, errnote=False)
+        if not skip_events:
+            return None
+
+        chapters = []
+        for event in ('recap', 'intro', 'credits', 'preview'):
+            start = traverse_obj(skip_events, (event, 'start', {float_or_none}))
+            end = traverse_obj(skip_events, (event, 'end', {float_or_none}))
+            # some chapters have no start and/or ending time, they will just be ignored
+            if start is None or end is None:
+                continue
+            chapters.append({'title': event.capitalize(), 'start_time': start, 'end_time': end})
+
+        return chapters
+
+    def _extract_stream(self, identifier, display_id=None):
+        if not display_id:
+            display_id = identifier
+
+        self._update_auth()
+        headers = {**CrunchyrollBaseIE._AUTH_HEADERS, 'User-Agent': self._SWITCH_USER_AGENT}
+        try:
+            stream_response = self._download_json(
+                f'https://cr-play-service.prd.crunchyrollsvc.com/v1/{identifier}/console/switch/play',
+                display_id, note='Downloading stream info', errnote='Failed to download stream info', headers=headers)
+        except ExtractorError as error:
+            if self.get_param('ignore_no_formats_error'):
+                self.report_warning(error.orig_msg)
+                return [], {}
+            elif isinstance(error.cause, HTTPError) and error.cause.status == 420:
+                raise ExtractorError(
+                    'You have reached the rate-limit for active streams; try again later', expected=True)
+            raise
+
+        available_formats = {'': ('', '', stream_response['url'])}
+        for hardsub_lang, stream in traverse_obj(stream_response, ('hardSubs', {dict.items}, lambda _, v: v[1]['url'])):
+            available_formats[hardsub_lang] = (f'hardsub-{hardsub_lang}', hardsub_lang, stream['url'])
+
+        requested_hardsubs = [('' if val == 'none' else val) for val in (self._configuration_arg('hardsub') or ['none'])]
+        hardsub_langs = [lang for lang in available_formats if lang]
+        if hardsub_langs and 'all' not in requested_hardsubs:
+            full_format_langs = set(requested_hardsubs)
+            self.to_screen(f'Available hardsub languages: {", ".join(hardsub_langs)}')
+            self.to_screen(
+                'To extract formats of a hardsub language, use '
+                '"--extractor-args crunchyrollbeta:hardsub=<language_code or all>". '
+                'See https://github.com/yt-dlp/yt-dlp#crunchyrollbeta-crunchyroll for more info',
+                only_once=True)
+        else:
+            full_format_langs = set(map(str.lower, available_formats))
+
+        audio_locale = traverse_obj(stream_response, ('audioLocale', {str}))
+        hardsub_preference = qualities(requested_hardsubs[::-1])
+        formats, subtitles = [], {}
+        for format_id, hardsub_lang, stream_url in available_formats.values():
+            if hardsub_lang.lower() in full_format_langs:
+                adaptive_formats, dash_subs = self._extract_mpd_formats_and_subtitles(
+                    stream_url, display_id, mpd_id=format_id, headers=CrunchyrollBaseIE._AUTH_HEADERS,
+                    fatal=False, note=f'Downloading {f"{format_id} " if hardsub_lang else ""}MPD manifest')
+                self._merge_subtitles(dash_subs, target=subtitles)
+            else:
+                continue  # XXX: Update this if meta mpd formats work; will be tricky with token invalidation
+            for f in adaptive_formats:
+                if f.get('acodec') != 'none':
+                    f['language'] = audio_locale
+                f['quality'] = hardsub_preference(hardsub_lang.lower())
+            formats.extend(adaptive_formats)
+
+        for locale, subtitle in traverse_obj(stream_response, (('subtitles', 'captions'), {dict.items}, ...)):
+            subtitles.setdefault(locale, []).append(traverse_obj(subtitle, {'url': 'url', 'ext': 'format'}))
+
+        # Invalidate stream token to avoid rate-limit
+        error_msg = 'Unable to invalidate stream token; you may experience rate-limiting'
+        if stream_token := stream_response.get('token'):
+            self._request_webpage(Request(
+                f'https://cr-play-service.prd.crunchyrollsvc.com/v1/token/{identifier}/{stream_token}/inactive',
+                headers=headers, method='PATCH'), display_id, 'Invalidating stream token', error_msg, fatal=False)
+        else:
+            self.report_warning(error_msg)
+
+        return formats, subtitles
+
+
+class CrunchyrollCmsBaseIE(CrunchyrollBaseIE):
+    _API_ENDPOINT = 'cms'
+    _CMS_EXPIRY = None
+
+    def _call_cms_api_signed(self, path, internal_id, lang, note='api'):
+        if not CrunchyrollCmsBaseIE._CMS_EXPIRY or CrunchyrollCmsBaseIE._CMS_EXPIRY <= time_seconds():
+            response = self._call_base_api('index/v2', None, lang, 'Retrieving signed policy')['cms_web']
+            CrunchyrollCmsBaseIE._CMS_QUERY = {
+                'Policy': response['policy'],
+                'Signature': response['signature'],
+                'Key-Pair-Id': response['key_pair_id'],
+            }
+            CrunchyrollCmsBaseIE._CMS_BUCKET = response['bucket']
+            CrunchyrollCmsBaseIE._CMS_EXPIRY = parse_iso8601(response['expires']) - 10
+
+        if not path.startswith('/cms/v2'):
+            path = f'/cms/v2{CrunchyrollCmsBaseIE._CMS_BUCKET}/{path}'
+
+        return self._call_base_api(
+            path, internal_id, lang, f'Downloading {note} JSON (signed cms)', query=CrunchyrollCmsBaseIE._CMS_QUERY)
+
+
+class CrunchyrollBetaIE(CrunchyrollCmsBaseIE):
+    IE_NAME = 'crunchyroll'
+    _VALID_URL = r'''(?x)
+        https?://(?:beta\.|www\.)?crunchyroll\.com/
+        (?:(?P<lang>\w{2}(?:-\w{2})?)/)?
+        watch/(?!concert|musicvideo)(?P<id>\w+)'''
+    _TESTS = [{
+        # Premium only
+        'url': 'https://www.crunchyroll.com/watch/GY2P1Q98Y/to-the-future',
+        'info_dict': {
+            'id': 'GY2P1Q98Y',
+            'ext': 'mp4',
+            'duration': 1380.241,
+            'timestamp': 1459632600,
+            'description': 'md5:a022fbec4fbb023d43631032c91ed64b',
+            'title': 'World Trigger Episode 73 – To the Future',
+            'upload_date': '20160402',
+            'series': 'World Trigger',
+            'series_id': 'GR757DMKY',
+            'season': 'World Trigger',
+            'season_id': 'GR9P39NJ6',
+            'season_number': 1,
+            'episode': 'To the Future',
+            'episode_number': 73,
+            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'chapters': 'count:2',
+            'age_limit': 14,
+            'like_count': int,
+            'dislike_count': int,
+        },
+        'params': {
+            'skip_download': 'm3u8',
+            'extractor_args': {'crunchyrollbeta': {'hardsub': ['de-DE']}},
+            'format': 'bv[format_id~=hardsub]',
+        },
+    }, {
+        # Premium only
+        'url': 'https://www.crunchyroll.com/watch/GYE5WKQGR',
+        'info_dict': {
+            'id': 'GYE5WKQGR',
+            'ext': 'mp4',
+            'duration': 366.459,
+            'timestamp': 1476788400,
+            'description': 'md5:74b67283ffddd75f6e224ca7dc031e76',
+            'title': 'SHELTER – Porter Robinson presents Shelter the Animation',
+            'upload_date': '20161018',
+            'series': 'SHELTER',
+            'series_id': 'GYGG09WWY',
+            'season': 'SHELTER',
+            'season_id': 'GR09MGK4R',
+            'season_number': 1,
+            'episode': 'Porter Robinson presents Shelter the Animation',
+            'episode_number': 0,
+            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'age_limit': 14,
+            'like_count': int,
+            'dislike_count': int,
+        },
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/GJWU2VKK3/cherry-blossom-meeting-and-a-coming-blizzard',
+        'info_dict': {
+            'id': 'GJWU2VKK3',
+            'ext': 'mp4',
+            'duration': 1420.054,
+            'description': 'md5:2d1c67c0ec6ae514d9c30b0b99a625cd',
+            'title': 'The Ice Guy and His Cool Female Colleague Episode 1 – Cherry Blossom Meeting and a Coming Blizzard',
+            'series': 'The Ice Guy and His Cool Female Colleague',
+            'series_id': 'GW4HM75NP',
+            'season': 'The Ice Guy and His Cool Female Colleague',
+            'season_id': 'GY9PC21VE',
+            'season_number': 1,
+            'episode': 'Cherry Blossom Meeting and a Coming Blizzard',
+            'episode_number': 1,
+            'chapters': 'count:2',
+            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'timestamp': 1672839000,
+            'upload_date': '20230104',
+            'age_limit': 14,
+            'like_count': int,
+            'dislike_count': int,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/GM8F313NQ',
+        'info_dict': {
+            'id': 'GM8F313NQ',
+            'ext': 'mp4',
+            'title': 'Garakowa -Restore the World-',
+            'description': 'md5:8d2f8b6b9dd77d87810882e7d2ee5608',
+            'duration': 3996.104,
+            'age_limit': 13,
+            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+        },
+        'params': {'skip_download': 'm3u8'},
+        'skip': 'no longer exists',
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/G62PEZ2E6',
+        'info_dict': {
+            'id': 'G62PEZ2E6',
+            'description': 'md5:8d2f8b6b9dd77d87810882e7d2ee5608',
+            'age_limit': 13,
+            'duration': 65.138,
+            'title': 'Garakowa -Restore the World-',
+        },
+        'playlist_mincount': 5,
+    }, {
+        'url': 'https://www.crunchyroll.com/de/watch/GY2P1Q98Y',
+        'only_matching': True,
+    }, {
+        'url': 'https://beta.crunchyroll.com/pt-br/watch/G8WUN8VKP/the-ruler-of-conspiracy',
+        'only_matching': True,
+    }]
+    # We want to support lazy playlist filtering and movie listings cannot be inside a playlist
+    _RETURN_TYPE = 'video'
+
+    def _real_extract(self, url):
+        lang, internal_id = self._match_valid_url(url).group('lang', 'id')
+
+        # We need to use unsigned API call to allow ratings query string
+        response = traverse_obj(self._call_api(
+            f'objects/{internal_id}', internal_id, lang, 'object info', {'ratings': 'true'}), ('data', 0, {dict}))
+        if not response:
+            raise ExtractorError(f'No video with id {internal_id} could be found (possibly region locked?)', expected=True)
+
+        object_type = response.get('type')
+        if object_type == 'episode':
+            result = self._transform_episode_response(response)
+
+        elif object_type == 'movie':
+            result = self._transform_movie_response(response)
+
+        elif object_type == 'movie_listing':
+            first_movie_id = traverse_obj(response, ('movie_listing_metadata', 'first_movie_id'))
+            if not self._yes_playlist(internal_id, first_movie_id):
+                return self.url_result(f'{self._BASE_URL}/{lang}watch/{first_movie_id}', CrunchyrollBetaIE, first_movie_id)
+
+            def entries():
+                movies = self._call_api(f'movie_listings/{internal_id}/movies', internal_id, lang, 'movie list')
+                for movie_response in traverse_obj(movies, ('data', ...)):
+                    yield self.url_result(
+                        f'{self._BASE_URL}/{lang}watch/{movie_response["id"]}',
+                        CrunchyrollBetaIE, **self._transform_movie_response(movie_response))
+
+            return self.playlist_result(entries(), **self._transform_movie_response(response))
+
+        else:
+            raise ExtractorError(f'Unknown object type {object_type}')
+
+        if not self._IS_PREMIUM and traverse_obj(response, (f'{object_type}_metadata', 'is_premium_only')):
+            message = f'This {object_type} is for premium members only'
+            if CrunchyrollBaseIE._REFRESH_TOKEN:
+                self.raise_no_formats(message, expected=True, video_id=internal_id)
+            else:
+                self.raise_login_required(message, method='password', metadata_available=True)
+        else:
+            result['formats'], result['subtitles'] = self._extract_stream(internal_id)
+
+        result['chapters'] = self._extract_chapters(internal_id)
+
+        def calculate_count(item):
+            return parse_count(''.join((item['displayed'], item.get('unit') or '')))
+
+        result.update(traverse_obj(response, ('rating', {
+            'like_count': ('up', {calculate_count}),
+            'dislike_count': ('down', {calculate_count}),
+        })))
+
+        return result
+
+    @staticmethod
+    def _transform_episode_response(data):
+        metadata = traverse_obj(data, (('episode_metadata', None), {dict}), get_all=False) or {}
+        return {
+            'id': data['id'],
+            'title': ' \u2013 '.join((
+                ('{}{}'.format(
+                    format_field(metadata, 'season_title'),
+                    format_field(metadata, 'episode', ' Episode %s'))),
+                format_field(data, 'title'))),
+            **traverse_obj(data, {
+                'episode': ('title', {str}),
+                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n')}),
+                'thumbnails': ('images', 'thumbnail', ..., ..., {
+                    'url': ('source', {url_or_none}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                }),
+            }),
+            **traverse_obj(metadata, {
+                'duration': ('duration_ms', {float_or_none(scale=1000)}),
+                'timestamp': ('upload_date', {parse_iso8601}),
+                'series': ('series_title', {str}),
+                'series_id': ('series_id', {str}),
+                'season': ('season_title', {str}),
+                'season_id': ('season_id', {str}),
+                'season_number': ('season_number', ({int}, {float_or_none})),
+                'episode_number': ('sequence_number', ({int}, {float_or_none})),
+                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
+                'language': ('audio_locale', {str}),
+            }, get_all=False),
+        }
+
+    @staticmethod
+    def _transform_movie_response(data):
+        metadata = traverse_obj(data, (('movie_metadata', 'movie_listing_metadata', None), {dict}), get_all=False) or {}
+        return {
+            'id': data['id'],
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n')}),
+                'thumbnails': ('images', 'thumbnail', ..., ..., {
+                    'url': ('source', {url_or_none}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                }),
+            }),
+            **traverse_obj(metadata, {
+                'duration': ('duration_ms', {float_or_none(scale=1000)}),
+                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
+            }),
+        }
+
+
+class CrunchyrollBetaShowIE(CrunchyrollCmsBaseIE):
+    IE_NAME = 'crunchyroll:playlist'
+    _VALID_URL = r'''(?x)
+        https?://(?:beta\.|www\.)?crunchyroll\.com/
+        (?P<lang>(?:\w{2}(?:-\w{2})?/)?)
+        series/(?P<id>\w+)'''
+    _TESTS = [{
+        'url': 'https://www.crunchyroll.com/series/GY19NQ2QR/Girl-Friend-BETA',
+        'info_dict': {
+            'id': 'GY19NQ2QR',
+            'title': 'Girl Friend BETA',
+            'description': 'md5:99c1b22ee30a74b536a8277ced8eb750',
+            # XXX: `thumbnail` does not get set from `thumbnails` in playlist
+            #  'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'age_limit': 14,
+        },
+        'playlist_mincount': 10,
+    }, {
+        'url': 'https://beta.crunchyroll.com/it/series/GY19NQ2QR',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        lang, internal_id = self._match_valid_url(url).group('lang', 'id')
+
+        def entries():
+            seasons_response = self._call_cms_api_signed(f'seasons?series_id={internal_id}', internal_id, lang, 'seasons')
+            for season in traverse_obj(seasons_response, ('items', ..., {dict})):
+                episodes_response = self._call_cms_api_signed(
+                    f'episodes?season_id={season["id"]}', season['id'], lang, 'episode list')
+                for episode_response in traverse_obj(episodes_response, ('items', ..., {dict})):
+                    yield self.url_result(
+                        f'{self._BASE_URL}/{lang}watch/{episode_response["id"]}',
+                        CrunchyrollBetaIE, **CrunchyrollBetaIE._transform_episode_response(episode_response))
+
+        return self.playlist_result(
+            entries(), internal_id,
+            **traverse_obj(self._call_api(f'series/{internal_id}', internal_id, lang, 'series'), ('data', 0, {
+                'title': ('title', {str}),
+                'description': ('description', {lambda x: x.replace(r'\r\n', '\n')}),
+                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
+                'thumbnails': ('images', ..., ..., ..., {
+                    'url': ('source', {url_or_none}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                }),
+            })))
+
+
+class CrunchyrollMusicIE(CrunchyrollBaseIE):
+    IE_NAME = 'crunchyroll:music'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?crunchyroll\.com/
+        (?P<lang>(?:\w{2}(?:-\w{2})?/)?)
+        watch/(?P<type>concert|musicvideo)/(?P<id>\w+)'''
+    _TESTS = [{
+        'url': 'https://www.crunchyroll.com/de/watch/musicvideo/MV5B02C79',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': 'MV5B02C79',
+            'display_id': 'egaono-hana',
+            'title': 'Egaono Hana',
+            'track': 'Egaono Hana',
+            'artists': ['Goose house'],
+            'thumbnail': r're:(?i)^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'genres': ['J-Pop'],
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/musicvideo/MV88BB7F2C',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': 'MV88BB7F2C',
+            'display_id': 'crossing-field',
+            'title': 'Crossing Field',
+            'track': 'Crossing Field',
+            'artists': ['LiSA'],
+            'thumbnail': r're:(?i)^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'genres': ['Anime'],
+        },
+        'params': {'skip_download': 'm3u8'},
+        'skip': 'no longer exists',
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/concert/MC2E2AC135',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': 'MC2E2AC135',
+            'display_id': 'live-is-smile-always-364joker-at-yokohama-arena',
+            'title': 'LiVE is Smile Always-364+JOKER- at YOKOHAMA ARENA',
+            'track': 'LiVE is Smile Always-364+JOKER- at YOKOHAMA ARENA',
+            'artists': ['LiSA'],
+            'thumbnail': r're:(?i)^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
+            'description': 'md5:747444e7e6300907b7a43f0a0503072e',
+            'genres': ['J-Pop'],
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.crunchyroll.com/de/watch/musicvideo/MV5B02C79/egaono-hana',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/concert/MC2E2AC135/live-is-smile-always-364joker-at-yokohama-arena',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/musicvideo/MV88BB7F2C/crossing-field',
+        'only_matching': True,
+    }]
+    _API_ENDPOINT = 'music'
+
+    def _real_extract(self, url):
+        lang, internal_id, object_type = self._match_valid_url(url).group('lang', 'id', 'type')
+        path, name = {
+            'concert': ('concerts', 'concert info'),
+            'musicvideo': ('music_videos', 'music video info'),
+        }[object_type]
+        response = traverse_obj(self._call_api(f'{path}/{internal_id}', internal_id, lang, name), ('data', 0, {dict}))
+        if not response:
+            raise ExtractorError(f'No video with id {internal_id} could be found (possibly region locked?)', expected=True)
+
+        result = self._transform_music_response(response)
+
+        if not self._IS_PREMIUM and response.get('isPremiumOnly'):
+            message = f'This {response.get("type") or "media"} is for premium members only'
+            if CrunchyrollBaseIE._REFRESH_TOKEN:
+                self.raise_no_formats(message, expected=True, video_id=internal_id)
+            else:
+                self.raise_login_required(message, method='password', metadata_available=True)
+        else:
+            result['formats'], _ = self._extract_stream(f'music/{internal_id}', internal_id)
+
+        return result
+
+    @staticmethod
+    def _transform_music_response(data):
+        return {
+            'id': data['id'],
+            **traverse_obj(data, {
+                'display_id': 'slug',
+                'title': 'title',
+                'track': 'title',
+                'artists': ('artist', 'name', all),
+                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n') or None}),
+                'thumbnails': ('images', ..., ..., {
+                    'url': ('source', {url_or_none}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                }),
+                'genres': ('genres', ..., 'displayValue'),
+                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
+            }),
+        }
+
+
+class CrunchyrollArtistIE(CrunchyrollBaseIE):
+    IE_NAME = 'crunchyroll:artist'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?crunchyroll\.com/
+        (?P<lang>(?:\w{2}(?:-\w{2})?/)?)
+        artist/(?P<id>\w{10})'''
+    _TESTS = [{
+        'url': 'https://www.crunchyroll.com/artist/MA179CB50D',
+        'info_dict': {
+            'id': 'MA179CB50D',
+            'title': 'LiSA',
+            'genres': ['Anime', 'J-Pop', 'Rock'],
+            'description': 'md5:16d87de61a55c3f7d6c454b73285938e',
+        },
+        'playlist_mincount': 83,
+    }, {
+        'url': 'https://www.crunchyroll.com/artist/MA179CB50D/lisa',
+        'only_matching': True,
+    }]
+    _API_ENDPOINT = 'music'
+
+    def _real_extract(self, url):
+        lang, internal_id = self._match_valid_url(url).group('lang', 'id')
+        response = traverse_obj(self._call_api(
+            f'artists/{internal_id}', internal_id, lang, 'artist info'), ('data', 0))
+
+        def entries():
+            for attribute, path in [('concerts', 'concert'), ('videos', 'musicvideo')]:
+                for internal_id in traverse_obj(response, (attribute, ...)):
+                    yield self.url_result(f'{self._BASE_URL}/watch/{path}/{internal_id}', CrunchyrollMusicIE, internal_id)
+
+        return self.playlist_result(entries(), **self._transform_artist_response(response))
+
+    @staticmethod
+    def _transform_artist_response(data):
+        return {
+            'id': data['id'],
+            **traverse_obj(data, {
+                'title': 'name',
+                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n')}),
+                'thumbnails': ('images', ..., ..., {
+                    'url': ('source', {url_or_none}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                }),
+                'genres': ('genres', ..., 'displayValue'),
+            }),
+        }

yt_dlp/extractor/cultureunplugged.py

@@ -3,7 +3,7 @@ from ..utils import int_or_none
 
 
 class CultureUnpluggedIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?cultureunplugged\.com/(?:documentary/watch-online/)?play/(?P<id>\d+)(?:/(?P<display_id>[^/#?]+))?'
+    _VALID_URL = r'https?://(?:www\.)?cultureunplugged\.com/documentary/watch-online/play/(?P<id>\d+)(?:/(?P<display_id>[^/]+))?'
     _TESTS = [{
         'url': 'http://www.cultureunplugged.com/documentary/watch-online/play/53662/The-Next--Best-West',
         'md5': 'ac6c093b089f7d05e79934dcb3d228fc',
@@ -12,25 +12,12 @@ class CultureUnpluggedIE(InfoExtractor):
             'display_id': 'The-Next--Best-West',
             'ext': 'mp4',
             'title': 'The Next, Best West',
-            'description': 'md5:770033a3b7c2946a3bcfb7f1c6fb7045',
+            'description': 'md5:0423cd00833dea1519cf014e9d0903b1',
             'thumbnail': r're:^https?://.*\.jpg$',
-            'creators': ['Coldstream Creative'],
+            'creator': 'Coldstream Creative',
             'duration': 2203,
             'view_count': int,
         },
-    }, {
-        'url': 'https://www.cultureunplugged.com/play/2833/Koi-Sunta-Hai--Journeys-with-Kumar---Kabir--Someone-is-Listening-',
-        'md5': 'dc2014bc470dfccba389a1c934fa29fa',
-        'info_dict': {
-            'id': '2833',
-            'display_id': 'Koi-Sunta-Hai--Journeys-with-Kumar---Kabir--Someone-is-Listening-',
-            'ext': 'mp4',
-            'title': 'Koi Sunta Hai: Journeys with Kumar & Kabir (Someone is Listening)',
-            'description': 'md5:fa94ac934927c98660362b8285b2cda5',
-            'view_count': int,
-            'thumbnail': 'https://s3.amazonaws.com/cdn.cultureunplugged.com/thumbnails_16_9/lg/2833.jpg',
-            'creators': ['Srishti'],
-        },
     }, {
         'url': 'http://www.cultureunplugged.com/documentary/watch-online/play/53662',
         'only_matching': True,

yt_dlp/extractor/cwtv.py

@@ -1,40 +1,35 @@
-import re
-
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
     parse_age_limit,
     parse_iso8601,
-    parse_qs,
     smuggle_url,
     str_or_none,
     update_url_query,
 )
-from ..utils.traversal import traverse_obj
 
 
 class CWTVIE(InfoExtractor):
-    IE_NAME = 'cwtv'
+    _VALID_URL = r'https?://(?:www\.)?cw(?:tv(?:pr)?|seed)\.com/(?:shows/)?(?:[^/]+/)+[^?]*\?.*\b(?:play|watch)=(?P<id>[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12})'
-    _VALID_URL = r'https?://(?:www\.)?cw(?:tv(?:pr)?|seed)\.com/(?:shows/)?(?:[^/]+/)+[^?]*\?.*\b(?:play|watch|guid)=(?P<id>[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12})'
     _TESTS = [{
-        'url': 'https://www.cwtv.com/shows/continuum/a-stitch-in-time/?play=9149a1e1-4cb2-46d7-81b2-47d35bbd332b',
+        'url': 'https://www.cwtv.com/shows/all-american-homecoming/ready-or-not/?play=d848488f-f62a-40fd-af1f-6440b1821aab',
         'info_dict': {
-            'id': '9149a1e1-4cb2-46d7-81b2-47d35bbd332b',
+            'id': 'd848488f-f62a-40fd-af1f-6440b1821aab',
             'ext': 'mp4',
-            'title': 'A Stitch in Time',
+            'title': 'Ready Or Not',
-            'description': r're:(?s)City Protective Services officer Kiera Cameron is transported from 2077.+',
+            'description': 'Simone is concerned about changes taking place at Bringston; JR makes a decision about his future.',
-            'thumbnail': r're:https?://.+\.jpe?g',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
-            'duration': 2632,
+            'duration': 2547,
-            'timestamp': 1736928000,
+            'timestamp': 1720519200,
             'uploader': 'CWTV',
-            'chapters': 'count:5',
+            'chapters': 'count:6',
-            'series': 'Continuum',
+            'series': 'All American: Homecoming',
-            'season_number': 1,
+            'season_number': 3,
             'episode_number': 1,
-            'age_limit': 14,
+            'age_limit': 0,
-            'upload_date': '20250115',
+            'upload_date': '20240709',
-            'season': 'Season 1',
+            'season': 'Season 3',
             'episode': 'Episode 1',
         },
         'params': {
@@ -47,7 +42,7 @@ class CWTVIE(InfoExtractor):
             'id': '6b15e985-9345-4f60-baf8-56e96be57c63',
             'ext': 'mp4',
             'title': 'Legends of Yesterday',
-            'description': r're:(?s)Oliver and Barry Allen take Kendra Saunders and Carter Hall to a remote.+',
+            'description': 'Oliver and Barry Allen take Kendra Saunders and Carter Hall to a remote location to keep them hidden from Vandal Savage while they figure out how to defeat him.',
             'duration': 2665,
             'series': 'Arrow',
             'season_number': 4,
@@ -76,7 +71,7 @@ class CWTVIE(InfoExtractor):
             'timestamp': 1444107300,
             'age_limit': 14,
             'uploader': 'CWTV',
-            'thumbnail': r're:https?://.+\.jpe?g',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
             'chapters': 'count:4',
             'episode': 'Episode 20',
             'season': 'Season 11',
@@ -94,17 +89,14 @@ class CWTVIE(InfoExtractor):
     }, {
         'url': 'http://cwtv.com/shows/arrow/legends-of-yesterday/?watch=6b15e985-9345-4f60-baf8-56e96be57c63',
         'only_matching': True,
-    }, {
-        'url': 'http://www.cwtv.com/movies/play/?guid=0a8e8b5b-1356-41d5-9a6a-4eda1a6feb6c',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         data = self._download_json(
-            f'https://images.cwtv.com/feed/app-2/video-meta/apiversion_22/device_android/guid_{video_id}', video_id)
+            f'https://images.cwtv.com/feed/mobileapp/video-meta/apiversion_12/guid_{video_id}', video_id)
-        if traverse_obj(data, 'result') != 'ok':
+        if data.get('result') != 'ok':
-            raise ExtractorError(traverse_obj(data, (('error_msg', 'msg'), {str}, any)), expected=True)
+            raise ExtractorError(data['msg'], expected=True)
         video_data = data['video']
         title = video_data['title']
         mpx_url = update_url_query(
@@ -131,50 +123,3 @@ class CWTVIE(InfoExtractor):
             'ie_key': 'ThePlatform',
             'thumbnail': video_data.get('large_thumbnail'),
         }
-
-
-class CWTVMovieIE(InfoExtractor):
-    IE_NAME = 'cwtv:movie'
-    _VALID_URL = r'https?://(?:www\.)?cwtv\.com/shows/(?P<id>[\w-]+)/?\?(?:[^#]+&)?viewContext=Movies'
-    _TESTS = [{
-        'url': 'https://www.cwtv.com/shows/the-crush/?viewContext=Movies+Swimlane',
-        'info_dict': {
-            'id': '0a8e8b5b-1356-41d5-9a6a-4eda1a6feb6c',
-            'ext': 'mp4',
-            'title': 'The Crush',
-            'upload_date': '20241112',
-            'description': 'md5:1549acd90dff4a8273acd7284458363e',
-            'chapters': 'count:9',
-            'timestamp': 1731398400,
-            'age_limit': 16,
-            'duration': 5337,
-            'series': 'The Crush',
-            'season': 'Season 1',
-            'uploader': 'CWTV',
-            'season_number': 1,
-            'episode': 'Episode 1',
-            'episode_number': 1,
-            'thumbnail': r're:https?://.+\.jpe?g',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }]
-    _UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        app_url = (
-            self._html_search_meta('al:ios:url', webpage, default=None)
-            or self._html_search_meta('al:android:url', webpage, default=None))
-        video_id = (
-            traverse_obj(parse_qs(app_url), ('video_id', 0, {lambda x: re.fullmatch(self._UUID_RE, x)}, 0))
-            or self._search_regex([
-                rf'CWTV\.Site\.curPlayingGUID\s*=\s*["\']({self._UUID_RE})',
-                rf'CWTV\.Site\.viewInAppURL\s*=\s*["\']/shows/[\w-]+/watch-in-app/\?play=({self._UUID_RE})',
-            ], webpage, 'video ID'))
-
-        return self.url_result(
-            f'https://www.cwtv.com/shows/{display_id}/{display_id}/?play={video_id}', CWTVIE, video_id)

yt_dlp/extractor/dacast.py

@@ -9,7 +9,6 @@ from ..utils import (
     ExtractorError,
     classproperty,
     float_or_none,
-    parse_qs,
     traverse_obj,
     url_or_none,
 )
@@ -92,15 +91,11 @@ class DacastVODIE(DacastBaseIE):
         # Rotates every so often, but hardcode a fallback in case of JS change/breakage before rotation
         return self._search_regex(
             r'\bUSP_SIGNING_SECRET\s*=\s*(["\'])(?P<secret>(?:(?!\1).)+)', player_js,
-            'usp signing secret', group='secret', fatal=False) or 'hGDtqMKYVeFdofrAfFmBcrsakaZELajI'
+            'usp signing secret', group='secret', fatal=False) or 'odnInCGqhvtyRTtIiddxtuRtawYYICZP'
 
     def _real_extract(self, url):
         user_id, video_id = self._match_valid_url(url).group('user_id', 'id')
-        query = {
+        query = {'contentId': f'{user_id}-vod-{video_id}', 'provider': 'universe'}
-            'contentId': f'{user_id}-vod-{video_id}',
-            'provider': 'universe',
-            **traverse_obj(url, ({parse_qs}, 'uss_token', {'signedKey': -1})),
-        }
         info = self._download_json(self._API_INFO_URL, video_id, query=query, fatal=False)
         access = self._download_json(
             'https://playback.dacast.com/content/access', video_id,

yt_dlp/extractor/dailymotion.py

@@ -100,7 +100,7 @@ class DailymotionBaseInfoExtractor(InfoExtractor):
 
 class DailymotionIE(DailymotionBaseInfoExtractor):
     _VALID_URL = r'''(?ix)
-                    (?:https?:)?//
+                    https?://
                     (?:
                         dai\.ly/|
                         (?:
@@ -116,7 +116,7 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
                     (?P<id>[^/?_&#]+)(?:[\w-]*\?playlist=(?P<playlist_id>x[0-9a-z]+))?
     '''
     IE_NAME = 'dailymotion'
-    _EMBED_REGEX = [rf'(?ix)<(?:(?:embed|iframe)[^>]+?src=|input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=)["\'](?P<url>{_VALID_URL[5:]})']
+    _EMBED_REGEX = [r'<(?:(?:embed|iframe)[^>]+?src=|input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=)(["\'])(?P<url>(?:https?:)?//(?:www\.)?dailymotion\.com/(?:embed|swf)/video/.+?)\1']
     _TESTS = [{
         'url': 'http://www.dailymotion.com/video/x5kesuj_office-christmas-party-review-jason-bateman-olivia-munn-t-j-miller_news',
         'md5': '074b95bdee76b9e3654137aee9c79dfe',
@@ -308,25 +308,6 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             'description': 'Que lindura',
             'tags': [],
         },
-    }, {
-        # //geo.dailymotion.com/player/xysxq.html?video=k2Y4Mjp7krAF9iCuINM
-        'url': 'https://lcp.fr/programmes/avant-la-catastrophe-la-naissance-de-la-dictature-nazie-1933-1936-346819',
-        'info_dict': {
-            'id': 'k2Y4Mjp7krAF9iCuINM',
-            'ext': 'mp4',
-            'title': 'Avant la catastrophe la naissance de la dictature nazie 1933 -1936',
-            'description': 'md5:7b620d5e26edbe45f27bbddc1c0257c1',
-            'uploader': 'LCP Assemblée nationale',
-            'uploader_id': 'xbz33d',
-            'view_count': int,
-            'like_count': int,
-            'age_limit': 0,
-            'duration': 3220,
-            'thumbnail': 'https://s1.dmcdn.net/v/Xvumk1djJBUZfjj2a/x1080',
-            'tags': [],
-            'timestamp': 1739919947,
-            'upload_date': '20250218',
-        },
     }]
     _GEO_BYPASS = False
     _COMMON_MEDIA_FIELDS = '''description

yt_dlp/extractor/deezer.py

@@ -0,0 +1,142 @@
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    orderedSet,
+)
+
+
+class DeezerBaseInfoExtractor(InfoExtractor):
+    def get_data(self, url):
+        if not self.get_param('test'):
+            self.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
+
+        mobj = self._match_valid_url(url)
+        data_id = mobj.group('id')
+
+        webpage = self._download_webpage(url, data_id)
+        geoblocking_msg = self._html_search_regex(
+            r'<p class="soon-txt">(.*?)</p>', webpage, 'geoblocking message',
+            default=None)
+        if geoblocking_msg is not None:
+            raise ExtractorError(
+                f'Deezer said: {geoblocking_msg}', expected=True)
+
+        data_json = self._search_regex(
+            (r'__DZR_APP_STATE__\s*=\s*({.+?})\s*</script>',
+             r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n'),
+            webpage, 'data JSON')
+        data = json.loads(data_json)
+        return data_id, webpage, data
+
+
+class DeezerPlaylistIE(DeezerBaseInfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?playlist/(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'http://www.deezer.com/playlist/176747451',
+        'info_dict': {
+            'id': '176747451',
+            'title': 'Best!',
+            'uploader': 'anonymous',
+            'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
+        },
+        'playlist_count': 29,
+    }
+
+    def _real_extract(self, url):
+        playlist_id, webpage, data = self.get_data(url)
+
+        playlist_title = data.get('DATA', {}).get('TITLE')
+        playlist_uploader = data.get('DATA', {}).get('PARENT_USERNAME')
+        playlist_thumbnail = self._search_regex(
+            r'<img id="naboo_playlist_image".*?src="([^"]+)"', webpage,
+            'playlist thumbnail')
+
+        entries = []
+        for s in data.get('SONGS', {}).get('data'):
+            formats = [{
+                'format_id': 'preview',
+                'url': s.get('MEDIA', [{}])[0].get('HREF'),
+                'preference': -100,  # Only the first 30 seconds
+                'ext': 'mp3',
+            }]
+            artists = ', '.join(
+                orderedSet(a.get('ART_NAME') for a in s.get('ARTISTS')))
+            entries.append({
+                'id': s.get('SNG_ID'),
+                'duration': int_or_none(s.get('DURATION')),
+                'title': '{} - {}'.format(artists, s.get('SNG_TITLE')),
+                'uploader': s.get('ART_NAME'),
+                'uploader_id': s.get('ART_ID'),
+                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
+                'formats': formats,
+            })
+
+        return {
+            '_type': 'playlist',
+            'id': playlist_id,
+            'title': playlist_title,
+            'uploader': playlist_uploader,
+            'thumbnail': playlist_thumbnail,
+            'entries': entries,
+        }
+
+
+class DeezerAlbumIE(DeezerBaseInfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?album/(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'https://www.deezer.com/fr/album/67505622',
+        'info_dict': {
+            'id': '67505622',
+            'title': 'Last Week',
+            'uploader': 'Home Brew',
+            'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
+        },
+        'playlist_count': 7,
+    }
+
+    def _real_extract(self, url):
+        album_id, webpage, data = self.get_data(url)
+
+        album_title = data.get('DATA', {}).get('ALB_TITLE')
+        album_uploader = data.get('DATA', {}).get('ART_NAME')
+        album_thumbnail = self._search_regex(
+            r'<img id="naboo_album_image".*?src="([^"]+)"', webpage,
+            'album thumbnail')
+
+        entries = []
+        for s in data.get('SONGS', {}).get('data'):
+            formats = [{
+                'format_id': 'preview',
+                'url': s.get('MEDIA', [{}])[0].get('HREF'),
+                'preference': -100,  # Only the first 30 seconds
+                'ext': 'mp3',
+            }]
+            artists = ', '.join(
+                orderedSet(a.get('ART_NAME') for a in s.get('ARTISTS')))
+            entries.append({
+                'id': s.get('SNG_ID'),
+                'duration': int_or_none(s.get('DURATION')),
+                'title': '{} - {}'.format(artists, s.get('SNG_TITLE')),
+                'uploader': s.get('ART_NAME'),
+                'uploader_id': s.get('ART_ID'),
+                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
+                'formats': formats,
+                'track': s.get('SNG_TITLE'),
+                'track_number': int_or_none(s.get('TRACK_NUMBER')),
+                'track_id': s.get('SNG_ID'),
+                'artist': album_uploader,
+                'album': album_title,
+                'album_artist': album_uploader,
+            })
+
+        return {
+            '_type': 'playlist',
+            'id': album_id,
+            'title': album_title,
+            'uploader': album_uploader,
+            'thumbnail': album_thumbnail,
+            'entries': entries,
+        }

yt_dlp/extractor/digiview.py

@@ -1,130 +0,0 @@
-from .common import InfoExtractor
-from .youtube import YoutubeIE
-from ..utils import clean_html, int_or_none, traverse_obj, url_or_none, urlencode_postdata
-
-
-class DigiviewIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ladigitale\.dev/digiview/#/v/(?P<id>[0-9a-f]+)'
-    _TESTS = [{
-        # normal video
-        'url': 'https://ladigitale.dev/digiview/#/v/67a8e50aee2ec',
-        'info_dict': {
-            'id': '67a8e50aee2ec',
-            'ext': 'mp4',
-            'title': 'Big Buck Bunny 60fps 4K - Official Blender Foundation Short Film',
-            'thumbnail': 'https://i.ytimg.com/vi/aqz-KE-bpKQ/hqdefault.jpg',
-            'upload_date': '20141110',
-            'playable_in_embed': True,
-            'duration': 635,
-            'view_count': int,
-            'comment_count': int,
-            'channel': 'Blender',
-            'license': 'Creative Commons Attribution license (reuse allowed)',
-            'like_count': int,
-            'tags': 'count:8',
-            'live_status': 'not_live',
-            'channel_id': 'UCSMOQeBJ2RAnuFungnQOxLg',
-            'channel_follower_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCSMOQeBJ2RAnuFungnQOxLg',
-            'uploader_id': '@BlenderOfficial',
-            'description': 'md5:8f3ed18a53a1bb36cbb3b70a15782fd0',
-            'categories': ['Film & Animation'],
-            'channel_is_verified': True,
-            'heatmap': 'count:100',
-            'section_end': 635,
-            'uploader': 'Blender',
-            'timestamp': 1415628355,
-            'uploader_url': 'https://www.youtube.com/@BlenderOfficial',
-            'age_limit': 0,
-            'section_start': 0,
-            'availability': 'public',
-        },
-    }, {
-        # cut video
-        'url': 'https://ladigitale.dev/digiview/#/v/67a8e51d0dd58',
-        'info_dict': {
-            'id': '67a8e51d0dd58',
-            'ext': 'mp4',
-            'title': 'Big Buck Bunny 60fps 4K - Official Blender Foundation Short Film',
-            'thumbnail': 'https://i.ytimg.com/vi/aqz-KE-bpKQ/hqdefault.jpg',
-            'upload_date': '20141110',
-            'playable_in_embed': True,
-            'duration': 5,
-            'view_count': int,
-            'comment_count': int,
-            'channel': 'Blender',
-            'license': 'Creative Commons Attribution license (reuse allowed)',
-            'like_count': int,
-            'tags': 'count:8',
-            'live_status': 'not_live',
-            'channel_id': 'UCSMOQeBJ2RAnuFungnQOxLg',
-            'channel_follower_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCSMOQeBJ2RAnuFungnQOxLg',
-            'uploader_id': '@BlenderOfficial',
-            'description': 'md5:8f3ed18a53a1bb36cbb3b70a15782fd0',
-            'categories': ['Film & Animation'],
-            'channel_is_verified': True,
-            'heatmap': 'count:100',
-            'section_end': 10,
-            'uploader': 'Blender',
-            'timestamp': 1415628355,
-            'uploader_url': 'https://www.youtube.com/@BlenderOfficial',
-            'age_limit': 0,
-            'section_start': 5,
-            'availability': 'public',
-        },
-    }, {
-        # changed title
-        'url': 'https://ladigitale.dev/digiview/#/v/67a8ea5644d7a',
-        'info_dict': {
-            'id': '67a8ea5644d7a',
-            'ext': 'mp4',
-            'title': 'Big Buck Bunny (with title changed)',
-            'thumbnail': 'https://i.ytimg.com/vi/aqz-KE-bpKQ/hqdefault.jpg',
-            'upload_date': '20141110',
-            'playable_in_embed': True,
-            'duration': 5,
-            'view_count': int,
-            'comment_count': int,
-            'channel': 'Blender',
-            'license': 'Creative Commons Attribution license (reuse allowed)',
-            'like_count': int,
-            'tags': 'count:8',
-            'live_status': 'not_live',
-            'channel_id': 'UCSMOQeBJ2RAnuFungnQOxLg',
-            'channel_follower_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCSMOQeBJ2RAnuFungnQOxLg',
-            'uploader_id': '@BlenderOfficial',
-            'description': 'md5:8f3ed18a53a1bb36cbb3b70a15782fd0',
-            'categories': ['Film & Animation'],
-            'channel_is_verified': True,
-            'heatmap': 'count:100',
-            'section_end': 15,
-            'uploader': 'Blender',
-            'timestamp': 1415628355,
-            'uploader_url': 'https://www.youtube.com/@BlenderOfficial',
-            'age_limit': 0,
-            'section_start': 10,
-            'availability': 'public',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_data = self._download_json(
-            'https://ladigitale.dev/digiview/inc/recuperer_video.php', video_id,
-            data=urlencode_postdata({'id': video_id}))
-
-        clip_id = video_data['videoId']
-        return self.url_result(
-            f'https://www.youtube.com/watch?v={clip_id}',
-            YoutubeIE, video_id, url_transparent=True,
-            **traverse_obj(video_data, {
-                'section_start': ('debut', {int_or_none}),
-                'section_end': ('fin', {int_or_none}),
-                'description': ('description', {clean_html}, filter),
-                'title': ('titre', {str}),
-                'thumbnail': ('vignette', {url_or_none}),
-                'view_count': ('vues', {int_or_none}),
-            }),
-        )

yt_dlp/extractor/dreisat.py

@@ -1,75 +1,34 @@
-from .zdf import ZDFBaseIE
+from .zdf import ZDFIE
-from ..utils import (
-    int_or_none,
-    merge_dicts,
-    parse_iso8601,
-)
-from ..utils.traversal import require, traverse_obj
 
 
-class DreiSatIE(ZDFBaseIE):
+class DreiSatIE(ZDFIE):  # XXX: Do not subclass from concrete IE
     IE_NAME = '3sat'
-    _VALID_URL = r'https?://(?:www\.)?3sat\.de/(?:[^/?#]+/)*(?P<id>[^/?#&]+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?3sat\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)\.html'
     _TESTS = [{
-        'url': 'https://www.3sat.de/dokumentation/reise/traumziele-suedostasiens-die-philippinen-und-vietnam-102.html',
+        # Same as https://www.zdf.de/dokumentation/ab-18/10-wochen-sommer-102.html
+        'url': 'https://www.3sat.de/film/ab-18/10-wochen-sommer-108.html',
+        'md5': '0aff3e7bc72c8813f5e0fae333316a1d',
         'info_dict': {
-            'id': '231124_traumziele_philippinen_und_vietnam_dokreise',
+            'id': '141007_ab18_10wochensommer_film',
             'ext': 'mp4',
-            'title': 'Traumziele Südostasiens (1/2): Die Philippinen und Vietnam',
+            'title': 'Ab 18! - 10 Wochen Sommer',
-            'description': 'md5:26329ce5197775b596773b939354079d',
+            'description': 'md5:8253f41dc99ce2c3ff892dac2d65fe26',
-            'duration': 2625.0,
+            'duration': 2660,
-            'thumbnail': 'https://www.3sat.de/assets/traumziele-suedostasiens-die-philippinen-und-vietnam-100~original?cb=1699870351148',
+            'timestamp': 1608604200,
-            'episode': 'Traumziele Südostasiens (1/2): Die Philippinen und Vietnam',
+            'upload_date': '20201222',
-            'episode_id': 'POS_cc7ff51c-98cf-4d12-b99d-f7a551de1c95',
-            'timestamp': 1747920900,
-            'upload_date': '20250522',
         },
     }, {
-        'url': 'https://www.3sat.de/film/ab-18/ab-18---mein-fremdes-ich-100.html',
+        'url': 'https://www.3sat.de/gesellschaft/schweizweit/waidmannsheil-100.html',
-        'md5': 'f92638413a11d759bdae95c9d8ec165c',
         'info_dict': {
-            'id': '221128_mein_fremdes_ich2_ab18',
+            'id': '140913_sendung_schweizweit',
             'ext': 'mp4',
-            'title': 'Ab 18! - Mein fremdes Ich',
+            'title': 'Waidmannsheil',
-            'description': 'md5:cae0c0b27b7426d62ca0dda181738bf0',
+            'description': 'md5:cce00ca1d70e21425e72c86a98a56817',
-            'duration': 2625.0,
+            'timestamp': 1410623100,
-            'thumbnail': 'https://www.3sat.de/assets/ab-18---mein-fremdes-ich-106~original?cb=1666081865812',
+            'upload_date': '20140913',
-            'episode': 'Ab 18! - Mein fremdes Ich',
-            'episode_id': 'POS_6225d1ca-a0d5-45e3-870b-e783ee6c8a3f',
-            'timestamp': 1695081600,
-            'upload_date': '20230919',
         },
-    }, {
+        'params': {
-        'url': 'https://www.3sat.de/gesellschaft/37-grad-leben/aus-dem-leben-gerissen-102.html',
+            'skip_download': True,
-        'md5': 'a903eaf8d1fd635bd3317cd2ad87ec84',
-        'info_dict': {
-            'id': '250323_0903_sendung_sgl',
-            'ext': 'mp4',
-            'title': 'Plötzlich ohne dich',
-            'description': 'md5:380cc10659289dd91510ad8fa717c66b',
-            'duration': 1620.0,
-            'thumbnail': 'https://www.3sat.de/assets/37-grad-leben-106~original?cb=1645537156810',
-            'episode': 'Plötzlich ohne dich',
-            'episode_id': 'POS_faa7a93c-c0f2-4d51-823f-ce2ac3ee191b',
-            'timestamp': 1743162540,
-            'upload_date': '20250328',
-        },
-    }, {
-        # Video with chapters
-        'url': 'https://www.3sat.de/kultur/buchmesse/dein-buch-das-beste-von-der-leipziger-buchmesse-2025-teil-1-100.html',
-        'md5': '6b95790ce52e75f0d050adcdd2711ee6',
-        'info_dict': {
-            'id': '250330_dein_buch1_bum',
-            'ext': 'mp4',
-            'title': 'dein buch  - Das Beste von der Leipziger Buchmesse 2025 - Teil 1',
-            'description': 'md5:bae51bfc22f15563ce3acbf97d2e8844',
-            'duration': 5399.0,
-            'thumbnail': 'https://www.3sat.de/assets/buchmesse-kerkeling-100~original?cb=1743329640903',
-            'chapters': 'count:24',
-            'episode': 'dein buch  - Das Beste von der Leipziger Buchmesse 2025 - Teil 1',
-            'episode_id': 'POS_1ef236cc-b390-401e-acd0-4fb4b04315fb',
-            'timestamp': 1743327000,
-            'upload_date': '20250330',
         },
     }, {
         # Same as https://www.zdf.de/filme/filme-sonstige/der-hauptmann-112.html
@@ -80,45 +39,3 @@ class DreiSatIE(ZDFBaseIE):
         'url': 'https://www.3sat.de/wissen/nano/nano-21-mai-2019-102.html',
         'only_matching': True,
     }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        player = self._search_json(
-            r'data-zdfplayer-jsb=(["\'])', webpage, 'player JSON', video_id)
-        player_url = player['content']
-        api_token = f'Bearer {player["apiToken"]}'
-
-        content = self._call_api(player_url, video_id, 'video metadata', api_token)
-
-        video_target = content['mainVideoContent']['http://zdf.de/rels/target']
-        ptmd_path = traverse_obj(video_target, (
-            (('streams', 'default'), None),
-            ('http://zdf.de/rels/streams/ptmd', 'http://zdf.de/rels/streams/ptmd-template'),
-            {str}, any, {require('ptmd path')}))
-        ptmd_url = self._expand_ptmd_template(player_url, ptmd_path)
-        aspect_ratio = self._parse_aspect_ratio(video_target.get('aspectRatio'))
-        info = self._extract_ptmd(ptmd_url, video_id, api_token, aspect_ratio)
-
-        return merge_dicts(info, {
-            **traverse_obj(content, {
-                'title': (('title', 'teaserHeadline'), {str}, any),
-                'episode': (('title', 'teaserHeadline'), {str}, any),
-                'description': (('leadParagraph', 'teasertext'), {str}, any),
-                'timestamp': ('editorialDate', {parse_iso8601}),
-            }),
-            **traverse_obj(video_target, {
-                'duration': ('duration', {int_or_none}),
-                'chapters': ('streamAnchorTag', {self._extract_chapters}),
-            }),
-            'thumbnails': self._extract_thumbnails(traverse_obj(content, ('teaserImageRef', 'layouts', {dict}))),
-            **traverse_obj(content, ('programmeItem', 0, 'http://zdf.de/rels/target', {
-                'series_id': ('http://zdf.de/rels/cmdm/series', 'seriesUuid', {str}),
-                'series': ('http://zdf.de/rels/cmdm/series', 'seriesTitle', {str}),
-                'season': ('http://zdf.de/rels/cmdm/season', 'seasonTitle', {str}),
-                'season_number': ('http://zdf.de/rels/cmdm/season', 'seasonNumber', {int_or_none}),
-                'season_id': ('http://zdf.de/rels/cmdm/season', 'seasonUuid', {str}),
-                'episode_number': ('episodeNumber', {int_or_none}),
-                'episode_id': ('contentId', {str}),
-            })),
-        })

yt_dlp/extractor/dropbox.py

@@ -82,7 +82,7 @@ class DropboxIE(InfoExtractor):
                 has_anonymous_download = self._search_regex(
                     r'(anonymous:\tanonymous)', part, 'anonymous', default=False)
             transcode_url = self._search_regex(
-                r'\n.?(https://[^\x03\x08\x12\n]+\.m3u8)', part, 'transcode url', default=None)
+                r'\n.(https://[^\x03\x08\x12\n]+\.m3u8)', part, 'transcode url', default=None)
             if not transcode_url:
                 continue
             formats, subtitles = self._extract_m3u8_formats_and_subtitles(transcode_url, video_id, 'mp4')

yt_dlp/extractor/dropout.py

@@ -135,7 +135,7 @@ class DropoutIE(InfoExtractor):
                     self.raise_login_required(method='any')
                 raise ExtractorError(login_err, expected=True)
 
-        embed_url = self._html_search_regex(r'embed_url:\s*["\'](.+?)["\']', webpage, 'embed url')
+        embed_url = self._search_regex(r'embed_url:\s*["\'](.+?)["\']', webpage, 'embed url')
         thumbnail = self._og_search_thumbnail(webpage)
         watch_info = get_element_by_id('watch-info', webpage) or ''
 

yt_dlp/extractor/drtalks.py

@@ -1,51 +0,0 @@
-from .brightcove import BrightcoveNewIE
-from .common import InfoExtractor
-from ..utils import url_or_none
-from ..utils.traversal import traverse_obj
-
-
-class DrTalksIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?drtalks\.com/videos/(?P<id>[\w-]+)'
-    _TESTS = [{
-        'url': 'https://drtalks.com/videos/six-pillars-of-resilience-tools-for-managing-stress-and-flourishing/',
-        'info_dict': {
-            'id': '6366193757112',
-            'ext': 'mp4',
-            'uploader_id': '6314452011001',
-            'tags': ['resilience'],
-            'description': 'md5:9c6805aee237ee6de8052461855b9dda',
-            'timestamp': 1734546659,
-            'thumbnail': 'https://drtalks.com/wp-content/uploads/2024/12/Episode-82-Eva-Selhub-DrTalks-Thumbs.jpg',
-            'title': 'Six Pillars of Resilience: Tools for Managing Stress and Flourishing',
-            'duration': 2800.682,
-            'upload_date': '20241218',
-        },
-    }, {
-        'url': 'https://drtalks.com/videos/the-pcos-puzzle-mastering-metabolic-health-with-marcelle-pick/',
-        'info_dict': {
-            'id': '6364699891112',
-            'ext': 'mp4',
-            'title': 'The PCOS Puzzle: Mastering Metabolic Health with Marcelle Pick',
-            'description': 'md5:e87cbe00ca50135d5702787fc4043aaa',
-            'thumbnail': 'https://drtalks.com/wp-content/uploads/2024/11/Episode-34-Marcelle-Pick-OBGYN-NP-DrTalks.jpg',
-            'duration': 3515.2,
-            'tags': ['pcos'],
-            'upload_date': '20241114',
-            'timestamp': 1731592119,
-            'uploader_id': '6314452011001',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        next_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['data']['video']
-
-        return self.url_result(
-            next_data['videos']['brightcoveVideoLink'], BrightcoveNewIE, video_id,
-            url_transparent=True,
-            **traverse_obj(next_data, {
-                'title': ('title', {str}),
-                'description': ('videos', 'summury', {str}),
-                'thumbnail': ('featuredImage', 'node', 'sourceUrl', {url_or_none}),
-            }))

yt_dlp/extractor/eggs.py

@@ -1,155 +0,0 @@
-import secrets
-
-from .common import InfoExtractor
-from .youtube import YoutubeIE
-from ..utils import (
-    int_or_none,
-    parse_iso8601,
-    str_or_none,
-    url_or_none,
-)
-from ..utils.traversal import traverse_obj
-
-
-class EggsBaseIE(InfoExtractor):
-    _API_HEADERS = {
-        'Accept': '*/*',
-        'apVersion': '8.2.00',
-        'deviceName': 'Android',
-    }
-
-    def _real_initialize(self):
-        self._API_HEADERS['deviceId'] = secrets.token_hex(8)
-
-    def _call_api(self, endpoint, video_id):
-        return self._download_json(
-            f'https://app-front-api.eggs.mu/v1/{endpoint}', video_id,
-            headers=self._API_HEADERS)
-
-    def _extract_music_info(self, data):
-        if yt_url := traverse_obj(data, ('youtubeUrl', {url_or_none})):
-            return self.url_result(yt_url, ie=YoutubeIE)
-
-        artist_name = traverse_obj(data, ('artist', 'artistName', {str_or_none}))
-        music_id = traverse_obj(data, ('musicId', {str_or_none}))
-        webpage_url = None
-        if artist_name and music_id:
-            webpage_url = f'https://eggs.mu/artist/{artist_name}/song/{music_id}'
-
-        return {
-            'id': music_id,
-            'vcodec': 'none',
-            'webpage_url': webpage_url,
-            'extractor_key': EggsIE.ie_key(),
-            'extractor': EggsIE.IE_NAME,
-            **traverse_obj(data, {
-                'title': ('musicTitle', {str}),
-                'url': ('musicDataPath', {url_or_none}),
-                'uploader': ('artist', 'displayName', {str}),
-                'uploader_id': ('artist', 'artistId', {str_or_none}),
-                'thumbnail': ('imageDataPath', {url_or_none}),
-                'view_count': ('numberOfMusicPlays', {int_or_none}),
-                'like_count': ('numberOfLikes', {int_or_none}),
-                'comment_count': ('numberOfComments', {int_or_none}),
-                'composers': ('composer', {str}, all),
-                'tags': ('tags', ..., {str}),
-                'timestamp': ('releaseDate', {parse_iso8601}),
-                'artist': ('artist', 'displayName', {str}),
-            })}
-
-
-class EggsIE(EggsBaseIE):
-    IE_NAME = 'eggs:single'
-    _VALID_URL = r'https?://eggs\.mu/artist/[^/?#]+/song/(?P<id>[\da-f-]+)'
-
-    _TESTS = [{
-        'url': 'https://eggs.mu/artist/32_sunny_girl/song/0e95fd1d-4d61-4d5b-8b18-6092c551da90',
-        'info_dict': {
-            'id': '0e95fd1d-4d61-4d5b-8b18-6092c551da90',
-            'ext': 'm4a',
-            'title': 'シネマと信号',
-            'uploader': 'Sunny Girl',
-            'thumbnail': r're:https?://.*\.jpg(?:\?.*)?$',
-            'uploader_id': '1607',
-            'like_count': int,
-            'timestamp': 1731327327,
-            'composers': ['橘高連太郎'],
-            'view_count': int,
-            'comment_count': int,
-            'artists': ['Sunny Girl'],
-            'upload_date': '20241111',
-            'tags': ['SunnyGirl', 'シネマと信号'],
-        },
-    }, {
-        'url': 'https://eggs.mu/artist/KAMO_3pband/song/1d4bc45f-1af6-47a9-8b30-a70cae350b4f',
-        'info_dict': {
-            'id': '80cLKA2wnoA',
-            'ext': 'mp4',
-            'title': 'KAMO「いい女だから」Audio',
-            'uploader': 'KAMO',
-            'live_status': 'not_live',
-            'channel_id': 'UCsHLBw2__5Q9y55skXPotOg',
-            'channel_follower_count': int,
-            'description': 'md5:d260da711ecbec3e720293dc11401b87',
-            'availability': 'public',
-            'uploader_id': '@KAMO_band',
-            'upload_date': '20240925',
-            'thumbnail': 'https://i.ytimg.com/vi/80cLKA2wnoA/maxresdefault.jpg',
-            'comment_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCsHLBw2__5Q9y55skXPotOg',
-            'view_count': int,
-            'duration': 151,
-            'like_count': int,
-            'channel': 'KAMO',
-            'playable_in_embed': True,
-            'uploader_url': 'https://www.youtube.com/@KAMO_band',
-            'tags': [],
-            'timestamp': 1727271121,
-            'age_limit': 0,
-            'categories': ['People & Blogs'],
-        },
-        'add_ie': ['Youtube'],
-        'params': {'skip_download': 'Youtube'},
-    }]
-
-    def _real_extract(self, url):
-        song_id = self._match_id(url)
-        json_data = self._call_api(f'musics/{song_id}', song_id)
-        return self._extract_music_info(json_data)
-
-
-class EggsArtistIE(EggsBaseIE):
-    IE_NAME = 'eggs:artist'
-    _VALID_URL = r'https?://eggs\.mu/artist/(?P<id>\w+)/?(?:[?#&]|$)'
-
-    _TESTS = [{
-        'url': 'https://eggs.mu/artist/32_sunny_girl',
-        'info_dict': {
-            'id': '32_sunny_girl',
-            'thumbnail': 'https://image-pro.eggs.mu/profile/1607.jpeg?updated_at=2024-04-03T20%3A06%3A00%2B09%3A00',
-            'description': 'Muddy Mine / 東京高田馬場CLUB PHASE / Gt.Vo 橘高 連太郎 / Ba.Cho 小野 ゆうき / Dr 大森 りゅうひこ',
-            'title': 'Sunny Girl',
-        },
-        'playlist_mincount': 18,
-    }, {
-        'url': 'https://eggs.mu/artist/KAMO_3pband',
-        'info_dict': {
-            'id': 'KAMO_3pband',
-            'description': '川崎発３ピースバンド',
-            'thumbnail': 'https://image-pro.eggs.mu/profile/35217.jpeg?updated_at=2024-11-27T16%3A31%3A50%2B09%3A00',
-            'title': 'KAMO',
-        },
-        'playlist_mincount': 2,
-    }]
-
-    def _real_extract(self, url):
-        artist_id = self._match_id(url)
-        artist_data = self._call_api(f'artists/{artist_id}', artist_id)
-        song_data = self._call_api(f'artists/{artist_id}/musics', artist_id)
-        return self.playlist_result(
-            traverse_obj(song_data, ('data', ..., {dict}, {self._extract_music_info})),
-            playlist_id=artist_id, **traverse_obj(artist_data, {
-                'title': ('displayName', {str}),
-                'description': ('profile', {str}),
-                'thumbnail': ('imageDataPath', {url_or_none}),
-            }))

yt_dlp/extractor/extractors.py

@@ -1,37 +1,28 @@
-import inspect
+import contextlib
 import os
 
-from ..globals import LAZY_EXTRACTORS
+from ..plugins import load_plugins
-from ..globals import extractors as _extractors_context
 
-_CLASS_LOOKUP = None
+# NB: Must be before other imports so that plugins can be correctly injected
-if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
+_PLUGIN_CLASSES = load_plugins('extractor', 'IE')
-    LAZY_EXTRACTORS.value = False
-else:
-    try:
-        from .lazy_extractors import _CLASS_LOOKUP
-        LAZY_EXTRACTORS.value = True
-    except ImportError:
-        LAZY_EXTRACTORS.value = None
 
-if not _CLASS_LOOKUP:
+_LAZY_LOADER = False
-    from . import _extractors
+if not os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
+    with contextlib.suppress(ImportError):
+        from .lazy_extractors import *  # noqa: F403
+        from .lazy_extractors import _ALL_CLASSES
+        _LAZY_LOADER = True
 
-    _CLASS_LOOKUP = {
+if not _LAZY_LOADER:
-        name: value
+    from ._extractors import *  # noqa: F403
-        for name, value in inspect.getmembers(_extractors)
+    _ALL_CLASSES = [  # noqa: F811
+        klass
+        for name, klass in globals().items()
         if name.endswith('IE') and name != 'GenericIE'
-    }
+    ]
-    _CLASS_LOOKUP['GenericIE'] = _extractors.GenericIE
+    _ALL_CLASSES.append(GenericIE)  # noqa: F405
 
-# We want to append to the main lookup
+globals().update(_PLUGIN_CLASSES)
-_current = _extractors_context.value
+_ALL_CLASSES[:0] = _PLUGIN_CLASSES.values()
-for name, ie in _CLASS_LOOKUP.items():
-    _current.setdefault(name, ie)
 
-
+from .common import _PLUGIN_OVERRIDES  # noqa: F401
-def __getattr__(name):
-    value = _CLASS_LOOKUP.get(name)
-    if not value:
-        raise AttributeError(f'module {__name__} has no attribute {name}')
-    return value

yt_dlp/extractor/firsttv.py

@@ -12,7 +12,7 @@ from ..utils import (
 class FirstTVIE(InfoExtractor):
     IE_NAME = '1tv'
     IE_DESC = 'Первый канал'
-    _VALID_URL = r'https?://(?:www\.)?(?:sport)?1tv\.ru/(?:[^/?#]+/)+(?P<id>[^/?#]+)'
+    _VALID_URL = r'https?://(?:www\.)?1tv\.ru/(?:[^/]+/)+(?P<id>[^/?#]+)'
 
     _TESTS = [{
         # single format
@@ -52,9 +52,6 @@ class FirstTVIE(InfoExtractor):
     }, {
         'url': 'http://www.1tv.ru/shows/tochvtoch-supersezon/vystupleniya/evgeniy-dyatlov-vladimir-vysockiy-koni-priveredlivye-toch-v-toch-supersezon-fragment-vypuska-ot-06-11-2016',
         'only_matching': True,
-    }, {
-        'url': 'https://www.sport1tv.ru/sport/chempionat-rossii-po-figurnomu-kataniyu-2025',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):

yt_dlp/extractor/francaisfacile.py

@@ -1,87 +0,0 @@
-import urllib.parse
-
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    url_or_none,
-)
-from ..utils.traversal import traverse_obj
-
-
-class FrancaisFacileIE(InfoExtractor):
-    _VALID_URL = r'https?://francaisfacile\.rfi\.fr/[a-z]{2}/(?:actualit%C3%A9|podcasts/[^/#?]+)/(?P<id>[^/#?]+)'
-    _TESTS = [{
-        'url': 'https://francaisfacile.rfi.fr/fr/actualit%C3%A9/20250305-r%C3%A9concilier-les-jeunes-avec-la-lecture-gr%C3%A2ce-aux-r%C3%A9seaux-sociaux',
-        'md5': '4f33674cb205744345cc835991100afa',
-        'info_dict': {
-            'id': 'WBMZ58952-FLE-FR-20250305',
-            'display_id': '20250305-réconcilier-les-jeunes-avec-la-lecture-grâce-aux-réseaux-sociaux',
-            'title': 'Réconcilier les jeunes avec la lecture grâce aux réseaux sociaux',
-            'url': 'https://aod-fle.akamaized.net/fle/sounds/fr/2025/03/05/6b6af52a-f9ba-11ef-a1f8-005056a97652.mp3',
-            'ext': 'mp3',
-            'description': 'md5:b903c63d8585bd59e8cc4d5f80c4272d',
-            'duration': 103.15,
-            'timestamp': 1741177984,
-            'upload_date': '20250305',
-        },
-    }, {
-        'url': 'https://francaisfacile.rfi.fr/fr/actualit%C3%A9/20250307-argentine-le-sac-d-un-alpiniste-retrouv%C3%A9-40-ans-apr%C3%A8s-sa-mort',
-        'md5': 'b8c3a63652d4ae8e8092dda5700c1cd9',
-        'info_dict': {
-            'id': 'WBMZ59102-FLE-FR-20250307',
-            'display_id': '20250307-argentine-le-sac-d-un-alpiniste-retrouvé-40-ans-après-sa-mort',
-            'title': 'Argentine: le sac d\'un alpiniste retrouvé 40 ans après sa mort',
-            'url': 'https://aod-fle.akamaized.net/fle/sounds/fr/2025/03/07/8edf4082-fb46-11ef-8a37-005056bf762b.mp3',
-            'ext': 'mp3',
-            'description': 'md5:7fd088fbdf4a943bb68cf82462160dca',
-            'duration': 117.74,
-            'timestamp': 1741352789,
-            'upload_date': '20250307',
-        },
-    }, {
-        'url': 'https://francaisfacile.rfi.fr/fr/podcasts/un-mot-une-histoire/20250317-le-mot-de-david-foenkinos-peut-%C3%AAtre',
-        'md5': 'db83c2cc2589b4c24571c6b6cf14f5f1',
-        'info_dict': {
-            'id': 'WBMZ59441-FLE-FR-20250317',
-            'display_id': '20250317-le-mot-de-david-foenkinos-peut-être',
-            'title': 'Le mot de David Foenkinos: «peut-être» - Un mot, une histoire',
-            'url': 'https://aod-fle.akamaized.net/fle/sounds/fr/2025/03/17/4ca6cbbe-0315-11f0-a85b-005056a97652.mp3',
-            'ext': 'mp3',
-            'description': 'md5:3fe35fae035803df696bfa7af2496e49',
-            'duration': 198.96,
-            'timestamp': 1742210897,
-            'upload_date': '20250317',
-        },
-    }]
-
-    def _real_extract(self, url):
-        display_id = urllib.parse.unquote(self._match_id(url))
-
-        try:  # yt-dlp's default user-agents are too old and blocked by the site
-            webpage = self._download_webpage(url, display_id, headers={
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:136.0) Gecko/20100101 Firefox/136.0',
-            })
-        except ExtractorError as e:
-            if not isinstance(e.cause, HTTPError) or e.cause.status != 403:
-                raise
-            # Retry with impersonation if hardcoded UA is insufficient
-            webpage = self._download_webpage(url, display_id, impersonate=True)
-
-        data = self._search_json(
-            r'<script[^>]+\bdata-media-id=[^>]+\btype="application/json"[^>]*>',
-            webpage, 'audio data', display_id)
-
-        return {
-            'id': data['mediaId'],
-            'display_id': display_id,
-            'vcodec': 'none',
-            'title': self._html_extract_title(webpage),
-            **self._search_json_ld(webpage, display_id, fatal=False),
-            **traverse_obj(data, {
-                'title': ('title', {str}),
-                'url': ('sources', ..., 'url', {url_or_none}, any),
-                'duration': ('sources', ..., 'duration', {float_or_none}, any),
-            }),
-        }

yt_dlp/extractor/francetv.py

@@ -1,4 +1,3 @@
-import json
 import re
 import urllib.parse
 
@@ -6,10 +5,8 @@ from .common import InfoExtractor
 from .dailymotion import DailymotionIE
 from ..networking import HEADRequest
 from ..utils import (
-    ExtractorError,
     clean_html,
     determine_ext,
-    extract_attributes,
     filter_dict,
     format_field,
     int_or_none,
@@ -19,7 +16,7 @@ from ..utils import (
     unsmuggle_url,
     url_or_none,
 )
-from ..utils.traversal import find_element, traverse_obj
+from ..utils.traversal import traverse_obj
 
 
 class FranceTVBaseInfoExtractor(InfoExtractor):
@@ -32,7 +29,6 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
 
 
 class FranceTVIE(InfoExtractor):
-    IE_NAME = 'francetv'
     _VALID_URL = r'francetv:(?P<id>[^@#]+)'
     _GEO_COUNTRIES = ['FR']
     _GEO_BYPASS = False
@@ -252,19 +248,18 @@ class FranceTVIE(InfoExtractor):
 
 
 class FranceTVSiteIE(FranceTVBaseInfoExtractor):
-    IE_NAME = 'francetv:site'
     _VALID_URL = r'https?://(?:(?:www\.)?france\.tv|mobile\.france\.tv)/(?:[^/]+/)*(?P<id>[^/]+)\.html'
 
     _TESTS = [{
         'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
         'info_dict': {
-            'id': 'ec217ecc-0733-48cf-ac06-af1347b849d1',  # old: c5bda21d-2c6f-4470-8849-3d8327adb2ba'
+            'id': 'c5bda21d-2c6f-4470-8849-3d8327adb2ba',
             'ext': 'mp4',
             'title': '13h15, le dimanche... - Les mystères de Jésus',
-            'timestamp': 1502623500,
+            'timestamp': 1514118300,
-            'duration': 2580,
+            'duration': 2880,
             'thumbnail': r're:^https?://.*\.jpg$',
-            'upload_date': '20170813',
+            'upload_date': '20171224',
         },
         'params': {
             'skip_download': True,
@@ -287,7 +282,6 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 1441,
         },
-        'skip': 'No longer available',
     }, {
         # geo-restricted livestream (workflow == 'token-akamai')
         'url': 'https://www.france.tv/france-4/direct.html',
@@ -342,33 +336,19 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
         'only_matching': True,
     }]
 
-    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.goplay
-    def _find_json(self, s):
-        return self._search_json(
-            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
-
     def _real_extract(self, url):
         display_id = self._match_id(url)
+
         webpage = self._download_webpage(url, display_id)
 
-        nextjs_data = traverse_obj(
+        video_id = self._search_regex(
-            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
+            r'(?:data-main-video\s*=|videoId["\']?\s*[:=])\s*(["\'])(?P<id>(?:(?!\1).)+)\1',
-            (..., {json.loads}, ..., {self._find_json}, ..., 'children', ..., ..., 'children', ..., ..., 'children'))
+            webpage, 'video id', default=None, group='id')
-
-        if traverse_obj(nextjs_data, (..., ..., 'children', ..., 'isLive', {bool}, any)):
-            # For livestreams we need the id of the stream instead of the currently airing episode id
-            video_id = traverse_obj(nextjs_data, (
-                ..., ..., 'children', ..., 'children', ..., 'children', ..., 'children', ..., ...,
-                'children', ..., ..., 'children', ..., ..., 'children', (..., (..., ...)),
-                'options', 'id', {str}, any))
-        else:
-            video_id = traverse_obj(nextjs_data, (
-                ..., ..., ..., 'children',
-                lambda _, v: v['video']['url'] == urllib.parse.urlparse(url).path,
-                'video', ('playerReplayId', 'siId'), {str}, any))
 
         if not video_id:
-            raise ExtractorError('Unable to extract video ID')
+            video_id = self._html_search_regex(
+                r'(?:href=|player\.setVideo\(\s*)"http://videos?\.francetv\.fr/video/([^@"]+@[^"]+)"',
+                webpage, 'video ID')
 
         return self._make_url_result(video_id, url=url)
 
@@ -461,16 +441,11 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
                 self.url_result(dailymotion_url, DailymotionIE.ie_key())
                 for dailymotion_url in dailymotion_urls])
 
-        video_id = (
+        video_id = self._search_regex(
-            traverse_obj(webpage, (
-                {find_element(tag='button', attr='data-cy', value='francetv-player-wrapper', html=True)},
-                {extract_attributes}, 'id'))
-            or self._search_regex(
             (r'player\.load[^;]+src:\s*["\']([^"\']+)',
              r'id-video=([^@]+@[^"]+)',
              r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"',
              r'(?:data-id|<figure[^<]+\bid)=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'),
             webpage, 'video id')
-        )
 
         return self._make_url_result(video_id, url=url)

yt_dlp/extractor/funimation.py

@@ -0,0 +1,349 @@
+import random
+import re
+import string
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    determine_ext,
+    int_or_none,
+    join_nonempty,
+    js_to_json,
+    make_archive_id,
+    orderedSet,
+    qualities,
+    str_or_none,
+    traverse_obj,
+    try_get,
+    urlencode_postdata,
+)
+
+
+class FunimationBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'funimation'
+    _REGION = None
+    _TOKEN = None
+
+    def _get_region(self):
+        region_cookie = self._get_cookies('https://www.funimation.com').get('region')
+        region = region_cookie.value if region_cookie else self.get_param('geo_bypass_country')
+        return region or traverse_obj(
+            self._download_json(
+                'https://geo-service.prd.funimationsvc.com/geo/v1/region/check', None, fatal=False,
+                note='Checking geo-location', errnote='Unable to fetch geo-location information'),
+            'region') or 'US'
+
+    def _perform_login(self, username, password):
+        if self._TOKEN:
+            return
+        try:
+            data = self._download_json(
+                'https://prod-api-funimationnow.dadcdigital.com/api/auth/login/',
+                None, 'Logging in', data=urlencode_postdata({
+                    'username': username,
+                    'password': password,
+                }))
+            FunimationBaseIE._TOKEN = data['token']
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                error = self._parse_json(e.cause.response.read().decode(), None)['error']
+                raise ExtractorError(error, expected=True)
+            raise
+
+
+class FunimationPageIE(FunimationBaseIE):
+    IE_NAME = 'funimation:page'
+    _VALID_URL = r'https?://(?:www\.)?funimation(?:\.com|now\.uk)/(?:(?P<lang>[^/]+)/)?(?:shows|v)/(?P<show>[^/]+)/(?P<episode>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'https://www.funimation.com/shows/attack-on-titan-junior-high/broadcast-dub-preview/',
+        'info_dict': {
+            'id': '210050',
+            'ext': 'mp4',
+            'title': 'Broadcast Dub Preview',
+            # Other metadata is tested in FunimationIE
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+        'add_ie': ['Funimation'],
+    }, {
+        # Not available in US
+        'url': 'https://www.funimation.com/shows/hacksign/role-play/',
+        'only_matching': True,
+    }, {
+        # with lang code
+        'url': 'https://www.funimation.com/en/shows/hacksign/role-play/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.funimationnow.uk/shows/puzzle-dragons-x/drop-impact/simulcast/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.funimation.com/v/a-certain-scientific-railgun/super-powered-level-5',
+        'only_matching': True,
+    }]
+
+    def _real_initialize(self):
+        if not self._REGION:
+            FunimationBaseIE._REGION = self._get_region()
+
+    def _real_extract(self, url):
+        locale, show, episode = self._match_valid_url(url).group('lang', 'show', 'episode')
+
+        video_id = traverse_obj(self._download_json(
+            f'https://title-api.prd.funimationsvc.com/v1/shows/{show}/episodes/{episode}',
+            f'{show}_{episode}', query={
+                'deviceType': 'web',
+                'region': self._REGION,
+                'locale': locale or 'en',
+            }), ('videoList', ..., 'id'), get_all=False)
+
+        return self.url_result(f'https://www.funimation.com/player/{video_id}', FunimationIE.ie_key(), video_id)
+
+
+class FunimationIE(FunimationBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?funimation\.com/player/(?P<id>\d+)'
+
+    _TESTS = [{
+        'url': 'https://www.funimation.com/player/210051',
+        'info_dict': {
+            'id': '210050',
+            'display_id': 'broadcast-dub-preview',
+            'ext': 'mp4',
+            'title': 'Broadcast Dub Preview',
+            'thumbnail': r're:https?://.*\.(?:jpg|png)',
+            'episode': 'Broadcast Dub Preview',
+            'episode_id': '210050',
+            'season': 'Extras',
+            'season_id': '166038',
+            'season_number': 99,
+            'series': 'Attack on Titan: Junior High',
+            'description': '',
+            'duration': 155,
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'note': 'player_id should be extracted with the relevent compat-opt',
+        'url': 'https://www.funimation.com/player/210051',
+        'info_dict': {
+            'id': '210051',
+            'display_id': 'broadcast-dub-preview',
+            'ext': 'mp4',
+            'title': 'Broadcast Dub Preview',
+            'thumbnail': r're:https?://.*\.(?:jpg|png)',
+            'episode': 'Broadcast Dub Preview',
+            'episode_id': '210050',
+            'season': 'Extras',
+            'season_id': '166038',
+            'season_number': 99,
+            'series': 'Attack on Titan: Junior High',
+            'description': '',
+            'duration': 155,
+        },
+        'params': {
+            'skip_download': 'm3u8',
+            'compat_opts': ['seperate-video-versions'],
+        },
+    }]
+
+    @staticmethod
+    def _get_experiences(episode):
+        for lang, lang_data in episode.get('languages', {}).items():
+            for video_data in lang_data.values():
+                for version, f in video_data.items():
+                    yield lang, version.title(), f
+
+    def _get_episode(self, webpage, experience_id=None, episode_id=None, fatal=True):
+        """ Extract the episode, season and show objects given either episode/experience id """
+        show = self._parse_json(
+            self._search_regex(
+                r'show\s*=\s*({.+?})\s*;', webpage, 'show data', fatal=fatal),
+            experience_id, transform_source=js_to_json, fatal=fatal) or []
+        for season in show.get('seasons', []):
+            for episode in season.get('episodes', []):
+                if episode_id is not None:
+                    if str(episode.get('episodePk')) == episode_id:
+                        return episode, season, show
+                    continue
+                for _, _, f in self._get_experiences(episode):
+                    if f.get('experienceId') == experience_id:
+                        return episode, season, show
+        if fatal:
+            raise ExtractorError('Unable to find episode information')
+        else:
+            self.report_warning('Unable to find episode information')
+        return {}, {}, {}
+
+    def _real_extract(self, url):
+        initial_experience_id = self._match_id(url)
+        webpage = self._download_webpage(
+            url, initial_experience_id, note=f'Downloading player webpage for {initial_experience_id}')
+        episode, season, show = self._get_episode(webpage, experience_id=int(initial_experience_id))
+        episode_id = str(episode['episodePk'])
+        display_id = episode.get('slug') or episode_id
+
+        formats, subtitles, thumbnails, duration = [], {}, [], 0
+        requested_languages, requested_versions = self._configuration_arg('language'), self._configuration_arg('version')
+        language_preference = qualities((requested_languages or [''])[::-1])
+        source_preference = qualities((requested_versions or ['uncut', 'simulcast'])[::-1])
+        only_initial_experience = 'seperate-video-versions' in self.get_param('compat_opts', [])
+
+        for lang, version, fmt in self._get_experiences(episode):
+            experience_id = str(fmt['experienceId'])
+            if ((only_initial_experience and experience_id != initial_experience_id)
+                    or (requested_languages and lang.lower() not in requested_languages)
+                    or (requested_versions and version.lower() not in requested_versions)):
+                continue
+            thumbnails.append({'url': fmt.get('poster')})
+            duration = max(duration, fmt.get('duration', 0))
+            format_name = f'{version} {lang} ({experience_id})'
+            self.extract_subtitles(
+                subtitles, experience_id, display_id=display_id, format_name=format_name,
+                episode=episode if experience_id == initial_experience_id else episode_id)
+
+            headers = {}
+            if self._TOKEN:
+                headers['Authorization'] = f'Token {self._TOKEN}'
+            page = self._download_json(
+                f'https://www.funimation.com/api/showexperience/{experience_id}/',
+                display_id, headers=headers, expected_status=403, query={
+                    'pinst_id': ''.join(random.choices(string.digits + string.ascii_letters, k=8)),
+                }, note=f'Downloading {format_name} JSON')
+            sources = page.get('items') or []
+            if not sources:
+                error = try_get(page, lambda x: x['errors'][0], dict)
+                if error:
+                    self.report_warning('{} said: Error {} - {}'.format(
+                        self.IE_NAME, error.get('code'), error.get('detail') or error.get('title')))
+                else:
+                    self.report_warning('No sources found for format')
+
+            current_formats = []
+            for source in sources:
+                source_url = source.get('src')
+                source_type = source.get('videoType') or determine_ext(source_url)
+                if source_type == 'm3u8':
+                    current_formats.extend(self._extract_m3u8_formats(
+                        source_url, display_id, 'mp4', m3u8_id='{}-{}'.format(experience_id, 'hls'), fatal=False,
+                        note=f'Downloading {format_name} m3u8 information'))
+                else:
+                    current_formats.append({
+                        'format_id': f'{experience_id}-{source_type}',
+                        'url': source_url,
+                    })
+                for f in current_formats:
+                    # TODO: Convert language to code
+                    f.update({
+                        'language': lang,
+                        'format_note': version,
+                        'source_preference': source_preference(version.lower()),
+                        'language_preference': language_preference(lang.lower()),
+                    })
+                formats.extend(current_formats)
+        if not formats and (requested_languages or requested_versions):
+            self.raise_no_formats(
+                'There are no video formats matching the requested languages/versions', expected=True, video_id=display_id)
+        self._remove_duplicate_formats(formats)
+
+        return {
+            'id': episode_id,
+            '_old_archive_ids': [make_archive_id(self, initial_experience_id)],
+            'display_id': display_id,
+            'duration': duration,
+            'title': episode['episodeTitle'],
+            'description': episode.get('episodeSummary'),
+            'episode': episode.get('episodeTitle'),
+            'episode_number': int_or_none(episode.get('episodeId')),
+            'episode_id': episode_id,
+            'season': season.get('seasonTitle'),
+            'season_number': int_or_none(season.get('seasonId')),
+            'season_id': str_or_none(season.get('seasonPk')),
+            'series': show.get('showTitle'),
+            'formats': formats,
+            'thumbnails': thumbnails,
+            'subtitles': subtitles,
+            '_format_sort_fields': ('lang', 'source'),
+        }
+
+    def _get_subtitles(self, subtitles, experience_id, episode, display_id, format_name):
+        if isinstance(episode, str):
+            webpage = self._download_webpage(
+                f'https://www.funimation.com/player/{experience_id}/', display_id,
+                fatal=False, note=f'Downloading player webpage for {format_name}')
+            episode, _, _ = self._get_episode(webpage, episode_id=episode, fatal=False)
+
+        for _, version, f in self._get_experiences(episode):
+            for source in f.get('sources'):
+                for text_track in source.get('textTracks'):
+                    if not text_track.get('src'):
+                        continue
+                    sub_type = text_track.get('type').upper()
+                    sub_type = sub_type if sub_type != 'FULL' else None
+                    current_sub = {
+                        'url': text_track['src'],
+                        'name': join_nonempty(version, text_track.get('label'), sub_type, delim=' '),
+                    }
+                    lang = join_nonempty(text_track.get('language', 'und'),
+                                         version if version != 'Simulcast' else None,
+                                         sub_type, delim='_')
+                    if current_sub not in subtitles.get(lang, []):
+                        subtitles.setdefault(lang, []).append(current_sub)
+        return subtitles
+
+
+class FunimationShowIE(FunimationBaseIE):
+    IE_NAME = 'funimation:show'
+    _VALID_URL = r'(?P<url>https?://(?:www\.)?funimation(?:\.com|now\.uk)/(?P<locale>[^/]+)?/?shows/(?P<id>[^/?#&]+))/?(?:[?#]|$)'
+
+    _TESTS = [{
+        'url': 'https://www.funimation.com/en/shows/sk8-the-infinity',
+        'info_dict': {
+            'id': '1315000',
+            'title': 'SK8 the Infinity',
+        },
+        'playlist_count': 13,
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        # without lang code
+        'url': 'https://www.funimation.com/shows/ouran-high-school-host-club/',
+        'info_dict': {
+            'id': '39643',
+            'title': 'Ouran High School Host Club',
+        },
+        'playlist_count': 26,
+        'params': {
+            'skip_download': True,
+        },
+    }]
+
+    def _real_initialize(self):
+        if not self._REGION:
+            FunimationBaseIE._REGION = self._get_region()
+
+    def _real_extract(self, url):
+        base_url, locale, display_id = self._match_valid_url(url).groups()
+
+        show_info = self._download_json(
+            'https://title-api.prd.funimationsvc.com/v2/shows/{}?region={}&deviceType=web&locale={}'.format(
+                display_id, self._REGION, locale or 'en'), display_id)
+        items_info = self._download_json(
+            'https://prod-api-funimationnow.dadcdigital.com/api/funimation/episodes/?limit=99999&title_id={}'.format(
+                show_info.get('id')), display_id)
+
+        vod_items = traverse_obj(items_info, ('items', ..., lambda k, _: re.match(r'(?i)mostRecent[AS]vod', k), 'item'))
+
+        return {
+            '_type': 'playlist',
+            'id': str_or_none(show_info['id']),
+            'title': show_info['name'],
+            'entries': orderedSet(
+                self.url_result(
+                    '{}/{}'.format(base_url, vod_item.get('episodeSlug')), FunimationPageIE.ie_key(),
+                    vod_item.get('episodeId'), vod_item.get('episodeName'))
+                for vod_item in sorted(vod_items, key=lambda x: x.get('episodeOrder', -1))),
+        }

yt_dlp/extractor/generic.py

@@ -37,7 +37,6 @@ from ..utils import (
     unescapeHTML,
     unified_timestamp,
     unsmuggle_url,
-    update_url,
     update_url_query,
     url_or_none,
     urlhandle_detect_ext,
@@ -294,19 +293,6 @@ class GenericIE(InfoExtractor):
                 'timestamp': 1378272859.0,
             },
         },
-        # Live DASH MPD
-        {
-            'url': 'https://livesim2.dashif.org/livesim2/ato_10/testpic_2s/Manifest.mpd',
-            'info_dict': {
-                'id': 'Manifest',
-                'ext': 'mp4',
-                'title': r're:Manifest \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
-                'live_status': 'is_live',
-            },
-            'params': {
-                'skip_download': 'livestream',
-            },
-        },
         # m3u8 served with Content-Type: audio/x-mpegURL; charset=utf-8
         {
             'url': 'http://once.unicornmedia.com/now/master/playlist/bb0b18ba-64f5-4b1b-a29f-0ac252f06b68/77a785f3-5188-4806-b788-0893a61634ed/93677179-2d99-4ef4-9e17-fe70d49abfbf/content.m3u8',
@@ -2214,21 +2200,10 @@ class GenericIE(InfoExtractor):
             if is_live is not None:
                 info['live_status'] = 'not_live' if is_live == 'false' else 'is_live'
                 return
-            headers = m3u8_format.get('http_headers') or info.get('http_headers') or {}
+            headers = m3u8_format.get('http_headers') or info.get('http_headers')
-            display_id = info.get('id')
+            duration = self._extract_m3u8_vod_duration(
-            urlh = self._request_webpage(
+                m3u8_format['url'], info.get('id'), note='Checking m3u8 live status',
-                m3u8_format['url'], display_id, 'Checking m3u8 live status', errnote=False,
+                errnote='Failed to download m3u8 media playlist', headers=headers)
-                headers={**headers, 'Accept-Encoding': 'identity'}, fatal=False)
-            if urlh is False:
-                return
-            first_bytes = urlh.read(512)
-            if not first_bytes.startswith(b'#EXTM3U'):
-                return
-            m3u8_doc = self._webpage_read_content(
-                urlh, urlh.url, display_id, prefix=first_bytes, fatal=False, errnote=False)
-            if not m3u8_doc:
-                return
-            duration = self._parse_m3u8_vod_duration(m3u8_doc, display_id)
             if not duration:
                 info['live_status'] = 'is_live'
             info['duration'] = info.get('duration') or duration
@@ -2461,9 +2436,10 @@ class GenericIE(InfoExtractor):
             subtitles = {}
             if format_id.endswith('mpegurl') or ext == 'm3u8':
                 formats, subtitles = self._extract_m3u8_formats_and_subtitles(url, video_id, 'mp4', headers=headers)
+            elif format_id.endswith(('mpd', 'dash+xml')) or ext == 'mpd':
+                formats, subtitles = self._extract_mpd_formats_and_subtitles(url, video_id, headers=headers)
             elif format_id == 'f4m' or ext == 'f4m':
                 formats = self._extract_f4m_formats(url, video_id, headers=headers)
-            # Don't check for DASH/mpd here, do it later w/ first_bytes. Same number of requests either way
             else:
                 formats = [{
                     'format_id': format_id,
@@ -2538,15 +2514,13 @@ class GenericIE(InfoExtractor):
                 return self.playlist_result(
                     self._parse_xspf(
                         doc, video_id, xspf_url=url,
-                        xspf_base_url=new_url),
+                        xspf_base_url=full_response.url),
                     video_id)
             elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag):
                 info_dict['formats'], info_dict['subtitles'] = self._parse_mpd_formats_and_subtitles(
                     doc,
-                    # Do not use yt_dlp.utils.base_url here since it will raise on file:// URLs
+                    mpd_base_url=full_response.url.rpartition('/')[0],
-                    mpd_base_url=update_url(new_url, query=None, fragment=None).rpartition('/')[0],
                     mpd_url=url)
-                info_dict['live_status'] = 'is_live' if doc.get('type') == 'dynamic' else None
                 self._extra_manifest_info(info_dict, url)
                 self.report_detected('DASH manifest')
                 return info_dict

yt_dlp/extractor/getcourseru.py

@@ -8,7 +8,7 @@ from ..utils.traversal import traverse_obj
 
 
 class GetCourseRuPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:player02\.getcourse\.ru|cf-api-2\.vhcdn\.com)/sign-player/?\?(?:[^#]+&)?json=[^#&]+'
+    _VALID_URL = r'https?://player02\.getcourse\.ru/sign-player/?\?(?:[^#]+&)?json=[^#&]+'
     _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL}[^\'"]*)']
     _TESTS = [{
         'url': 'http://player02.getcourse.ru/sign-player/?json=eyJ2aWRlb19oYXNoIjoiMTkwYmRmOTNmMWIyOTczNTMwOTg1M2E3YTE5ZTI0YjMiLCJ1c2VyX2lkIjozNTk1MjUxODMsInN1Yl9sb2dpbl91c2VyX2lkIjpudWxsLCJsZXNzb25faWQiOm51bGwsImlwIjoiNDYuMTQyLjE4Mi4yNDciLCJnY19ob3N0IjoiYWNhZGVteW1lbC5vbmxpbmUiLCJ0aW1lIjoxNzA1NDQ5NjQyLCJwYXlsb2FkIjoidV8zNTk1MjUxODMiLCJ1aV9sYW5ndWFnZSI6InJ1IiwiaXNfaGF2ZV9jdXN0b21fc3R5bGUiOnRydWV9&s=354ad2c993d95d5ac629e3133d6cefea&vh-static-feature=zigzag',
@@ -20,16 +20,6 @@ class GetCourseRuPlayerIE(InfoExtractor):
             'duration': 1693,
         },
         'skip': 'JWT expired',
-    }, {
-        'url': 'https://cf-api-2.vhcdn.com/sign-player/?json=example',
-        'info_dict': {
-            'id': '435735291',
-            'title': '8afd7c489952108e00f019590f3711f3',
-            'ext': 'mp4',
-            'thumbnail': 'https://preview-htz.vhcdn.com/preview/8afd7c489952108e00f019590f3711f3/preview.jpg?version=1682170973&host=vh-72',
-            'duration': 777,
-        },
-        'skip': 'JWT expired',
     }]
 
     def _real_extract(self, url):
@@ -178,7 +168,7 @@ class GetCourseRuIE(InfoExtractor):
 
         playlist_id = self._search_regex(
             r'window\.(?:lessonId|gcsObjectId)\s*=\s*(\d+)', webpage, 'playlist id', default=display_id)
-        title = self._og_search_title(webpage, default=None) or self._html_extract_title(webpage)
+        title = self._og_search_title(webpage) or self._html_extract_title(webpage)
 
         return self.playlist_from_matches(
             re.findall(GetCourseRuPlayerIE._EMBED_REGEX[0], webpage),

yt_dlp/extractor/gigya.py

@@ -0,0 +1,19 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    urlencode_postdata,
+)
+
+
+class GigyaBaseIE(InfoExtractor):
+    def _gigya_login(self, auth_data):
+        auth_info = self._download_json(
+            'https://accounts.eu1.gigya.com/accounts.login', None,
+            note='Logging in', errnote='Unable to log in',
+            data=urlencode_postdata(auth_data))
+
+        error_message = auth_info.get('errorDetails') or auth_info.get('errorMessage')
+        if error_message:
+            raise ExtractorError(
+                f'Unable to login: {error_message}', expected=True)
+        return auth_info

yt_dlp/extractor/globo.py

@@ -1,48 +1,32 @@
+import base64
+import hashlib
 import json
+import random
 import re
-import uuid
 
 from .common import InfoExtractor
+from ..networking import HEADRequest
 from ..utils import (
-    determine_ext,
+    ExtractorError,
-    filter_dict,
     float_or_none,
-    int_or_none,
     orderedSet,
     str_or_none,
     try_get,
-    url_or_none,
 )
-from ..utils.traversal import subs_list_to_dict, traverse_obj
 
 
 class GloboIE(InfoExtractor):
-    _VALID_URL = r'(?:globo:|https?://[^/?#]+?\.globo\.com/(?:[^/?#]+/))(?P<id>\d{7,})'
+    _VALID_URL = r'(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
     _NETRC_MACHINE = 'globo'
-    _VIDEO_VIEW = '''
-    query getVideoView($videoId: ID!) {
-        video(id: $videoId) {
-            duration
-            description
-            relatedEpisodeNumber
-            relatedSeasonNumber
-            headline
-            title {
-                originProgramId
-                headline
-            }
-        }
-    }
-    '''
     _TESTS = [{
-        'url': 'https://globoplay.globo.com/v/3607726/',
+        'url': 'http://g1.globo.com/carros/autoesporte/videos/t/exclusivos-do-g1/v/mercedes-benz-gla-passa-por-teste-de-colisao-na-europa/3607726/',
         'info_dict': {
             'id': '3607726',
             'ext': 'mp4',
             'title': 'Mercedes-Benz GLA passa por teste de colisão na Europa',
             'duration': 103.204,
-            'uploader': 'G1 ao vivo',
+            'uploader': 'G1',
-            'uploader_id': '4209',
+            'uploader_id': '2015',
         },
         'params': {
             'skip_download': True,
@@ -54,46 +38,39 @@ class GloboIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Acidentes de trânsito estão entre as maiores causas de queda de energia em SP',
             'duration': 137.973,
-            'uploader': 'Bom Dia Brasil',
+            'uploader': 'Rede Globo',
-            'uploader_id': '810',
+            'uploader_id': '196',
         },
         'params': {
             'skip_download': True,
         },
+    }, {
+        'url': 'http://canalbrasil.globo.com/programas/sangue-latino/videos/3928201.html',
+        'only_matching': True,
+    }, {
+        'url': 'http://globosatplay.globo.com/globonews/v/4472924/',
+        'only_matching': True,
+    }, {
+        'url': 'http://globotv.globo.com/t/programa/v/clipe-sexo-e-as-negas-adeus/3836166/',
+        'only_matching': True,
+    }, {
+        'url': 'http://globotv.globo.com/canal-brasil/sangue-latino/t/todos-os-videos/v/ator-e-diretor-argentino-ricado-darin-fala-sobre-utopias-e-suas-perdas/3928201/',
+        'only_matching': True,
+    }, {
+        'url': 'http://canaloff.globo.com/programas/desejar-profundo/videos/4518560.html',
+        'only_matching': True,
     }, {
         'url': 'globo:3607726',
         'only_matching': True,
-    },
+    }, {
-        {
+        'url': 'https://globoplay.globo.com/v/10248083/',
-        'url': 'globo:8013907',  # needs subscription to globoplay
         'info_dict': {
-            'id': '8013907',
+            'id': '10248083',
             'ext': 'mp4',
-            'title': 'Capítulo de 14/08/1989',
+            'title': 'Melhores momentos: Equador 1 x 1 Brasil pelas Eliminatórias da Copa do Mundo 2022',
-            'episode': 'Episode 1',
+            'duration': 530.964,
-            'episode_number': 1,
+            'uploader': 'SporTV',
-            'uploader': 'Tieta',
+            'uploader_id': '698',
-            'uploader_id': '11895',
-            'duration': 2858.389,
-            'subtitles': 'count:1',
-        },
-        'params': {
-            'skip_download': True,
-        },
-    },
-        {
-        'url': 'globo:12824146',
-        'info_dict': {
-            'id': '12824146',
-            'ext': 'mp4',
-            'title': 'Acordo de damas',
-            'episode': 'Episode 1',
-            'episode_number': 1,
-            'uploader': 'Rensga Hits!',
-            'uploader_id': '20481',
-            'duration': 1953.994,
-            'season': 'Season 2',
-            'season_number': 2,
         },
         'params': {
             'skip_download': True,
@@ -103,71 +80,98 @@ class GloboIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        info = self._download_json(
+        self._request_webpage(
-            'https://cloud-jarvis.globo.com/graphql', video_id,
+            HEADRequest('https://globo-ab.globo.com/v2/selected-alternatives?experiments=player-isolated-experiment-02&skipImpressions=true'),
-            query={
+            video_id, 'Getting cookies')
-                'operationName': 'getVideoView',
+
-                'variables': json.dumps({'videoId': video_id}),
+        video = self._download_json(
-                'query': self._VIDEO_VIEW,
+            f'http://api.globovideos.com/videos/{video_id}/playlist',
-            }, headers={
+            video_id)['videos'][0]
-                'content-type': 'application/json',
+        if not self.get_param('allow_unplayable_formats') and video.get('encrypted') is True:
-                'x-platform-id': 'web',
+            self.report_drm(video_id)
-                'x-device-id': 'desktop',
+
-                'x-client-version': '2024.12-5',
+        title = video['title']
-            })['data']['video']
 
         formats = []
-        video = self._download_json(
+        security = self._download_json(
-            'https://playback.video.globo.com/v4/video-session', video_id,
+            'https://playback.video.globo.com/v2/video-session', video_id, f'Downloading security hash for {video_id}',
-            f'Downloading resource info for {video_id}',
+            headers={'content-type': 'application/json'}, data=json.dumps({
-            headers={'Content-Type': 'application/json'},
+                'player_type': 'desktop',
-            data=json.dumps(filter_dict({
-                'player_type': 'mirakulo_8k_hdr',
                 'video_id': video_id,
                 'quality': 'max',
                 'content_protection': 'widevine',
-                'vsid': f'{uuid.uuid4()}',
+                'vsid': '581b986b-4c40-71f0-5a58-803e579d5fa2',
-                'consumption': 'streaming',
+                'tz': '-3.0:00',
-                'capabilities': {'low_latency': True},
+            }).encode())
-                'tz': '-03:00',
-                'Authorization': try_get(self._get_cookies('https://globo.com'),
-                                         lambda x: f'Bearer {x["GLBID"].value}'),
-                'version': 1,
-            })).encode())
 
-        if traverse_obj(video, ('resource', 'drm_protection_enabled', {bool})):
+        self._request_webpage(HEADRequest(security['sources'][0]['url_template']), video_id, 'Getting locksession cookie')
-            self.report_drm(video_id)
 
-        main_source = video['sources'][0]
+        security_hash = security['sources'][0]['token']
+        if not security_hash:
+            message = security.get('message')
+            if message:
+                raise ExtractorError(
+                    f'{self.IE_NAME} returned error: {message}', expected=True)
 
-        # 4k streams are exclusively outputted in dash, so we need to filter these out
+        hash_code = security_hash[:2]
-        if determine_ext(main_source['url']) == 'mpd':
+        padding = '%010d' % random.randint(1, 10000000000)
-            formats, subtitles = self._extract_mpd_formats_and_subtitles(main_source['url'], video_id, mpd_id='dash')
+        if hash_code in ('04', '14'):
-        else:
+            received_time = security_hash[3:13]
-            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            received_md5 = security_hash[24:]
-                main_source['url'], video_id, 'mp4', m3u8_id='hls')
+            hash_prefix = security_hash[:23]
+        elif hash_code in ('02', '12', '03', '13'):
+            received_time = security_hash[2:12]
+            received_md5 = security_hash[22:]
+            padding += '1'
+            hash_prefix = '05' + security_hash[:22]
 
-        self._merge_subtitles(traverse_obj(main_source, ('text', ..., ('caption', 'subtitle'), {
+        padded_sign_time = str(int(received_time) + 86400) + padding
-            'url': ('srt', 'url', {url_or_none}),
+        md5_data = (received_md5 + padded_sign_time + '0xAC10FD').encode()
-        }, all, {subs_list_to_dict(lang='pt-BR')})), target=subtitles)
+        signed_md5 = base64.urlsafe_b64encode(hashlib.md5(md5_data).digest()).decode().strip('=')
+        signed_hash = hash_prefix + padded_sign_time + signed_md5
+        source = security['sources'][0]['url_parts']
+        resource_url = source['scheme'] + '://' + source['domain'] + source['path']
+        signed_url = '{}?h={}&k=html5&a={}'.format(resource_url, signed_hash, 'F' if video.get('subscriber_only') else 'A')
+
+        fmts, subtitles = self._extract_m3u8_formats_and_subtitles(
+            signed_url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
+        formats.extend(fmts)
+
+        for resource in video['resources']:
+            if resource.get('type') == 'subtitle':
+                subtitles.setdefault(resource.get('language') or 'por', []).append({
+                    'url': resource.get('url'),
+                })
+        subs = try_get(security, lambda x: x['source']['subtitles'], expected_type=dict) or {}
+        for sub_lang, sub_url in subs.items():
+            if sub_url:
+                subtitles.setdefault(sub_lang or 'por', []).append({
+                    'url': sub_url,
+                })
+        subs = try_get(security, lambda x: x['source']['subtitles_webvtt'], expected_type=dict) or {}
+        for sub_lang, sub_url in subs.items():
+            if sub_url:
+                subtitles.setdefault(sub_lang or 'por', []).append({
+                    'url': sub_url,
+                })
+
+        duration = float_or_none(video.get('duration'), 1000)
+        uploader = video.get('channel')
+        uploader_id = str_or_none(video.get('channel_id'))
 
         return {
             'id': video_id,
-            **traverse_obj(info, {
+            'title': title,
-                'title': ('headline', {str}),
+            'duration': duration,
-                'duration': ('duration', {float_or_none(scale=1000)}),
+            'uploader': uploader,
-                'uploader': ('title', 'headline', {str}),
+            'uploader_id': uploader_id,
-                'uploader_id': ('title', 'originProgramId', {str_or_none}),
-                'episode_number': ('relatedEpisodeNumber', {int_or_none}),
-                'season_number': ('relatedSeasonNumber', {int_or_none}),
-            }),
             'formats': formats,
             'subtitles': subtitles,
         }
 
 
 class GloboArticleIE(InfoExtractor):
-    _VALID_URL = r'https?://(?!globoplay).+?\.globo\.com/(?:[^/?#]+/)*(?P<id>[^/?#.]+)(?:\.html)?'
+    _VALID_URL = r'https?://.+?\.globo\.com/(?:[^/]+/)*(?P<id>[^/.]+)(?:\.html)?'
 
     _VIDEOID_REGEXES = [
         r'\bdata-video-id=["\'](\d{7,})["\']',