Release 2025.09.23

Created by: bashonly

:ci skip all

.github/ISSUE_TEMPLATE/1_broken_site.yml

@@ -24,6 +24,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
     id: region

.github/ISSUE_TEMPLATE/2_site_support_request.yml

@@ -24,6 +24,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input
     id: region

.github/ISSUE_TEMPLATE/3_site_feature_request.yml

@@ -22,6 +22,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
     id: region

.github/ISSUE_TEMPLATE/4_bug_report.yml

@@ -20,6 +20,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/5_feature_request.yml

@@ -22,6 +22,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/6_question.yml

@@ -28,6 +28,8 @@ body:
           required: true
         - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%3Aissue%20-label%3Aspam%20%20) for similar questions **including closed ones**. DO NOT post duplicates
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
   - type: textarea
     id: question
     attributes:

.github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml

@@ -20,6 +20,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
     id: region

.github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml

@@ -20,6 +20,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and am willing to share it if required
   - type: input
     id: region

.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml

@@ -18,6 +18,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
         - label: I've read about [sharing account credentials](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#are-you-willing-to-share-account-details-if-needed) and I'm willing to share it if required
   - type: input
     id: region

.github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml

@@ -16,6 +16,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml

@@ -18,6 +18,8 @@ body:
           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
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE_tmpl/6_question.yml

@@ -24,6 +24,8 @@ body:
           required: true
         - label: I've searched [known issues](https://github.com/yt-dlp/yt-dlp/issues/3766), [the FAQ](https://github.com/yt-dlp/yt-dlp/wiki/FAQ), and the [bugtracker](https://github.com/yt-dlp/yt-dlp/issues?q=is%%3Aissue%%20-label%%3Aspam%%20%%20) for similar questions **including closed ones**. DO NOT post duplicates
           required: true
+        - label: I've read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
+          required: true
   - type: textarea
     id: question
     attributes:

.github/PULL_REQUEST_TEMPLATE.md

@@ -33,6 +33,7 @@ Fixes #
 ### In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check those that apply and remove the others:
 - [ ] I am the original author of the code in this PR, and I am willing to release it under [Unlicense](http://unlicense.org/)
 - [ ] I am not the original author of the code in this PR, but it is in the public domain or released under [Unlicense](http://unlicense.org/) (provide reliable evidence)
+- [ ] I have read the [policy against AI/LLM contributions](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#automated-contributions-ai--llm-policy) and understand I may be blocked from the repository if it is violated
 
 ### What is the purpose of your *pull request*? Check those that apply and remove the others:
 - [ ] Fix or improvement to an extractor (Make sure to add/update tests)

.github/actionlint.yml

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

.github/workflows/build.yml

@@ -9,6 +9,9 @@ on:
         required: false
         default: stable
         type: string
+      origin:
+        required: true
+        type: string
       unix:
         default: true
         type: boolean
@@ -27,10 +30,6 @@ on:
       windows:
         default: true
         type: boolean
-      origin:
-        required: false
-        default: ''
-        type: string
     secrets:
       GPG_SIGNING_KEY:
         required: false
@@ -74,13 +73,6 @@ on:
         description: yt-dlp.exe, yt-dlp_win.zip, yt-dlp_x86.exe, yt-dlp_win_x86.zip, yt-dlp_arm64.exe, yt-dlp_win_arm64.zip
         default: true
         type: boolean
-      origin:
-        description: Origin
-        required: false
-        default: 'current repo'
-        type: choice
-        options:
-        - 'current repo'
 
 permissions:
   contents: read
@@ -89,25 +81,26 @@ jobs:
   process:
     runs-on: ubuntu-latest
     outputs:
-      origin: ${{ steps.process_origin.outputs.origin }}
-      timestamp: ${{ steps.process_origin.outputs.timestamp }}
-      version: ${{ steps.process_origin.outputs.version }}
+      origin: ${{ steps.process_inputs.outputs.origin }}
+      timestamp: ${{ steps.process_inputs.outputs.timestamp }}
+      version: ${{ steps.process_inputs.outputs.version }}
+      linux_matrix: ${{ steps.linux_matrix.outputs.matrix }}
+
     steps:
-      - name: Process origin
-        id: process_origin
+      - name: Process inputs
+        id: process_inputs
         env:
-          ORIGIN: ${{ inputs.origin }}
+          INPUTS: ${{ toJSON(inputs) }}
           REPOSITORY: ${{ github.repository }}
-          VERSION: ${{ inputs.version }}
         shell: python
         run: |
           import datetime as dt
           import json
           import os
           import re
-          origin = os.environ['ORIGIN']
+          INPUTS = json.loads(os.environ['INPUTS'])
           timestamp = dt.datetime.now(tz=dt.timezone.utc).strftime('%Y.%m.%d.%H%M%S.%f')
-          version = os.getenv('VERSION')
+          version = INPUTS.get('version')
           if version and '.' not in version:
               # build.yml was dispatched with only a revision as the version input value
               version_parts = [*timestamp.split('.')[:3], version]
@@ -119,7 +112,7 @@ jobs:
               version_parts = version.split('.')
           assert all(re.fullmatch(r'[0-9]+', part) for part in version_parts), 'Version must be numeric'
           outputs = {
-              'origin': os.environ['REPOSITORY'] if origin == 'current repo' else origin,
+              'origin': INPUTS.get('origin') or os.environ['REPOSITORY'],
               'timestamp': timestamp,
               'version': '.'.join(version_parts),
           }
@@ -127,6 +120,69 @@ jobs:
           with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
               f.write('\n'.join(f'{key}={value}' for key, value in outputs.items()))
 
+      - name: Build Linux matrix
+        id: linux_matrix
+        env:
+          INPUTS: ${{ toJSON(inputs) }}
+          PYTHON_VERSION: '3.13'
+          UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
+        shell: python
+        run: |
+          import json
+          import os
+          EXE_MAP = {
+              'linux': [{
+                  'os': 'linux',
+                  'arch': 'x86_64',
+                  'runner': 'ubuntu-24.04',
+              }, {
+                  'os': 'linux',
+                  'arch': 'aarch64',
+                  'runner': 'ubuntu-24.04-arm',
+              }],
+              'linux_armv7l': [{
+                  'os': 'linux',
+                  'arch': 'armv7l',
+                  'runner': 'ubuntu-24.04-arm',
+                  'qemu_platform': 'linux/arm/v7',
+                  'onefile': False,
+                  'cache_requirements': True,
+                  'update_to': 'yt-dlp/yt-dlp@2023.03.04',
+              }],
+              'musllinux': [{
+                  'os': 'musllinux',
+                  'arch': 'x86_64',
+                  'runner': 'ubuntu-24.04',
+              }, {
+                  'os': 'musllinux',
+                  'arch': 'aarch64',
+                  'runner': 'ubuntu-24.04-arm',
+              }],
+          }
+          INPUTS = json.loads(os.environ['INPUTS'])
+          matrix = [exe for key, group in EXE_MAP.items() for exe in group if INPUTS.get(key)]
+          if not matrix:
+              # If we send an empty matrix when no linux inputs are given, the entire workflow fails
+              matrix = [EXE_MAP['linux'][0]]
+          for exe in matrix:
+              exe['exe'] = '_'.join(filter(None, (
+                  'yt-dlp',
+                  exe['os'],
+                  exe['arch'] != 'x86_64' and exe['arch'],
+              )))
+              exe.setdefault('qemu_platform', None)
+              exe.setdefault('onefile', True)
+              exe.setdefault('onedir', True)
+              exe.setdefault('cache_requirements', False)
+              exe.setdefault('python_version', os.environ['PYTHON_VERSION'])
+              exe.setdefault('update_to', os.environ['UPDATE_TO'])
+          if not any(INPUTS.get(key) for key in EXE_MAP):
+              print('skipping linux job')
+          else:
+              print(json.dumps(matrix, indent=2))
+          with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
+              f.write(f'matrix={json.dumps(matrix)}')
+
   unix:
     needs: process
     if: inputs.unix
@@ -135,33 +191,41 @@ jobs:
       CHANNEL: ${{ inputs.channel }}
       ORIGIN: ${{ needs.process.outputs.origin }}
       VERSION: ${{ needs.process.outputs.version }}
+      UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
+
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Needed for changelog
-      - uses: actions/setup-python@v5
+
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
+
       - name: Install Requirements
         run: |
           sudo apt -y install zip pandoc man sed
+
       - name: Prepare
         run: |
           python devscripts/update-version.py -c "${CHANNEL}" -r "${ORIGIN}" "${VERSION}"
           python devscripts/update_changelog.py -vv
           python devscripts/make_lazy_extractors.py
+
       - name: Build Unix platform-independent binary
         run: |
           make all tar
+
       - name: Verify --update-to
         if: vars.UPDATE_TO_VERIFICATION
         run: |
           chmod +x ./yt-dlp
           cp ./yt-dlp ./yt-dlp_downgraded
           version="$(./yt-dlp --version)"
-          ./yt-dlp_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
+          ./yt-dlp_downgraded -v --update-to "${UPDATE_TO}"
           downgraded_version="$(./yt-dlp_downgraded --version)"
           [[ "${version}" != "${downgraded_version}" ]]
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -172,153 +236,71 @@ jobs:
           compression-level: 0
 
   linux:
+    name: ${{ matrix.os }} (${{ matrix.arch }})
+    if: inputs.linux || inputs.linux_armv7l || inputs.musllinux
     needs: process
-    if: inputs.linux
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-        - exe: yt-dlp_linux
-          platform: x86_64
-          runner: ubuntu-24.04
-        - exe: yt-dlp_linux_aarch64
-          platform: aarch64
-          runner: ubuntu-24.04-arm
+        include: ${{ fromJSON(needs.process.outputs.linux_matrix) }}
     env:
       CHANNEL: ${{ inputs.channel }}
       ORIGIN: ${{ needs.process.outputs.origin }}
       VERSION: ${{ needs.process.outputs.version }}
       EXE_NAME: ${{ matrix.exe }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build executable
-        env:
-          SERVICE: linux_${{ matrix.platform }}
-        run: |
-          mkdir -p ./dist
-          pushd bundle/docker
-          docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
-          popd
-          sudo chown "${USER}:docker" "./dist/${EXE_NAME}"
-      - name: Verify executable in container
-        if: vars.UPDATE_TO_VERIFICATION
-        env:
-          SERVICE: linux_${{ matrix.platform }}_verify
-        run: |
-          cd bundle/docker
-          docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
-      - name: Verify --update-to
-        if: vars.UPDATE_TO_VERIFICATION
-        run: |
-          chmod +x "./dist/${EXE_NAME}"
-          mkdir -p ~/testing
-          cp "./dist/${EXE_NAME}" ~/testing/"${EXE_NAME}_downgraded"
-          version="$("./dist/${EXE_NAME}" --version)"
-          ~/testing/"${EXE_NAME}_downgraded" -v --update-to yt-dlp/yt-dlp@2023.03.04
-          downgraded_version="$(~/testing/"${EXE_NAME}_downgraded" --version)"
-          [[ "${version}" != "${downgraded_version}" ]]
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ github.job }}_${{ matrix.platform }}
-          path: |
-            dist/${{ matrix.exe }}*
-          compression-level: 0
+      PYTHON_VERSION: ${{ matrix.python_version }}
+      UPDATE_TO: ${{ (vars.UPDATE_TO_VERIFICATION && matrix.update_to) || '' }}
+      SKIP_ONEDIR_BUILD: ${{ (!matrix.onedir && '1') || '' }}
+      SKIP_ONEFILE_BUILD: ${{ (!matrix.onefile && '1') || '' }}
 
-  linux_armv7l:
-    needs: process
-    if: inputs.linux_armv7l
-    permissions:
-      contents: read
-    runs-on: ubuntu-24.04-arm
-    env:
-      CHANNEL: ${{ inputs.channel }}
-      ORIGIN: ${{ needs.process.outputs.origin }}
-      VERSION: ${{ needs.process.outputs.version }}
-      EXE_NAME: yt-dlp_linux_armv7l
     steps:
       - uses: actions/checkout@v4
+
       - name: Cache requirements
+        if: matrix.cache_requirements
         id: cache-venv
         uses: actions/cache@v4
         env:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
         with:
           path: |
-            ~/yt-dlp-build-venv
-          key: cache-reqs-${{ github.job }}-${{ github.ref }}-${{ needs.process.outputs.timestamp }}
+            venv
+          key: cache-reqs-${{ matrix.os }}_${{ matrix.arch }}-${{ github.ref }}-${{ needs.process.outputs.timestamp }}
           restore-keys: |
-            cache-reqs-${{ github.job }}-${{ github.ref }}-
-            cache-reqs-${{ github.job }}-
+            cache-reqs-${{ matrix.os }}_${{ matrix.arch }}-${{ github.ref }}-
+            cache-reqs-${{ matrix.os }}_${{ matrix.arch }}-
+
       - name: Set up QEMU
+        if: matrix.qemu_platform
         uses: docker/setup-qemu-action@v3
         with:
-          platforms: linux/arm/v7
-      - name: Build executable
-        env:
-          SERVICE: linux_armv7l
-        run: |
-          mkdir -p ./dist
-          mkdir -p ~/yt-dlp-build-venv
-          cd bundle/docker
-          docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
-      - name: Verify executable in container
-        if: vars.UPDATE_TO_VERIFICATION
-        env:
-          SERVICE: linux_armv7l_verify
-        run: |
-          cd bundle/docker
-          docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-bin-${{ github.job }}
-          path: |
-            dist/yt-dlp_linux_armv7l.zip
-          compression-level: 0
+          platforms: ${{ matrix.qemu_platform }}
 
-  musllinux:
-    needs: process
-    if: inputs.musllinux
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - exe: yt-dlp_musllinux
-          platform: x86_64
-          runner: ubuntu-24.04
-        - exe: yt-dlp_musllinux_aarch64
-          platform: aarch64
-          runner: ubuntu-24.04-arm
-    env:
-      CHANNEL: ${{ inputs.channel }}
-      ORIGIN: ${{ needs.process.outputs.origin }}
-      VERSION: ${{ needs.process.outputs.version }}
-      EXE_NAME: ${{ matrix.exe }}
-    steps:
-      - uses: actions/checkout@v4
       - name: Build executable
         env:
-          SERVICE: musllinux_${{ matrix.platform }}
+          SERVICE: ${{ matrix.os }}_${{ matrix.arch }}
         run: |
+          mkdir -p ./venv
           mkdir -p ./dist
           pushd bundle/docker
           docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
           popd
-          sudo chown "${USER}:docker" "./dist/${EXE_NAME}"
+          if [[ -z "${SKIP_ONEFILE_BUILD}" ]]; then
+            sudo chown "${USER}:docker" "./dist/${EXE_NAME}"
+          fi
+
       - name: Verify executable in container
-        if: vars.UPDATE_TO_VERIFICATION
         env:
-          SERVICE: musllinux_${{ matrix.platform }}_verify
+          SERVICE: ${{ matrix.os }}_${{ matrix.arch }}_verify
         run: |
           cd bundle/docker
           docker compose up --build --exit-code-from "${SERVICE}" "${SERVICE}"
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build-bin-${{ github.job }}_${{ matrix.platform }}
+          name: build-bin-${{ matrix.os }}_${{ matrix.arch }}
           path: |
             dist/${{ matrix.exe }}*
           compression-level: 0
@@ -333,6 +315,7 @@ jobs:
       CHANNEL: ${{ inputs.channel }}
       ORIGIN: ${{ needs.process.outputs.origin }}
       VERSION: ${{ needs.process.outputs.version }}
+      UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
 
     steps:
       - uses: actions/checkout@v4
@@ -409,7 +392,7 @@ jobs:
           chmod +x ./dist/yt-dlp_macos
           cp ./dist/yt-dlp_macos ./dist/yt-dlp_macos_downgraded
           version="$(./dist/yt-dlp_macos --version)"
-          ./dist/yt-dlp_macos_downgraded -v --update-to yt-dlp/yt-dlp@2023.03.04
+          ./dist/yt-dlp_macos_downgraded -v --update-to "${UPDATE_TO}"
           downgraded_version="$(./dist/yt-dlp_macos_downgraded --version)"
           [[ "$version" != "$downgraded_version" ]]
 
@@ -423,6 +406,7 @@ jobs:
           compression-level: 0
 
   windows:
+    name: windows (${{ matrix.arch }})
     needs: process
     if: inputs.windows
     permissions:
@@ -435,27 +419,37 @@ jobs:
         - arch: 'x64'
           runner: windows-2025
           python_version: '3.10'
-          suffix: ''
+          platform_tag: win_amd64
+          pyi_version: '6.16.0'
+          pyi_tag: '2025.09.13.221251'
+          pyi_hash: b6496c7630c3afe66900cfa824e8234a8c2e2c81704bd7facd79586abc76c0e5
         - arch: 'x86'
           runner: windows-2025
           python_version: '3.10'
-          suffix: '_x86'
+          platform_tag: win32
+          pyi_version: '6.16.0'
+          pyi_tag: '2025.09.13.221251'
+          pyi_hash: 2d881843580efdc54f3523507fc6d9c5b6051ee49c743a6d9b7003ac5758c226
         - arch: 'arm64'
           runner: windows-11-arm
           python_version: '3.13'  # arm64 only has Python >= 3.11 available
-          suffix: '_arm64'
+          platform_tag: win_arm64
+          pyi_version: '6.16.0'
+          pyi_tag: '2025.09.13.221251'
+          pyi_hash: 4250c9085e34a95c898f3ee2f764914fc36ec59f0d97c28e6a75fcf21f7b144f
     env:
       CHANNEL: ${{ inputs.channel }}
       ORIGIN: ${{ needs.process.outputs.origin }}
       VERSION: ${{ needs.process.outputs.version }}
-      SUFFIX: ${{ matrix.suffix }}
+      SUFFIX: ${{ (matrix.arch != 'x64' && format('_{0}', matrix.arch)) || '' }}
+      UPDATE_TO: yt-dlp/yt-dlp@2025.09.05
       BASE_CACHE_KEY: cache-reqs-${{ github.job }}_${{ matrix.arch }}-${{ matrix.python_version }}
-      # Use custom PyInstaller built with https://github.com/yt-dlp/Pyinstaller-builds
-      PYINSTALLER_URL: https://yt-dlp.github.io/Pyinstaller-Builds/${{ matrix.arch }}/pyinstaller-6.15.0-py3-none-any.whl
+      PYI_REPO: https://github.com/yt-dlp/Pyinstaller-Builds
+      PYI_WHEEL: pyinstaller-${{ matrix.pyi_version }}-py3-none-${{ matrix.platform_tag }}.whl
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python_version }}
           architecture: ${{ matrix.arch }}
@@ -477,17 +471,23 @@ jobs:
       - name: Install Requirements
         env:
           ARCH: ${{ matrix.arch }}
+          PYI_URL: ${{ env.PYI_REPO }}/releases/download/${{ matrix.pyi_tag }}/${{ env.PYI_WHEEL }}
+          PYI_HASH: ${{ matrix.pyi_hash }}
         shell: pwsh
         run: |
           python -m venv /yt-dlp-build-venv
           /yt-dlp-build-venv/Scripts/Activate.ps1
+          python -m pip install -U pip
+          # Install custom PyInstaller build and verify hash
+          mkdir /pyi-wheels
+          python -m pip download -d /pyi-wheels --no-deps --require-hashes "pyinstaller@${Env:PYI_URL}#sha256=${Env:PYI_HASH}"
+          python -m pip install --force-reinstall -U "/pyi-wheels/${Env:PYI_WHEEL}"
           python devscripts/install_deps.py -o --include build
           if ("${Env:ARCH}" -eq "x86") {
             python devscripts/install_deps.py
           } else {
             python devscripts/install_deps.py --include curl-cffi
           }
-          python -m pip install -U "${Env:PYINSTALLER_URL}"
 
       - name: Prepare
         shell: pwsh
@@ -510,7 +510,7 @@ jobs:
           $name = "yt-dlp${Env:SUFFIX}"
           Copy-Item "./dist/${name}.exe" "./dist/${name}_downgraded.exe"
           $version = & "./dist/${name}.exe" --version
-          & "./dist/${name}_downgraded.exe" -v --update-to yt-dlp/yt-dlp@2025.08.20
+          & "./dist/${name}_downgraded.exe" -v --update-to "${Env:UPDATE_TO}"
           $downgraded_version = & "./dist/${name}_downgraded.exe" --version
           if ($version -eq $downgraded_version) {
             exit 1
@@ -521,8 +521,8 @@ jobs:
         with:
           name: build-bin-${{ github.job }}-${{ matrix.arch }}
           path: |
-            dist/yt-dlp${{ matrix.suffix }}.exe
-            dist/yt-dlp_win${{ matrix.suffix }}.zip
+            dist/yt-dlp${{ env.SUFFIX }}.exe
+            dist/yt-dlp_win${{ env.SUFFIX }}.zip
           compression-level: 0
 
   meta_files:
@@ -531,8 +531,6 @@ jobs:
       - process
       - unix
       - linux
-      - linux_armv7l
-      - musllinux
       - macos
       - windows
     runs-on: ubuntu-latest

.github/workflows/cache-warmer.yml

@@ -12,6 +12,7 @@ jobs:
     with:
       version: '999999'
       channel: stable
+      origin: ${{ github.repository }}
       unix: false
       linux: false
       linux_armv7l: true

.github/workflows/core.yml

@@ -37,23 +37,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         # CPython 3.9 is in quick-test
-        python-version: ['3.10', '3.11', '3.12', '3.13', pypy-3.11]
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14-dev', pypy-3.11]
         include:
         # atleast one of each CPython/PyPy tests must be in windows
         - os: windows-latest
           python-version: '3.9'
         - os: windows-latest
           python-version: '3.10'
+        - os: windows-latest
+          python-version: '3.11'
         - os: windows-latest
           python-version: '3.12'
         - os: windows-latest
           python-version: '3.13'
+        - os: windows-latest
+          python-version: '3.14-dev'
         - os: windows-latest
           python-version: pypy-3.11
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install test requirements

.github/workflows/download.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install test requirements
@@ -28,7 +28,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.10', '3.11', '3.12', '3.13', pypy-3.11]
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14-dev', pypy-3.11]
         include:
         # atleast one of each CPython/PyPy tests must be in windows
         - os: windows-latest
@@ -38,7 +38,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install test requirements

.github/workflows/quick-test.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.9'
     - name: Install test requirements
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.9'
     - name: Install dev dependencies

.github/workflows/release.yml

@@ -79,9 +79,9 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.10"  # Keep this in sync with test-workflows.yml
 
       - name: Process inputs
         id: process_inputs
@@ -173,7 +173,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
 
@@ -241,7 +241,7 @@ jobs:
           path: artifact
           pattern: build-*
           merge-multiple: true
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.10"
 
@@ -269,12 +269,11 @@ jobs:
               "[![Master](https://img.shields.io/badge/Master%20builds-lightblue.svg?style=for-the-badge)]" \
                 "(https://github.com/${MASTER_REPO}/releases/latest \"Master builds\")" >> ./RELEASE_NOTES
           fi
-          printf '\n\n' >> ./RELEASE_NOTES
-          cat >> ./RELEASE_NOTES << EOF
-          #### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)
-          ---
-          $(python ./devscripts/make_changelog.py -vv --collapsible)
-          EOF
+          printf '\n\n%s\n\n%s%s\n\n---\n' \
+            "#### A description of the various files is in the [README](https://github.com/${REPOSITORY}#release-files)" \
+            "The PyInstaller-bundled executables are subject to the licenses described in " \
+            "[THIRD_PARTY_LICENSES.txt](https://github.com/${BASE_REPO}/blob/${HEAD_SHA}/THIRD_PARTY_LICENSES.txt)" >> ./RELEASE_NOTES
+          python ./devscripts/make_changelog.py -vv --collapsible >> ./RELEASE_NOTES
           printf '%s\n\n' '**This is a pre-release build**' >> ./PRERELEASE_NOTES
           cat ./RELEASE_NOTES >> ./PRERELEASE_NOTES
           printf '%s\n\n' "Generated from: https://github.com/${REPOSITORY}/commit/${HEAD_SHA}" >> ./ARCHIVE_NOTES

.github/workflows/signature-tests.yml

@@ -25,11 +25,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', pypy-3.11]
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14-dev', pypy-3.11]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install test requirements

.github/workflows/test-workflows.yml

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

CONTRIBUTING.md

@@ -12,6 +12,7 @@
     - [Is your question about yt-dlp?](#is-your-question-about-yt-dlp)
     - [Are you willing to share account details if needed?](#are-you-willing-to-share-account-details-if-needed)
     - [Is the website primarily used for piracy](#is-the-website-primarily-used-for-piracy)
+- [AUTOMATED CONTRIBUTIONS (AI / LLM) POLICY](#automated-contributions-ai--llm-policy)
 - [DEVELOPER INSTRUCTIONS](#developer-instructions)
     - [Adding new feature or making overarching changes](#adding-new-feature-or-making-overarching-changes)
     - [Adding support for a new site](#adding-support-for-a-new-site)
@@ -134,6 +135,17 @@ While these steps won't necessarily ensure that no misuse of the account takes p
 We follow [youtube-dl's policy](https://github.com/ytdl-org/youtube-dl#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free) to not support services that is primarily used for infringing copyright. Additionally, it has been decided to not to support porn sites that specialize in fakes. We also cannot support any service that serves only [DRM protected content](https://en.wikipedia.org/wiki/Digital_rights_management).
 
 
+# AUTOMATED CONTRIBUTIONS (AI / LLM) POLICY
+
+Please refrain from submitting issues or pull requests that have been generated by an LLM or other fully-automated tools. Any submission that is in violation of this policy will be closed, and the submitter may be blocked from this repository without warning.
+
+If you submit an issue, you need to understand what your issue description is saying. You need to be able to answer questions about your bug report or feature request. Using an AI tool to *proofread* your issue/comment text is acceptable. Using an AI tool to *write* your issue/comment text is unacceptable.
+
+If you submit a pull request, you need to understand what every line of code you've changed does. If you can't explain why your PR is doing something, then do not submit it. Using an AI tool to generate entire lines of code is unacceptable.
+
+The rationale behind this policy is that automated contributions are a waste of the maintainers' time. Humans spend their time and brainpower reviewing every submission. Issues or pull requests generated by automation tools create an imbalance of effort between the submitter and the reviewer. Nobody learns anything when a maintainer reviews code written by an LLM.
+
+Additionally, AI-generated code conflicts with this project's license (Unlicense), since you cannot truly release code into the public domain if you didn't author it yourself.
 
 
 # DEVELOPER INSTRUCTIONS
@@ -768,12 +780,10 @@ view_count = int_or_none(video.get('views'))
 ```
 
 
-# My pull request is labeled pending-fixes
+## My pull request is labeled pending-fixes
 
 The `pending-fixes` label is added when there are changes requested to a PR. When the necessary changes are made, the label should be removed. However, despite our best efforts, it may sometimes happen that the maintainer did not see the changes or forgot to remove the label. If your PR is still marked as `pending-fixes` a few days after all requested changes have been made, feel free to ping the maintainer who labeled your issue and ask them to re-review and remove the label.
 
 
-
-
 # EMBEDDING YT-DLP
 See [README.md#embedding-yt-dlp](README.md#embedding-yt-dlp) for instructions on how to embed yt-dlp in another Python program

CONTRIBUTORS

@@ -808,3 +808,6 @@ Randalix
 runarmod
 gitchasing
 zakaryan2004
+cdce8p
+nicolaasjan
+willsmillie

Changelog.md

@@ -4,6 +4,63 @@
 # To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
 -->
 
+### 2025.09.23
+
+#### Important changes
+- **Several options have been deprecated**
+In order to simplify the codebase and reduce maintenance burden, various options have been deprecated. Please remove them from your commands/configurations. [Read more](https://github.com/yt-dlp/yt-dlp/issues/14198)
+
+#### Core changes
+- **compat**: [Add `compat_datetime_from_timestamp`](https://github.com/yt-dlp/yt-dlp/commit/6a763a55d8a93b2a964ecf7699248ad342485412) ([#11902](https://github.com/yt-dlp/yt-dlp/issues/11902)) by [pzhlkj6612](https://github.com/pzhlkj6612), [seproDev](https://github.com/seproDev)
+- **utils**
+    - `mimetype2ext`: [Recognize `vnd.dlna.mpeg-tts`](https://github.com/yt-dlp/yt-dlp/commit/98b6b0d339130e955f9d45ce67c0357c633c1627) ([#14388](https://github.com/yt-dlp/yt-dlp/issues/14388)) by [seproDev](https://github.com/seproDev)
+    - `random_user_agent`: [Bump versions](https://github.com/yt-dlp/yt-dlp/commit/f3829463c728a5b5e62b3fc157e71c99b26edac7) ([#14317](https://github.com/yt-dlp/yt-dlp/issues/14317)) by [seproDev](https://github.com/seproDev)
+
+#### Extractor changes
+- **10play**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/067062bb87ac057e453ce9efdac7ca117a6a7da0) ([#14242](https://github.com/yt-dlp/yt-dlp/issues/14242)) by [Sipherdrakon](https://github.com/Sipherdrakon)
+- **applepodcast**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/b2c01d0498653e0239c7226c5a7fcb614dd4dbc8) ([#14372](https://github.com/yt-dlp/yt-dlp/issues/14372)) by [seproDev](https://github.com/seproDev)
+- **loco**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f5cb721185e8725cf4eb4080e86aa9aa73ef25b3) ([#14256](https://github.com/yt-dlp/yt-dlp/issues/14256)) by [seproDev](https://github.com/seproDev)
+- **mitele**: [Remove extractor](https://github.com/yt-dlp/yt-dlp/commit/820c6e244571557fcfc127d4b3680e2d07c04dca) ([#14348](https://github.com/yt-dlp/yt-dlp/issues/14348)) by [bashonly](https://github.com/bashonly)
+- **newspicks**: [Warn when only preview is available](https://github.com/yt-dlp/yt-dlp/commit/9def9a4b0e958285e055eb350e5dd43b5c423336) ([#14197](https://github.com/yt-dlp/yt-dlp/issues/14197)) by [doe1080](https://github.com/doe1080)
+- **onsen**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/17bfaa53edf5c52fce73cf0cef4592f929c2462d) ([#10971](https://github.com/yt-dlp/yt-dlp/issues/10971)) by [doe1080](https://github.com/doe1080)
+- **pixivsketch**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/3d9a88bd8ef149d781c7e569e48e61551eda395e) ([#14196](https://github.com/yt-dlp/yt-dlp/issues/14196)) by [doe1080](https://github.com/doe1080)
+- **smotrim**: [Rework extractors](https://github.com/yt-dlp/yt-dlp/commit/8cb037c0b06c2815080f87d61ea2e95c412785fc) ([#14200](https://github.com/yt-dlp/yt-dlp/issues/14200)) by [doe1080](https://github.com/doe1080), [swayll](https://github.com/swayll)
+- **telecinco**: [Support browser impersonation](https://github.com/yt-dlp/yt-dlp/commit/e123a48f1155703d8709a4221a42bd45c0a2b3ce) ([#14351](https://github.com/yt-dlp/yt-dlp/issues/14351)) by [bashonly](https://github.com/bashonly)
+- **tiktok**: live: [Fix room ID extraction](https://github.com/yt-dlp/yt-dlp/commit/5c1abcdc49b9d23e1dcb77b95d063cf2bf93e352) ([#14287](https://github.com/yt-dlp/yt-dlp/issues/14287)) by [bashonly](https://github.com/bashonly)
+- **ttinglive**: [Adapt FlexTV extractor to new domain](https://github.com/yt-dlp/yt-dlp/commit/4bc19adc8798e7564513898cf34adc432c6c5709) ([#14375](https://github.com/yt-dlp/yt-dlp/issues/14375)) by [seproDev](https://github.com/seproDev)
+- **tunein**: [Fix extractors](https://github.com/yt-dlp/yt-dlp/commit/7d9e48b22a780c2e8d2d2d68940d49fd2029ab70) ([#13981](https://github.com/yt-dlp/yt-dlp/issues/13981)) by [doe1080](https://github.com/doe1080)
+- **twitch**: clips: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/f8750504c2f71b54586fb857d60dce4e354a13ea) ([#14397](https://github.com/yt-dlp/yt-dlp/issues/14397)) by [seproDev](https://github.com/seproDev)
+- **vimeo**: [Fix login error handling](https://github.com/yt-dlp/yt-dlp/commit/679587dac7cd011a1472255e1f06efb017ba91b6) ([#14280](https://github.com/yt-dlp/yt-dlp/issues/14280)) by [bashonly](https://github.com/bashonly)
+- **vk**
+    - [Support vksport URLs](https://github.com/yt-dlp/yt-dlp/commit/b81e9272dce5844e8fba371cb4b4fd95ad3ed819) ([#14341](https://github.com/yt-dlp/yt-dlp/issues/14341)) by [seproDev](https://github.com/seproDev)
+    - uservideos: [Support alternate URL format](https://github.com/yt-dlp/yt-dlp/commit/bf5d18016b03a3f2fd5d3494d9efe85d3f8beeac) ([#14376](https://github.com/yt-dlp/yt-dlp/issues/14376)) by [seproDev](https://github.com/seproDev)
+- **xhamster**: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/a1c98226a4e869a34cc764a9dcf7a4558516308e) ([#14286](https://github.com/yt-dlp/yt-dlp/issues/14286)) by [nicolaasjan](https://github.com/nicolaasjan), [willsmillie](https://github.com/willsmillie) (With fixes in [677997d](https://github.com/yt-dlp/yt-dlp/commit/677997d84eaec0037397f7d935386daa3025b004) by [arand](https://github.com/arand), [thegymguy](https://github.com/thegymguy))
+- **youtube**: [Force player `0004de42`](https://github.com/yt-dlp/yt-dlp/commit/7f5d9f8543d19590eeec9473d54fa00151afa78a) ([#14398](https://github.com/yt-dlp/yt-dlp/issues/14398)) by [seproDev](https://github.com/seproDev)
+
+#### Misc. changes
+- **build**
+    - [Fix cache warmer](https://github.com/yt-dlp/yt-dlp/commit/8597a4331e8535a246d777bb8397bdcab251766c) ([#14261](https://github.com/yt-dlp/yt-dlp/issues/14261)) by [bashonly](https://github.com/bashonly)
+    - [Post-release workflow cleanup](https://github.com/yt-dlp/yt-dlp/commit/cd94e7004036e0149d7d3fa236c7dd44cf460788) ([#14250](https://github.com/yt-dlp/yt-dlp/issues/14250)) by [bashonly](https://github.com/bashonly)
+    - [Refactor Linux build jobs](https://github.com/yt-dlp/yt-dlp/commit/e2d37bcc8e84be9ce0f67fc24cb830c13963d10f) ([#14275](https://github.com/yt-dlp/yt-dlp/issues/14275)) by [bashonly](https://github.com/bashonly)
+    - [Use PyInstaller 6.16 for Windows](https://github.com/yt-dlp/yt-dlp/commit/df4b4e8ccf3385be6d2ad65465a0704c223dfdfb) ([#14318](https://github.com/yt-dlp/yt-dlp/issues/14318)) by [bashonly](https://github.com/bashonly)
+    - [Use SPDX license identifier](https://github.com/yt-dlp/yt-dlp/commit/48a214bef4bfd5984362d3d24b09dce50ba449ea) ([#14260](https://github.com/yt-dlp/yt-dlp/issues/14260)) by [cdce8p](https://github.com/cdce8p)
+    - [Use new PyInstaller builds for Windows](https://github.com/yt-dlp/yt-dlp/commit/c8ede5f34d6c95c442b936bb01ecbcb724aefdef) ([#14273](https://github.com/yt-dlp/yt-dlp/issues/14273)) by [bashonly](https://github.com/bashonly)
+- **ci**
+    - [Bump actions/setup-python to v6](https://github.com/yt-dlp/yt-dlp/commit/22ea0688ed6bcdbe4c51401a84239cda3decfc9c) ([#14282](https://github.com/yt-dlp/yt-dlp/issues/14282)) by [bashonly](https://github.com/bashonly)
+    - [Improve workflow checks](https://github.com/yt-dlp/yt-dlp/commit/ae3923b6b23bc62115be55510d6b5842f7a46b5f) ([#14316](https://github.com/yt-dlp/yt-dlp/issues/14316)) by [bashonly](https://github.com/bashonly)
+    - [Test and lint workflows](https://github.com/yt-dlp/yt-dlp/commit/7c9b10ebc83907d37f9f65ea9d4bd6f5e3bd1371) ([#14249](https://github.com/yt-dlp/yt-dlp/issues/14249)) by [bashonly](https://github.com/bashonly)
+    - [Test with Python 3.14](https://github.com/yt-dlp/yt-dlp/commit/83b8409366d0f9554eaeae56394b244dab64a2cb) ([#13468](https://github.com/yt-dlp/yt-dlp/issues/13468)) by [bashonly](https://github.com/bashonly)
+- **cleanup**
+    - [Bump ruff to 0.13.x](https://github.com/yt-dlp/yt-dlp/commit/ba8044685537e8e14adc6826fb4d730856fd2e2b) ([#14293](https://github.com/yt-dlp/yt-dlp/issues/14293)) by [bashonly](https://github.com/bashonly)
+    - [Deprecate various options](https://github.com/yt-dlp/yt-dlp/commit/08d78996831bd8e1e3c2592d740c3def00bbf548) ([#13821](https://github.com/yt-dlp/yt-dlp/issues/13821)) by [seproDev](https://github.com/seproDev)
+    - [Remove broken extractors](https://github.com/yt-dlp/yt-dlp/commit/65e90aea29cf3bfc9d1ae3e009fbf9a8db3a23c9) ([#14305](https://github.com/yt-dlp/yt-dlp/issues/14305)) by [bashonly](https://github.com/bashonly)
+    - [Remove setup.cfg](https://github.com/yt-dlp/yt-dlp/commit/eb4b3a5fc7765a6cd0370ca44ccee0d7d5111dd7) ([#14314](https://github.com/yt-dlp/yt-dlp/issues/14314)) by [seproDev](https://github.com/seproDev) (With fixes in [8ab262c](https://github.com/yt-dlp/yt-dlp/commit/8ab262c66bd3e1d8874fb2d070068ba1f0d48f16) by [bashonly](https://github.com/bashonly))
+    - Miscellaneous: [2e81e29](https://github.com/yt-dlp/yt-dlp/commit/2e81e298cdce23afadb06a95836284acb38f7018) by [bashonly](https://github.com/bashonly), [doe1080](https://github.com/doe1080), [seproDev](https://github.com/seproDev)
+- **docs**
+    - [Clarify license of PyInstaller-bundled executables](https://github.com/yt-dlp/yt-dlp/commit/e6e6b512141e66b1b36058966804fe59c02a2b4d) ([#14257](https://github.com/yt-dlp/yt-dlp/issues/14257)) by [seproDev](https://github.com/seproDev)
+    - [Establish AI/LLM contribution policy](https://github.com/yt-dlp/yt-dlp/commit/8821682f15af59047bc1f92724ef8a9ba30d6f7e) ([#14194](https://github.com/yt-dlp/yt-dlp/issues/14194)) by [bashonly](https://github.com/bashonly), [seproDev](https://github.com/seproDev)
+- **test**: utils: [Fix `sanitize_path` test for Windows CPython 3.11](https://github.com/yt-dlp/yt-dlp/commit/a183837ec8bb5e28fe6eb3a9d77ea2d0d7a106bd) ([#13878](https://github.com/yt-dlp/yt-dlp/issues/13878)) by [Grub4K](https://github.com/Grub4K)
+
 ### 2025.09.05
 
 #### Core changes

Makefile

@@ -10,7 +10,7 @@ tar: yt-dlp.tar.gz
 # intended use: when building a source distribution,
 # make pypi-files && python3 -m build -sn .
 pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \
-            completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/*
+            completions yt-dlp.1 pyproject.toml devscripts/* test/*
 
 .PHONY: all clean clean-all clean-test clean-dist clean-cache \
         completions completion-bash completion-fish completion-zsh \
@@ -159,7 +159,7 @@ yt-dlp.tar.gz: all
 		README.md supportedsites.md Changelog.md LICENSE \
 		CONTRIBUTING.md Collaborators.md CONTRIBUTORS AUTHORS \
 		Makefile yt-dlp.1 README.txt completions .gitignore \
-		setup.cfg yt-dlp yt_dlp pyproject.toml devscripts test
+		yt-dlp yt_dlp pyproject.toml devscripts test
 
 AUTHORS: Changelog.md
 	@if [ -d '.git' ] && command -v git > /dev/null ; then \

README.md

@@ -138,6 +138,17 @@ curl -L https://github.com/yt-dlp/yt-dlp/raw/master/public.key | gpg --import
 gpg --verify SHA2-256SUMS.sig SHA2-256SUMS
 gpg --verify SHA2-512SUMS.sig SHA2-512SUMS
 ```
+
+#### Licensing
+
+While yt-dlp is licensed under the [Unlicense](LICENSE), many of the release files contain code from other projects with different licenses.
+
+Most notably, the PyInstaller-bundled executables include GPLv3+ licensed code, and as such the combined work is licensed under [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html).
+
+See [THIRD_PARTY_LICENSES.txt](THIRD_PARTY_LICENSES.txt) for details.
+
+The zipimport binary (`yt-dlp`), the source tarball (`yt-dlp.tar.gz`), and the PyPI source distribution & wheel only contain code licensed under the [Unlicense](LICENSE).
+
 <!-- MANPAGE: END EXCLUDED SECTION -->
 
 **Note**: The manpages, shell completion (autocomplete) files etc. are available inside the [source tarball](https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.tar.gz)
@@ -230,8 +241,6 @@ The following provide support for impersonating browser requests. This may be re
 
 ### Deprecated
 
-* [**avconv** and **avprobe**](https://www.libav.org) - Now **deprecated** alternative to ffmpeg. License [depends on the build](https://libav.org/legal)
-* [**sponskrub**](https://github.com/faissaloo/SponSkrub) - For using the now **deprecated** [sponskrub options](#sponskrub-options). Licensed under [GPLv3+](https://github.com/faissaloo/SponSkrub/blob/master/LICENCE.md)
 * [**rtmpdump**](http://rtmpdump.mplayerhq.hu) - For downloading `rtmp` streams. ffmpeg can be used instead with `--downloader ffmpeg`. Licensed under [GPLv2+](http://rtmpdump.mplayerhq.hu)
 * [**mplayer**](http://mplayerhq.hu/design7/info.html) or [**mpv**](https://mpv.io) - For downloading `rstp`/`mms` streams. ffmpeg can be used instead with `--downloader ffmpeg`. Licensed under [GPLv2+](https://github.com/mpv-player/mpv/blob/master/Copyright)
 
@@ -311,7 +320,6 @@ Tip: Use `CTRL`+`F` (or `Command`+`F`)  to search by keywords
                                     playlist (default)
     --abort-on-error                Abort downloading of further videos if an
                                     error occurs (Alias: --no-ignore-errors)
-    --dump-user-agent               Display the current user-agent and exit
     --list-extractors               List all supported extractors and exit
     --extractor-descriptions        Output descriptions of all supported
                                     extractors and exit
@@ -562,8 +570,6 @@ Tip: Use `CTRL`+`F` (or `Command`+`F`)  to search by keywords
                                     --playlist-random and --playlist-reverse
     --no-lazy-playlist              Process videos in the playlist only after
                                     the entire playlist is parsed (default)
-    --xattr-set-filesize            Set file xattribute ytdl.filesize with
-                                    expected file size
     --hls-use-mpegts                Use the mpegts container for HLS videos;
                                     allowing some players to play the video
                                     while downloading, and reducing the chance
@@ -587,9 +593,9 @@ Tip: Use `CTRL`+`F` (or `Command`+`F`)  to search by keywords
                                     use (optionally) prefixed by the protocols
                                     (http, ftp, m3u8, dash, rstp, rtmp, mms) to
                                     use it for. Currently supports native,
-                                    aria2c, avconv, axel, curl, ffmpeg, httpie,
-                                    wget. You can use this option multiple times
-                                    to set different downloaders for different
+                                    aria2c, axel, curl, ffmpeg, httpie, wget.
+                                    You can use this option multiple times to
+                                    set different downloaders for different
                                     protocols. E.g. --downloader aria2c
                                     --downloader "dash,m3u8:native" will use
                                     aria2c for http/ftp downloads, and the
@@ -1812,7 +1818,8 @@ The following extractors use this feature:
 * `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
 * `webpage_skip`: Skip extraction of embedded webpage data. One or both of `player_response`, `initial_data`. These options are for testing purposes and don't skip any network requests
 * `player_params`: YouTube player parameters to use for player requests. Will overwrite any default ones set by yt-dlp.
-* `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`. The default is `main`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site
+* `player_js_variant`: The player javascript variant to use for n/sig deciphering. The known variants are: `main`, `tcc`, `tce`, `es5`, `es6`, `tv`, `tv_es6`, `phone`, `tablet`. The default is `main`, and the others are for debugging purposes. You can use `actual` to go with what is prescribed by the site
+* `player_js_version`: The player javascript version to use for n/sig deciphering, in the format of `signature_timestamp@hash`. Currently, the default is to force `20348@0004de42`. You can use `actual` to go with what is prescribed by the site
 * `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`
     * E.g. `all,all,1000,10` will get a maximum of 1000 replies total, with up to 10 replies per thread. `1000,all,100` will get a maximum of 1000 comments, with a maximum of 100 replies total
@@ -2207,7 +2214,6 @@ with yt_dlp.YoutubeDL(ydl_opts) as ydl:
     * Fix for [n-sig based throttling](https://github.com/ytdl-org/youtube-dl/issues/29326) **\***
     * Download livestreams from the start using `--live-from-start` (*experimental*)
     * Channel URLs download all uploads of the channel, including shorts and live
-    * Support for [logging in with OAuth](https://github.com/yt-dlp/yt-dlp/wiki/Extractors#logging-in-with-oauth)
 
 * **Cookies from browser**: Cookies can be automatically extracted from all major web browsers using `--cookies-from-browser BROWSER[+KEYRING][:PROFILE][::CONTAINER]`
 
@@ -2351,11 +2357,7 @@ While these options still work, their use is not recommended since there are oth
     --hls-prefer-native              --downloader "m3u8:native"
     --hls-prefer-ffmpeg              --downloader "m3u8:ffmpeg"
     --list-formats-old               --compat-options list-formats (Alias: --no-list-formats-as-table)
-    --list-formats-as-table          --compat-options -list-formats [Default] (Alias: --no-list-formats-old)
-    --youtube-skip-dash-manifest     --extractor-args "youtube:skip=dash" (Alias: --no-youtube-include-dash-manifest)
-    --youtube-skip-hls-manifest      --extractor-args "youtube:skip=hls" (Alias: --no-youtube-include-hls-manifest)
-    --youtube-include-dash-manifest  Default (Alias: --no-youtube-skip-dash-manifest)
-    --youtube-include-hls-manifest   Default (Alias: --no-youtube-skip-hls-manifest)
+    --list-formats-as-table          --compat-options -list-formats [Default]
     --geo-bypass                     --xff "default"
     --no-geo-bypass                  --xff "never"
     --geo-bypass-country CODE        --xff CODE
@@ -2366,18 +2368,13 @@ These options are not intended to be used by the end-user
 
     --test                           Download only part of video for testing extractors
     --load-pages                     Load pages dumped by --write-pages
-    --youtube-print-sig-code         For testing youtube signatures
     --allow-unplayable-formats       List unplayable formats also
     --no-allow-unplayable-formats    Default
 
 #### Old aliases
 These are aliases that are no longer documented for various reasons
 
-    --avconv-location                --ffmpeg-location
     --clean-infojson                 --clean-info-json
-    --cn-verification-proxy URL      --geo-verification-proxy URL
-    --dump-headers                   --print-traffic
-    --dump-intermediate-pages        --dump-pages
     --force-write-download-archive   --force-write-archive
     --no-clean-infojson              --no-clean-info-json
     --no-split-tracks                --no-split-chapters
@@ -2391,7 +2388,7 @@ These are aliases that are no longer documented for various reasons
     --yes-overwrites                 --force-overwrites
 
 #### Sponskrub Options
-Support for [SponSkrub](https://github.com/faissaloo/SponSkrub) has been deprecated in favor of the `--sponsorblock` options
+Support for [SponSkrub](https://github.com/faissaloo/SponSkrub) has been removed in favor of the `--sponsorblock` options
 
     --sponskrub                      --sponsorblock-mark all
     --no-sponskrub                   --no-sponsorblock
@@ -2413,6 +2410,17 @@ These options may no longer work as intended
     --no-include-ads                 Default
     --write-annotations              No supported site has annotations now
     --no-write-annotations           Default
+    --avconv-location                Removed alias for --ffmpeg-location
+    --cn-verification-proxy URL      Removed alias for --geo-verification-proxy URL
+    --dump-headers                   Removed alias for --print-traffic
+    --dump-intermediate-pages        Removed alias for --dump-pages
+    --youtube-skip-dash-manifest     Removed alias for --extractor-args "youtube:skip=dash" (Alias: --no-youtube-include-dash-manifest)
+    --youtube-skip-hls-manifest      Removed alias for --extractor-args "youtube:skip=hls" (Alias: --no-youtube-include-hls-manifest)
+    --youtube-include-dash-manifest  Default (Alias: --no-youtube-skip-dash-manifest)
+    --youtube-include-hls-manifest   Default (Alias: --no-youtube-skip-hls-manifest)
+    --youtube-print-sig-code         Removed testing functionality
+    --dump-user-agent                No longer supported
+    --xattr-set-filesize             No longer supported
     --compat-options seperate-video-versions  No longer needed
     --compat-options no-youtube-prefer-utc-upload-date  No longer supported
 

bundle/docker/compose.yml

@@ -13,6 +13,9 @@ services:
       CHANNEL: ${CHANNEL:?}
       ORIGIN: ${ORIGIN:?}
       VERSION:
+      PYTHON_VERSION:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../..:/yt-dlp
 
@@ -26,6 +29,9 @@ services:
         VERIFYIMAGE: quay.io/pypa/manylinux2014_x86_64:latest
     environment:
       EXE_NAME: ${EXE_NAME:?}
+      UPDATE_TO:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../../dist:/build
 
@@ -42,6 +48,9 @@ services:
       CHANNEL: ${CHANNEL:?}
       ORIGIN: ${ORIGIN:?}
       VERSION:
+      PYTHON_VERSION:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../..:/yt-dlp
 
@@ -55,7 +64,9 @@ services:
         VERIFYIMAGE: quay.io/pypa/manylinux2014_aarch64:latest
     environment:
       EXE_NAME: ${EXE_NAME:?}
-      SKIP_UPDATE_TO: "1"  # TODO: remove when there is a glibc2.17 aarch64 release to --update-to
+      UPDATE_TO:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../../dist:/build
 
@@ -72,10 +83,12 @@ services:
       CHANNEL: ${CHANNEL:?}
       ORIGIN: ${ORIGIN:?}
       VERSION:
-      SKIP_ONEFILE_BUILD: "1"
+      PYTHON_VERSION:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../..:/yt-dlp
-      - ~/yt-dlp-build-venv:/yt-dlp-build-venv
+      - ../../venv:/yt-dlp-build-venv
 
   linux_armv7l_verify:
     build:
@@ -87,7 +100,9 @@ services:
         VERIFYIMAGE: arm32v7/debian:bullseye
     environment:
       EXE_NAME: ${EXE_NAME:?}
-      TEST_ONEDIR_BUILD: "1"
+      UPDATE_TO:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../../dist:/build
 
@@ -104,6 +119,9 @@ services:
       CHANNEL: ${CHANNEL:?}
       ORIGIN: ${ORIGIN:?}
       VERSION:
+      PYTHON_VERSION:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../..:/yt-dlp
 
@@ -117,7 +135,9 @@ services:
         VERIFYIMAGE: alpine:3.22
     environment:
       EXE_NAME: ${EXE_NAME:?}
-      SKIP_UPDATE_TO: "1"  # TODO: remove when there is a musllinux_aarch64 release to --update-to
+      UPDATE_TO:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../../dist:/build
 
@@ -134,6 +154,9 @@ services:
       CHANNEL: ${CHANNEL:?}
       ORIGIN: ${ORIGIN:?}
       VERSION:
+      PYTHON_VERSION:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
       EXCLUDE_CURL_CFFI: "1"
     volumes:
       - ../..:/yt-dlp
@@ -148,6 +171,8 @@ services:
         VERIFYIMAGE: alpine:3.22
     environment:
       EXE_NAME: ${EXE_NAME:?}
-      SKIP_UPDATE_TO: "1"  # TODO: remove when there is a musllinux_aarch64 release to --update-to
+      UPDATE_TO:
+      SKIP_ONEDIR_BUILD:
+      SKIP_ONEFILE_BUILD:
     volumes:
       - ../../dist:/build

bundle/docker/linux/build.sh

@@ -1,16 +1,17 @@
 #!/bin/bash
 set -exuo pipefail
 
-if [[ -z "${USE_PYTHON_VERSION:-}" ]]; then
-    USE_PYTHON_VERSION="3.13"
+if [[ -z "${PYTHON_VERSION:-}" ]]; then
+    PYTHON_VERSION="3.13"
+    echo "Defaulting to using Python ${PYTHON_VERSION}"
 fi
 
 function runpy {
-    "/opt/shared-cpython-${USE_PYTHON_VERSION}/bin/python${USE_PYTHON_VERSION}" "$@"
+    "/opt/shared-cpython-${PYTHON_VERSION}/bin/python${PYTHON_VERSION}" "$@"
 }
 
 function venvpy {
-    "python${USE_PYTHON_VERSION}" "$@"
+    "python${PYTHON_VERSION}" "$@"
 }
 
 INCLUDES=(
@@ -23,6 +24,7 @@ if [[ -z "${EXCLUDE_CURL_CFFI:-}" ]]; then
 fi
 
 runpy -m venv /yt-dlp-build-venv
+# shellcheck disable=SC1091
 source /yt-dlp-build-venv/bin/activate
 # Inside the venv we use venvpy instead of runpy
 venvpy -m ensurepip --upgrade --default-pip

bundle/docker/linux/verify.sh

@@ -1,7 +1,11 @@
 #!/bin/sh
 set -eu
 
-if [ -n "${TEST_ONEDIR_BUILD:-}" ]; then
+if [ -n "${SKIP_ONEFILE_BUILD:-}" ]; then
+    if [ -n "${SKIP_ONEDIR_BUILD:-}" ]; then
+        echo "All executable builds were skipped"
+        exit 1
+    fi
     echo "Extracting zip to verify onedir build"
     if command -v python3 >/dev/null 2>&1; then
         python3 -m zipfile -e "/build/${EXE_NAME}.zip" ./
@@ -22,14 +26,17 @@ if [ -n "${TEST_ONEDIR_BUILD:-}" ]; then
         fi
         unzip "/build/${EXE_NAME}.zip" -d ./
     fi
-else
-    echo "Verifying onefile build"
-    cp "/build/${EXE_NAME}" ./
+    chmod +x "./${EXE_NAME}"
+    "./${EXE_NAME}" -v || true
+    "./${EXE_NAME}" --version
+    exit 0
 fi
 
+echo "Verifying onefile build"
+cp "/build/${EXE_NAME}" ./
 chmod +x "./${EXE_NAME}"
 
-if [ -n "${SKIP_UPDATE_TO:-}" ] || [ -n "${TEST_ONEDIR_BUILD:-}" ]; then
+if [ -z "${UPDATE_TO:-}" ]; then
     "./${EXE_NAME}" -v || true
     "./${EXE_NAME}" --version
     exit 0
@@ -37,7 +44,7 @@ fi
 
 cp "./${EXE_NAME}" "./${EXE_NAME}_downgraded"
 version="$("./${EXE_NAME}" --version)"
-"./${EXE_NAME}_downgraded" -v --update-to yt-dlp/yt-dlp@2023.03.04
+"./${EXE_NAME}_downgraded" -v --update-to "${UPDATE_TO}"
 downgraded_version="$("./${EXE_NAME}_downgraded" --version)"
 if [ "${version}" = "${downgraded_version}" ]; then
     exit 1

bundle/pyinstaller.py

@@ -129,7 +129,6 @@ def windows_set_version(exe, version):
                 StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),
                 StringStruct('FileVersion', version),
                 StringStruct('InternalName', f'yt-dlp{suffix}'),
-                StringStruct('LegalCopyright', 'pukkandan.ytdlp@gmail.com | UNLICENSE'),
                 StringStruct('OriginalFilename', f'yt-dlp{suffix}.exe'),
                 StringStruct('ProductName', f'yt-dlp{suffix}'),
                 StringStruct(

devscripts/changelog_override.json

@@ -293,5 +293,10 @@
         "action": "add",
         "when": "c76ce28e06c816eb5b261dfb6aff6e69dd9b7382",
         "short": "[priority] **linux_armv7l_exe builds are being discontinued**\nThis release's `yt-dlp_linux_armv7l` binary could be the last one. [Read more](https://github.com/yt-dlp/yt-dlp/issues/13976)"
+    },
+    {
+        "action": "add",
+        "when": "08d78996831bd8e1e3c2592d740c3def00bbf548",
+        "short": "[priority] **Several options have been deprecated**\nIn order to simplify the codebase and reduce maintenance burden, various options have been deprecated. Please remove them from your commands/configurations. [Read more](https://github.com/yt-dlp/yt-dlp/issues/14198)"
     }
 ]

devscripts/generate_third_party_licenses.py

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

devscripts/make_contributing.py

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

devscripts/setup_variables_tests.py

@@ -1,4 +1,3 @@
-# Allow direct execution
 import os
 import sys
 
@@ -55,7 +54,7 @@ def _test(github_repository, note, repo_vars, repo_secrets, inputs, expected=Non
     assert result == exp, f'unexpected result: {github_repository} {note}'
 
 
-def main():
+def test_setup_variables():
     DEFAULT_VERSION_WITH_REVISION = dt.datetime.now(tz=dt.timezone.utc).strftime('%Y.%m.%d.%H%M%S')
     DEFAULT_VERSION = calculate_version()
     BASE_REPO_VARS = {
@@ -323,9 +322,3 @@ def main():
             'pypi_project': None,
             'pypi_suffix': None,
         }, ignore_revision=True)
-
-    print('all tests passed')
-
-
-if __name__ == '__main__':
-    main()

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling>=1.27.0"]
 build-backend = "hatchling.build"
 
 [project]
@@ -22,7 +22,8 @@ keywords = [
     "sponsorblock",
     "yt-dlp",
 ]
-license = {file = "LICENSE"}
+license = "Unlicense"
+license-files = ["LICENSE"]
 classifiers = [
     "Topic :: Multimedia :: Video",
     "Development Status :: 5 - Production/Stable",
@@ -34,10 +35,10 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
-    "License :: OSI Approved :: The Unlicense (Unlicense)",
     "Operating System :: OS Independent",
 ]
 dynamic = ["version"]
@@ -63,7 +64,7 @@ secretstorage = [
 ]
 build = [
     "build",
-    "hatchling",
+    "hatchling>=1.27.0",
     "pip",
     "setuptools>=71.0.2,<81",  # See https://github.com/pyinstaller/pyinstaller/issues/9149
     "wheel",
@@ -75,7 +76,7 @@ dev = [
 ]
 static-analysis = [
     "autopep8~=2.0",
-    "ruff~=0.12.0",
+    "ruff~=0.13.0",
 ]
 test = [
     "pytest~=8.1",
@@ -107,7 +108,6 @@ include = [
     "/LICENSE",  # included as license
     "/pyproject.toml",  # included by default
     "/README.md",  # included as readme
-    "/setup.cfg",
     "/supportedsites.md",
 ]
 artifacts = [
@@ -173,7 +173,8 @@ python = [
     "3.11",
     "3.12",
     "3.13",
-    "pypy3.10",
+    "3.14",
+    "pypy3.11",
 ]
 
 [tool.ruff]

setup.cfg

@@ -1,39 +0,0 @@
-[flake8]
-exclude = build,venv,.tox,.git,.pytest_cache
-ignore = E402,E501,E731,E741,W503
-max_line_length = 120
-per_file_ignores =
-    devscripts/lazy_load_template.py: F401
-
-
-[autoflake]
-ignore-init-module-imports = true
-ignore-pass-after-docstring = true
-remove-all-unused-imports = true
-remove-duplicate-keys = true
-remove-unused-variables = true
-
-
-[tox:tox]
-skipsdist = true
-envlist = py{39,310,311,312,313},pypy311
-skip_missing_interpreters = true
-
-[testenv]  # tox
-deps =
-    pytest
-commands = pytest {posargs:"-m not download"}
-passenv = HOME  # For test_compat_expanduser
-setenv =
-    # PYTHONWARNINGS = error  # Catches PIP's warnings too
-
-
-[isort]
-py_version = 39
-multi_line_output = VERTICAL_HANGING_INDENT
-line_length = 80
-reverse_relative = true
-ensure_newline_before_comments = true
-include_trailing_comma = true
-known_first_party =
-    test

supportedsites.md

@@ -20,7 +20,6 @@ The only reliable way to check if a site is supported is to try it.
  - **3sat**
  - **4tube**
  - **56.com**
- - **6play**
  - **7plus**
  - **8tracks**
  - **9c9media**
@@ -299,7 +298,6 @@ The only reliable way to check if a site is supported is to try it.
  - **cpac**
  - **cpac:playlist**
  - **Cracked**
- - **Crackle**
  - **Craftsy**
  - **CrooksAndLiars**
  - **CrowdBunker**
@@ -314,8 +312,6 @@ 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:movie**
  - **Cybrary**: [*cybrary*](## "netrc machine")
  - **CybraryCourse**: [*cybrary*](## "netrc machine")
  - **DacastPlaylist**
@@ -450,7 +446,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Filmweb**
  - **FiveThirtyEight**
  - **FiveTV**
- - **FlexTV**
  - **Flickr**
  - **Floatplane**
  - **FloatplaneChannel**
@@ -798,7 +793,6 @@ The only reliable way to check if a site is supported is to try it.
  - **mirrativ**
  - **mirrativ:user**
  - **MirrorCoUK**
- - **MiTele**: mitele.es
  - **mixch**
  - **mixch:archive**
  - **mixch:movie**
@@ -1009,6 +1003,7 @@ The only reliable way to check if a site is supported is to try it.
  - **onet.tv:channel**
  - **OnetMVP**
  - **OnionStudios**
+ - **onsen**: [*onsen*](## "netrc machine") インターネットラジオステーション＜音泉＞
  - **Opencast**
  - **OpencastPlaylist**
  - **openrec**
@@ -1033,8 +1028,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Panopto**
  - **PanoptoList**
  - **PanoptoPlaylist**
- - **ParamountPlus**
- - **ParamountPlusSeries**
  - **ParamountPressExpress**
  - **Parler**: Posts on parler.com
  - **parliamentlive.tv**: UK parliament videos
@@ -1069,8 +1062,6 @@ The only reliable way to check if a site is supported is to try it.
  - **PinterestCollection**
  - **PiramideTV**
  - **PiramideTVChannel**
- - **pixiv:sketch**
- - **pixiv:​sketch:user**
  - **PlanetMarathi**
  - **Platzi**: [*platzi*](## "netrc machine")
  - **PlatziCourse**: [*platzi*](## "netrc machine")
@@ -1257,7 +1248,6 @@ The only reliable way to check if a site is supported is to try it.
  - **rutube:person**: Rutube person videos
  - **rutube:playlist**: Rutube playlists
  - **rutube:tags**: Rutube tags
- - **RUTV**: RUTV.RU
  - **Ruutu**: (**Currently broken**)
  - **Ruv**
  - **ruv.is:spila**
@@ -1332,7 +1322,10 @@ The only reliable way to check if a site is supported is to try it.
  - **Slideshare**
  - **SlidesLive**
  - **Slutload**
- - **Smotrim**
+ - **smotrim**
+ - **smotrim:audio**
+ - **smotrim:live**
+ - **smotrim:playlist**
  - **SnapchatSpotlight**
  - **Snotr**
  - **SoftWhiteUnderbelly**: [*softwhiteunderbelly*](## "netrc machine")
@@ -1370,8 +1363,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Sport5**
  - **SportBox**: (**Currently broken**)
  - **SportDeutschland**
- - **spotify**: Spotify episodes (**Currently broken**)
- - **spotify:show**: Spotify shows (**Currently broken**)
  - **Spreaker**
  - **SpreakerShow**
  - **SpringboardPlatform**
@@ -1510,15 +1501,17 @@ The only reliable way to check if a site is supported is to try it.
  - **TrueID**
  - **TruNews**
  - **Truth**
+ - **ttinglive**: 띵라이브 (formerly FlexTV)
  - **Tube8**: (**Currently broken**)
  - **TubeTuGraz**: [*tubetugraz*](## "netrc machine") tube.tugraz.at
  - **TubeTuGrazSeries**: [*tubetugraz*](## "netrc machine")
  - **tubitv**: [*tubitv*](## "netrc machine")
  - **tubitv:series**
  - **Tumblr**: [*tumblr*](## "netrc machine")
- - **TuneInPodcast**
- - **TuneInPodcastEpisode**
- - **TuneInStation**
+ - **tunein:embed**
+ - **tunein:podcast**
+ - **tunein:​podcast:program**
+ - **tunein:station**
  - **tv.dfb.de**
  - **TV2**
  - **TV2Article**
@@ -1600,7 +1593,6 @@ The only reliable way to check if a site is supported is to try it.
  - **Varzesh3**: (**Currently broken**)
  - **Vbox7**
  - **Veo**
- - **Vesti**: Вести.Ru (**Currently broken**)
  - **Vevo**
  - **VevoPlaylist**
  - **VGTV**: VGTV, BTTV, FTV, Aftenposten and Aftonbladet
@@ -1748,7 +1740,6 @@ The only reliable way to check if a site is supported is to try it.
  - **wykop:​dig:comment**
  - **wykop:post**
  - **wykop:​post:comment**
- - **Xanimu**
  - **XboxClips**
  - **XHamster**
  - **XHamsterEmbed**

test/parameters.json

@@ -36,7 +36,6 @@
     "verbose": true,
     "writedescription": false,
     "writeinfojson": true,
-    "writeannotations": false,
     "writelink": false,
     "writeurllink": false,
     "writewebloclink": false,

test/test_InfoExtractor.py

@@ -1945,7 +1945,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         server_thread.daemon = True
         server_thread.start()
 
-        (content, urlh) = self.ie._download_webpage_handle(
+        content, _ = self.ie._download_webpage_handle(
             f'http://127.0.0.1:{port}/teapot', None,
             expected_status=TEAPOT_RESPONSE_STATUS)
         self.assertEqual(content, TEAPOT_RESPONSE_BODY)

test/test_compat.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 # Allow direct execution
+import datetime as dt
 import os
 import sys
 import unittest
@@ -12,7 +13,7 @@ import struct
 
 from yt_dlp import compat
 from yt_dlp.compat import urllib  # isort: split
-from yt_dlp.compat import compat_etree_fromstring, compat_expanduser
+from yt_dlp.compat import compat_etree_fromstring, compat_expanduser, compat_datetime_from_timestamp
 from yt_dlp.compat.urllib.request import getproxies
 
 
@@ -59,6 +60,45 @@ class TestCompat(unittest.TestCase):
     def test_struct_unpack(self):
         self.assertEqual(struct.unpack('!B', b'\x00'), (0,))
 
+    def test_compat_datetime_from_timestamp(self):
+        self.assertEqual(
+            compat_datetime_from_timestamp(0),
+            dt.datetime(1970, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc))
+        self.assertEqual(
+            compat_datetime_from_timestamp(1),
+            dt.datetime(1970, 1, 1, 0, 0, 1, tzinfo=dt.timezone.utc))
+        self.assertEqual(
+            compat_datetime_from_timestamp(3600),
+            dt.datetime(1970, 1, 1, 1, 0, 0, tzinfo=dt.timezone.utc))
+
+        self.assertEqual(
+            compat_datetime_from_timestamp(-1),
+            dt.datetime(1969, 12, 31, 23, 59, 59, tzinfo=dt.timezone.utc))
+        self.assertEqual(
+            compat_datetime_from_timestamp(-86400),
+            dt.datetime(1969, 12, 31, 0, 0, 0, tzinfo=dt.timezone.utc))
+
+        self.assertEqual(
+            compat_datetime_from_timestamp(0.5),
+            dt.datetime(1970, 1, 1, 0, 0, 0, 500000, tzinfo=dt.timezone.utc))
+        self.assertEqual(
+            compat_datetime_from_timestamp(1.000001),
+            dt.datetime(1970, 1, 1, 0, 0, 1, 1, tzinfo=dt.timezone.utc))
+        self.assertEqual(
+            compat_datetime_from_timestamp(-1.25),
+            dt.datetime(1969, 12, 31, 23, 59, 58, 750000, tzinfo=dt.timezone.utc))
+
+        self.assertEqual(
+            compat_datetime_from_timestamp(-1577923200),
+            dt.datetime(1920, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc))
+        self.assertEqual(
+            compat_datetime_from_timestamp(4102444800),
+            dt.datetime(2100, 1, 1, 0, 0, 0, tzinfo=dt.timezone.utc))
+
+        self.assertEqual(
+            compat_datetime_from_timestamp(173568960000),
+            dt.datetime(7470, 3, 8, 0, 0, 0, tzinfo=dt.timezone.utc))
+
 
 if __name__ == '__main__':
     unittest.main()

test/test_overwrites.py

@@ -29,7 +29,7 @@ class TestOverwrites(unittest.TestCase):
                 '-o', 'test.webm',
                 'https://www.youtube.com/watch?v=jNQXAC9IVRw',
             ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        sout, serr = outp.communicate()
+        sout, _ = outp.communicate()
         self.assertTrue(b'has already been downloaded' in sout)
         # if the file has no content, it has not been redownloaded
         self.assertTrue(os.path.getsize(download_file) < 1)
@@ -41,7 +41,7 @@ class TestOverwrites(unittest.TestCase):
                 '-o', 'test.webm',
                 'https://www.youtube.com/watch?v=jNQXAC9IVRw',
             ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        sout, serr = outp.communicate()
+        sout, _ = outp.communicate()
         self.assertTrue(b'has already been downloaded' not in sout)
         # if the file has no content, it has not been redownloaded
         self.assertTrue(os.path.getsize(download_file) > 1)

test/test_pot/test_pot_framework.py

@@ -153,7 +153,7 @@ class TestPoTokenProvider:
 
         with pytest.raises(
             PoTokenProviderRejectedRequest,
-            match='External requests by "example" provider do not support proxy scheme "socks4". Supported proxy '
+            match=r'External requests by "example" provider do not support proxy scheme "socks4"\. Supported proxy '
             'schemes: http, socks5h',
         ):
             provider.request_pot(pot_request)

test/test_utils.py

@@ -12,6 +12,7 @@ import datetime as dt
 import io
 import itertools
 import json
+import ntpath
 import pickle
 import subprocess
 import unittest
@@ -101,11 +102,13 @@ from yt_dlp.utils import (
     remove_start,
     render_table,
     replace_extension,
+    datetime_round,
     rot47,
     sanitize_filename,
     sanitize_path,
     sanitize_url,
     shell_quote,
+    strftime_or_none,
     smuggle_url,
     str_to_int,
     strip_jsonp,
@@ -251,12 +254,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_path('abc.../def...'), 'abc..#\\def..#')
         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'),
@@ -274,8 +271,7 @@ class TestUtil(unittest.TestCase):
             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'
+            assert result == ntpath.normpath(test), f'{test} does not match ntpath.normpath'
 
     def test_sanitize_url(self):
         self.assertEqual(sanitize_url('//foo.bar'), 'http://foo.bar')
@@ -409,6 +405,25 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(datetime_from_str('now+1day', precision='hour'), datetime_from_str('now+24hours', precision='auto'))
         self.assertEqual(datetime_from_str('now+23hours', precision='hour'), datetime_from_str('now+23hours', precision='auto'))
 
+    def test_datetime_round(self):
+        self.assertEqual(datetime_round(dt.datetime.strptime('1820-05-12T01:23:45Z', '%Y-%m-%dT%H:%M:%SZ')),
+                         dt.datetime(1820, 5, 12, tzinfo=dt.timezone.utc))
+        self.assertEqual(datetime_round(dt.datetime.strptime('1969-12-31T23:34:45Z', '%Y-%m-%dT%H:%M:%SZ'), 'hour'),
+                         dt.datetime(1970, 1, 1, 0, tzinfo=dt.timezone.utc))
+        self.assertEqual(datetime_round(dt.datetime.strptime('2024-12-25T01:23:45Z', '%Y-%m-%dT%H:%M:%SZ'), 'minute'),
+                         dt.datetime(2024, 12, 25, 1, 24, tzinfo=dt.timezone.utc))
+        self.assertEqual(datetime_round(dt.datetime.strptime('2024-12-25T01:23:45.123Z', '%Y-%m-%dT%H:%M:%S.%fZ'), 'second'),
+                         dt.datetime(2024, 12, 25, 1, 23, 45, tzinfo=dt.timezone.utc))
+        self.assertEqual(datetime_round(dt.datetime.strptime('2024-12-25T01:23:45.678Z', '%Y-%m-%dT%H:%M:%S.%fZ'), 'second'),
+                         dt.datetime(2024, 12, 25, 1, 23, 46, tzinfo=dt.timezone.utc))
+
+    def test_strftime_or_none(self):
+        self.assertEqual(strftime_or_none(-4722192000), '18200512')
+        self.assertEqual(strftime_or_none(0), '19700101')
+        self.assertEqual(strftime_or_none(1735084800), '20241225')
+        # Throws OverflowError
+        self.assertEqual(strftime_or_none(1735084800000), None)
+
     def test_daterange(self):
         _20century = DateRange('19000101', '20000101')
         self.assertFalse('17890714' in _20century)

test/test_verbose_output.py

@@ -22,7 +22,7 @@ class TestVerboseOutput(unittest.TestCase):
                 '--username', 'johnsmith@gmail.com',
                 '--password', 'my_secret_password',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        sout, serr = outp.communicate()
+        _, serr = outp.communicate()
         self.assertTrue(b'--username' in serr)
         self.assertTrue(b'johnsmith' not in serr)
         self.assertTrue(b'--password' in serr)
@@ -36,7 +36,7 @@ class TestVerboseOutput(unittest.TestCase):
                 '-u', 'johnsmith@gmail.com',
                 '-p', 'my_secret_password',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        sout, serr = outp.communicate()
+        _, serr = outp.communicate()
         self.assertTrue(b'-u' in serr)
         self.assertTrue(b'johnsmith' not in serr)
         self.assertTrue(b'-p' in serr)
@@ -50,7 +50,7 @@ class TestVerboseOutput(unittest.TestCase):
                 '--username=johnsmith@gmail.com',
                 '--password=my_secret_password',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        sout, serr = outp.communicate()
+        _, serr = outp.communicate()
         self.assertTrue(b'--username' in serr)
         self.assertTrue(b'johnsmith' not in serr)
         self.assertTrue(b'--password' in serr)
@@ -64,7 +64,7 @@ class TestVerboseOutput(unittest.TestCase):
                 '-u=johnsmith@gmail.com',
                 '-p=my_secret_password',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        sout, serr = outp.communicate()
+        _, serr = outp.communicate()
         self.assertTrue(b'-u' in serr)
         self.assertTrue(b'johnsmith' not in serr)
         self.assertTrue(b'-p' in serr)

test/test_websockets.py

@@ -20,7 +20,7 @@ import random
 import ssl
 import threading
 
-from yt_dlp import socks, traverse_obj
+from yt_dlp import socks
 from yt_dlp.cookies import YoutubeDLCookieJar
 from yt_dlp.dependencies import websockets
 from yt_dlp.networking import Request
@@ -32,6 +32,7 @@ from yt_dlp.networking.exceptions import (
     SSLError,
     TransportError,
 )
+from yt_dlp.utils.traversal import traverse_obj
 from yt_dlp.utils.networking import HTTPHeaderDict
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))

test/test_write_annotations.py.disabled

@@ -1,77 +0,0 @@
-#!/usr/bin/env python3
-
-# Allow direct execution
-import os
-import sys
-import unittest
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import xml.etree.ElementTree
-
-import yt_dlp.extractor
-import yt_dlp.YoutubeDL
-from test.helper import get_params, is_download_test, try_rm
-
-
-class YoutubeDL(yt_dlp.YoutubeDL):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.to_stderr = self.to_screen
-
-
-params = get_params({
-    'writeannotations': True,
-    'skip_download': True,
-    'writeinfojson': False,
-    'format': 'flv',
-})
-
-
-TEST_ID = 'gr51aVj-mLg'
-ANNOTATIONS_FILE = TEST_ID + '.annotations.xml'
-EXPECTED_ANNOTATIONS = ['Speech bubble', 'Note', 'Title', 'Spotlight', 'Label']
-
-
-@is_download_test
-class TestAnnotations(unittest.TestCase):
-    def setUp(self):
-        # Clear old files
-        self.tearDown()
-
-    def test_info_json(self):
-        expected = list(EXPECTED_ANNOTATIONS)  # Two annotations could have the same text.
-        ie = yt_dlp.extractor.YoutubeIE()
-        ydl = YoutubeDL(params)
-        ydl.add_info_extractor(ie)
-        ydl.download([TEST_ID])
-        self.assertTrue(os.path.exists(ANNOTATIONS_FILE))
-        annoxml = None
-        with open(ANNOTATIONS_FILE, encoding='utf-8') as annof:
-            annoxml = xml.etree.ElementTree.parse(annof)
-        self.assertTrue(annoxml is not None, 'Failed to parse annotations XML')
-        root = annoxml.getroot()
-        self.assertEqual(root.tag, 'document')
-        annotationsTag = root.find('annotations')
-        self.assertEqual(annotationsTag.tag, 'annotations')
-        annotations = annotationsTag.findall('annotation')
-
-        # Not all the annotations have TEXT children and the annotations are returned unsorted.
-        for a in annotations:
-            self.assertEqual(a.tag, 'annotation')
-            if a.get('type') == 'text':
-                textTag = a.find('TEXT')
-                text = textTag.text
-                self.assertTrue(text in expected)  # assertIn only added in python 2.7
-                # remove the first occurrence, there could be more than one annotation with the same text
-                expected.remove(text)
-        # We should have seen (and removed) all the expected annotation texts.
-        self.assertEqual(len(expected), 0, 'Not all expected annotations were found.')
-
-    def tearDown(self):
-        try_rm(ANNOTATIONS_FILE)
-
-
-if __name__ == '__main__':
-    unittest.main()

yt_dlp/YoutubeDL.py

@@ -304,7 +304,6 @@ class YoutubeDL:
     clean_infojson:    Remove internal metadata from the infojson
     getcomments:       Extract video comments. This will not be written to disk
                        unless writeinfojson is also given
-    writeannotations:  Write the video annotations to a .annotations.xml file
     writethumbnail:    Write the thumbnail image to a file
     allow_playlist_files: Whether to write playlists' description, infojson etc
                        also to disk when using the 'write*' options
@@ -511,11 +510,11 @@ class YoutubeDL:
     the downloader (see yt_dlp/downloader/common.py):
     nopart, updatetime, buffersize, ratelimit, throttledratelimit, min_filesize,
     max_filesize, test, noresizebuffer, retries, file_access_retries, fragment_retries,
-    continuedl, xattr_set_filesize, hls_use_mpegts, http_chunk_size,
-    external_downloader_args, concurrent_fragment_downloads, progress_delta.
+    continuedl, hls_use_mpegts, http_chunk_size, external_downloader_args,
+    concurrent_fragment_downloads, progress_delta.
 
     The following options are used by the post processors:
-    ffmpeg_location:   Location of the ffmpeg/avconv binary; either the path
+    ffmpeg_location:   Location of the ffmpeg binary; either the path
                        to the binary or its containing directory.
     postprocessor_args: A dictionary of postprocessor/executable keys (in lower case)
                        and a list of additional command-line arguments for the
@@ -566,32 +565,14 @@ class YoutubeDL:
     allsubtitles:      - Use subtitleslangs = ['all']
                        Downloads all the subtitles of the video
                        (requires writesubtitles or writeautomaticsub)
-    include_ads:       - Doesn't work
-                       Download ads as well
-    call_home:         - Not implemented
-                       Boolean, true if we are allowed to contact the
-                       yt-dlp servers for debugging.
     post_hooks:        - Register a custom postprocessor
                        A list of functions that get called as the final step
                        for each video file, after all postprocessors have been
                        called. The filename will be passed as the only argument.
     hls_prefer_native: - Use external_downloader = {'m3u8': 'native'} or {'m3u8': 'ffmpeg'}.
-                       Use the native HLS downloader instead of ffmpeg/avconv
-                       if True, otherwise use ffmpeg/avconv if False, otherwise
+                       Use the native HLS downloader instead of ffmpeg
+                       if True, otherwise use ffmpeg if False, otherwise
                        use downloader suggested by extractor if None.
-    prefer_ffmpeg:     - avconv support is deprecated
-                       If False, use avconv instead of ffmpeg if both are available,
-                       otherwise prefer ffmpeg.
-    youtube_include_dash_manifest: - Use extractor_args
-                       If True (default), DASH manifests and related
-                       data will be downloaded and processed by extractor.
-                       You can reduce network I/O by disabling it if you don't
-                       care about DASH. (only for youtube)
-    youtube_include_hls_manifest: - Use extractor_args
-                       If True (default), HLS manifests and related
-                       data will be downloaded and processed by extractor.
-                       You can reduce network I/O by disabling it if you don't
-                       care about HLS. (only for youtube)
     no_color:          Same as `color='no_color'`
     no_overwrites:     Same as `overwrites=False`
     """
@@ -750,10 +731,6 @@ class YoutubeDL:
                 return True
             return False
 
-        if check_deprecated('cn_verification_proxy', '--cn-verification-proxy', '--geo-verification-proxy'):
-            if self.params.get('geo_verification_proxy') is None:
-                self.params['geo_verification_proxy'] = self.params['cn_verification_proxy']
-
         check_deprecated('useid', '--id', '-o "%(id)s.%(ext)s"')
 
         for msg in self.params.get('_warnings', []):
@@ -2717,11 +2694,7 @@ class YoutubeDL:
                 ('modified_timestamp', 'modified_date'),
         ):
             if info_dict.get(date_key) is None and info_dict.get(ts_key) is not None:
-                # Working around out-of-range timestamp values (e.g. negative ones on Windows,
-                # see http://bugs.python.org/issue1646728)
-                with contextlib.suppress(ValueError, OverflowError, OSError):
-                    upload_date = dt.datetime.fromtimestamp(info_dict[ts_key], dt.timezone.utc)
-                    info_dict[date_key] = upload_date.strftime('%Y%m%d')
+                info_dict[date_key] = strftime_or_none(info_dict[ts_key])
 
         if not info_dict.get('release_year'):
             info_dict['release_year'] = traverse_obj(info_dict, ('release_date', {lambda x: int(x[:4])}))
@@ -3339,28 +3312,6 @@ class YoutubeDL:
         elif _infojson_written is None:
             return
 
-        # Note: Annotations are deprecated
-        annofn = None
-        if self.params.get('writeannotations', False):
-            annofn = self.prepare_filename(info_dict, 'annotation')
-        if annofn:
-            if not self._ensure_dir_exists(annofn):
-                return
-            if not self.params.get('overwrites', True) and os.path.exists(annofn):
-                self.to_screen('[info] Video annotations are already present')
-            elif not info_dict.get('annotations'):
-                self.report_warning('There are no annotations to write.')
-            else:
-                try:
-                    self.to_screen('[info] Writing video annotations to: ' + annofn)
-                    with open(annofn, 'w', encoding='utf-8') as annofile:
-                        annofile.write(info_dict['annotations'])
-                except (KeyError, TypeError):
-                    self.report_warning('There are no annotations to write.')
-                except OSError:
-                    self.report_error('Cannot write annotations file: ' + annofn)
-                    return
-
         # Write internet shortcut files
         def _write_link_file(link_type):
             url = try_get(info_dict['webpage_url'], iri_to_uri)

yt_dlp/__init__.py

@@ -59,11 +59,9 @@ from .utils import (
     render_table,
     setproctitle,
     shell_quote,
-    traverse_obj,
     variadic,
     write_string,
 )
-from .utils.networking import std_headers
 from .utils._utils import _UnsafeExtensionError
 from .YoutubeDL import YoutubeDL
 
@@ -523,7 +521,6 @@ def validate_options(opts):
 
     if report_args_compat('post-processor', opts.postprocessor_args, 'default-compat', 'default'):
         opts.postprocessor_args['default'] = opts.postprocessor_args.pop('default-compat')
-        opts.postprocessor_args.setdefault('sponskrub', [])
 
     def report_conflict(arg1, opt1, arg2='--allow-unplayable-formats', opt2='allow_unplayable_formats',
                         val1=NO_DEFAULT, val2=NO_DEFAULT, default=False):
@@ -548,11 +545,6 @@ def validate_options(opts):
                     '"--exec before_dl:"', 'exec_cmd', val2=opts.exec_cmd.get('before_dl'))
     report_conflict('--id', 'useid', '--output', 'outtmpl', val2=opts.outtmpl.get('default'))
     report_conflict('--remux-video', 'remuxvideo', '--recode-video', 'recodevideo')
-    report_conflict('--sponskrub', 'sponskrub', '--remove-chapters', 'remove_chapters')
-    report_conflict('--sponskrub', 'sponskrub', '--sponsorblock-mark', 'sponsorblock_mark')
-    report_conflict('--sponskrub', 'sponskrub', '--sponsorblock-remove', 'sponsorblock_remove')
-    report_conflict('--sponskrub-cut', 'sponskrub_cut', '--split-chapter', 'split_chapters',
-                    val1=opts.sponskrub and opts.sponskrub_cut)
 
     # Conflicts with --allow-unplayable-formats
     report_conflict('--embed-metadata', 'addmetadata')
@@ -565,23 +557,15 @@ def validate_options(opts):
     report_conflict('--recode-video', 'recodevideo')
     report_conflict('--remove-chapters', 'remove_chapters', default=[])
     report_conflict('--remux-video', 'remuxvideo')
-    report_conflict('--sponskrub', 'sponskrub')
     report_conflict('--sponsorblock-remove', 'sponsorblock_remove', default=set())
     report_conflict('--xattrs', 'xattrs')
 
-    # Fully deprecated options
-    def report_deprecation(val, old, new=None):
-        if not val:
-            return
+    if hasattr(opts, '_deprecated_options'):
         deprecation_warnings.append(
-            f'{old} is deprecated and may be removed in a future version. Use {new} instead' if new
-            else f'{old} is deprecated and may not work as expected')
-
-    report_deprecation(opts.sponskrub, '--sponskrub', '--sponsorblock-mark or --sponsorblock-remove')
-    report_deprecation(not opts.prefer_ffmpeg, '--prefer-avconv', 'ffmpeg')
-    # report_deprecation(opts.include_ads, '--include-ads')  # We may re-implement this in future
-    # report_deprecation(opts.call_home, '--call-home')  # We may re-implement this in future
-    # report_deprecation(opts.writeannotations, '--write-annotations')  # It's just that no website has it
+            f'The following options have been deprecated: {", ".join(opts._deprecated_options)}\n'
+            'Please remove them from your command/configuration to avoid future errors.\n'
+            'See  https://github.com/yt-dlp/yt-dlp/issues/14198  for more details')
+        del opts._deprecated_options
 
     # Dependent options
     opts.date = DateRange.day(opts.date) if opts.date else DateRange(opts.dateafter, opts.datebefore)
@@ -712,21 +696,6 @@ def get_postprocessors(opts):
             'add_metadata': opts.addmetadata,
             'add_infojson': opts.embed_infojson,
         }
-    # Deprecated
-    # This should be above EmbedThumbnail since sponskrub removes the thumbnail attachment
-    # but must be below EmbedSubtitle and FFmpegMetadata
-    # See https://github.com/yt-dlp/yt-dlp/issues/204 , https://github.com/faissaloo/SponSkrub/issues/29
-    # If opts.sponskrub is None, sponskrub is used, but it silently fails if the executable can't be found
-    if opts.sponskrub is not False:
-        yield {
-            'key': 'SponSkrub',
-            'path': opts.sponskrub_path,
-            'args': opts.sponskrub_args,
-            'cut': opts.sponskrub_cut,
-            'force': opts.sponskrub_force,
-            'ignoreerror': opts.sponskrub is None,
-            '_from_cli': True,
-        }
     if opts.embedthumbnail:
         yield {
             'key': 'EmbedThumbnail',
@@ -885,7 +854,6 @@ def parse_options(argv=None):
         'nopart': opts.nopart,
         'updatetime': opts.updatetime,
         'writedescription': opts.writedescription,
-        'writeannotations': opts.writeannotations,
         'writeinfojson': opts.writeinfojson,
         'allow_playlist_files': opts.allow_playlist_files,
         'clean_infojson': opts.clean_infojson,
@@ -919,7 +887,6 @@ def parse_options(argv=None):
         'max_views': opts.max_views,
         'daterange': opts.date,
         'cachedir': opts.cachedir,
-        'youtube_print_sig_code': opts.youtube_print_sig_code,
         'age_limit': opts.age_limit,
         'download_archive': opts.download_archive,
         'break_on_existing': opts.break_on_existing,
@@ -937,13 +904,9 @@ def parse_options(argv=None):
         'socket_timeout': opts.socket_timeout,
         'bidi_workaround': opts.bidi_workaround,
         'debug_printtraffic': opts.debug_printtraffic,
-        'prefer_ffmpeg': opts.prefer_ffmpeg,
-        'include_ads': opts.include_ads,
         'default_search': opts.default_search,
         'dynamic_mpd': opts.dynamic_mpd,
         'extractor_args': opts.extractor_args,
-        'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,
-        'youtube_include_hls_manifest': opts.youtube_include_hls_manifest,
         'encoding': opts.encoding,
         'extract_flat': opts.extract_flat,
         'live_from_start': opts.live_from_start,
@@ -955,7 +918,6 @@ def parse_options(argv=None):
         'fixup': opts.fixup,
         'source_address': opts.source_address,
         'impersonate': opts.impersonate,
-        'call_home': opts.call_home,
         'sleep_interval_requests': opts.sleep_interval_requests,
         'sleep_interval': opts.sleep_interval,
         'max_sleep_interval': opts.max_sleep_interval,
@@ -965,7 +927,6 @@ def parse_options(argv=None):
         'force_keyframes_at_cuts': opts.force_keyframes_at_cuts,
         'list_thumbnails': opts.list_thumbnails,
         'playlist_items': opts.playlist_items,
-        'xattr_set_filesize': opts.xattr_set_filesize,
         'match_filter': opts.match_filter,
         'color': opts.color,
         'ffmpeg_location': opts.ffmpeg_location,
@@ -974,7 +935,6 @@ def parse_options(argv=None):
         'hls_split_discontinuity': opts.hls_split_discontinuity,
         'external_downloader_args': opts.external_downloader_args,
         'postprocessor_args': opts.postprocessor_args,
-        'cn_verification_proxy': opts.cn_verification_proxy,
         'geo_verification_proxy': opts.geo_verification_proxy,
         'geo_bypass': opts.geo_bypass,
         'geo_bypass_country': opts.geo_bypass_country,
@@ -992,12 +952,6 @@ def _real_main(argv=None):
 
     parser, opts, all_urls, ydl_opts = parse_options(argv)
 
-    # Dump user agent
-    if opts.dump_user_agent:
-        ua = traverse_obj(opts.headers, 'User-Agent', casesense=False, default=std_headers['User-Agent'])
-        write_string(f'{ua}\n', out=sys.stdout)
-        return
-
     if print_extractor_information(opts, all_urls):
         return
 

yt_dlp/compat/__init__.py

@@ -1,3 +1,4 @@
+import datetime as dt
 import os
 import xml.etree.ElementTree as etree
 
@@ -27,6 +28,13 @@ def compat_ord(c):
     return c if isinstance(c, int) else ord(c)
 
 
+def compat_datetime_from_timestamp(timestamp):
+    # Calling dt.datetime.fromtimestamp with negative timestamps throws error in Windows
+    # Ref: https://github.com/yt-dlp/yt-dlp/issues/5185, https://github.com/python/cpython/issues/81708,
+    # https://github.com/yt-dlp/yt-dlp/issues/6706#issuecomment-1496842642
+    return (dt.datetime.fromtimestamp(0, dt.timezone.utc) + dt.timedelta(seconds=timestamp))
+
+
 # Python 3.8+ does not honor %HOME% on windows, but this breaks compatibility with youtube-dl
 # See https://github.com/yt-dlp/yt-dlp/issues/792
 # https://docs.python.org/3/library/os.path.html#os.path.expanduser

yt_dlp/downloader/common.py

@@ -62,7 +62,6 @@ class FileDownloader:
     test:               Download only first bytes to test the downloader.
     min_filesize:       Skip files smaller than this size
     max_filesize:       Skip files larger than this size
-    xattr_set_filesize: Set ytdl.filesize user xattribute with expected size.
     progress_delta:     The minimum time between progress output, in seconds
     external_downloader_args:  A dictionary of downloader keys (in lower case)
                         and a list of additional command-line arguments for the

yt_dlp/downloader/external.py

@@ -563,7 +563,7 @@ class FFmpegFD(ExternalFD):
                     f'{cookie.name}={cookie.value}; path={cookie.path}; domain={cookie.domain};\r\n'
                     for cookie in cookies)])
             if fmt.get('http_headers') and is_http:
-                # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
+                # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg:
                 # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
                 args.extend(['-headers', ''.join(f'{key}: {val}\r\n' for key, val in fmt['http_headers'].items())])
 
@@ -654,10 +654,6 @@ class FFmpegFD(ExternalFD):
             return retval
 
 
-class AVconvFD(FFmpegFD):
-    pass
-
-
 _BY_NAME = {
     klass.get_basename(): klass
     for name, klass in globals().items()

yt_dlp/downloader/f4m.py

@@ -149,14 +149,14 @@ class FlvReader(io.BytesIO):
         segments_count = self.read_unsigned_char()
         segments = []
         for _ in range(segments_count):
-            box_size, box_type, box_data = self.read_box_info()
+            _box_size, box_type, box_data = self.read_box_info()
             assert box_type == b'asrt'
             segment = FlvReader(box_data).read_asrt()
             segments.append(segment)
         fragments_run_count = self.read_unsigned_char()
         fragments = []
         for _ in range(fragments_run_count):
-            box_size, box_type, box_data = self.read_box_info()
+            _box_size, box_type, box_data = self.read_box_info()
             assert box_type == b'afrt'
             fragments.append(FlvReader(box_data).read_afrt())
 
@@ -167,7 +167,7 @@ class FlvReader(io.BytesIO):
         }
 
     def read_bootstrap_info(self):
-        total_size, box_type, box_data = self.read_box_info()
+        _, box_type, box_data = self.read_box_info()
         assert box_type == b'abst'
         return FlvReader(box_data).read_abst()
 
@@ -324,9 +324,9 @@ class F4mFD(FragmentFD):
         if requested_bitrate is None or len(formats) == 1:
             # get the best format
             formats = sorted(formats, key=lambda f: f[0])
-            rate, media = formats[-1]
+            _, media = formats[-1]
         else:
-            rate, media = next(filter(
+            _, media = next(filter(
                 lambda f: int(f[0]) == requested_bitrate, formats))
 
         # Prefer baseURL for relative URLs as per 11.2 of F4M 3.0 spec.

yt_dlp/downloader/http.py

@@ -13,12 +13,9 @@ from ..utils import (
     ContentTooShortError,
     RetryManager,
     ThrottledDownload,
-    XAttrMetadataError,
-    XAttrUnavailableError,
     int_or_none,
     parse_http_range,
     try_call,
-    write_xattr,
 )
 from ..utils.networking import HTTPHeaderDict
 
@@ -273,12 +270,6 @@ class HttpFD(FileDownloader):
                         self.report_error(f'unable to open for writing: {err}')
                         return False
 
-                    if self.params.get('xattr_set_filesize', False) and data_len is not None:
-                        try:
-                            write_xattr(ctx.tmpfilename, 'user.ytdl.filesize', str(data_len).encode())
-                        except (XAttrUnavailableError, XAttrMetadataError) as err:
-                            self.report_error(f'unable to set filesize xattr: {err}')
-
                 try:
                     ctx.stream.write(data_block)
                 except OSError as err:

yt_dlp/extractor/_extractors.py

@@ -424,7 +424,6 @@ from .cpac import (
     CPACPlaylistIE,
 )
 from .cracked import CrackedIE
-from .crackle import CrackleIE
 from .craftsy import CraftsyIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crowdbunker import (
@@ -444,10 +443,6 @@ from .curiositystream import (
     CuriosityStreamIE,
     CuriosityStreamSeriesIE,
 )
-from .cwtv import (
-    CWTVIE,
-    CWTVMovieIE,
-)
 from .cybrary import (
     CybraryCourseIE,
     CybraryIE,
@@ -1141,7 +1136,6 @@ from .mit import (
     OCWMITIE,
     TechTVMITIE,
 )
-from .mitele import MiTeleIE
 from .mixch import (
     MixchArchiveIE,
     MixchIE,
@@ -1433,6 +1427,7 @@ from .onet import (
     OnetPlIE,
 )
 from .onionstudios import OnionStudiosIE
+from .onsen import OnsenIE
 from .opencast import (
     OpencastIE,
     OpencastPlaylistIE,
@@ -1466,10 +1461,6 @@ from .panopto import (
     PanoptoListIE,
     PanoptoPlaylistIE,
 )
-from .paramountplus import (
-    ParamountPlusIE,
-    ParamountPlusSeriesIE,
-)
 from .parler import ParlerIE
 from .parlview import ParlviewIE
 from .parti import (
@@ -1523,10 +1514,6 @@ from .piramidetv import (
     PiramideTVChannelIE,
     PiramideTVIE,
 )
-from .pixivsketch import (
-    PixivSketchIE,
-    PixivSketchUserIE,
-)
 from .planetmarathi import PlanetMarathiIE
 from .platzi import (
     PlatziCourseIE,
@@ -1783,7 +1770,6 @@ from .rutube import (
     RutubePlaylistIE,
     RutubeTagsIE,
 )
-from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import (
     RuvIE,
@@ -1853,7 +1839,6 @@ from .simplecast import (
     SimplecastPodcastIE,
 )
 from .sina import SinaIE
-from .sixplay import SixPlayIE
 from .skeb import SkebIE
 from .sky import (
     SkyNewsIE,
@@ -1881,7 +1866,12 @@ from .skynewsau import SkyNewsAUIE
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
-from .smotrim import SmotrimIE
+from .smotrim import (
+    SmotrimAudioIE,
+    SmotrimIE,
+    SmotrimLiveIE,
+    SmotrimPlaylistIE,
+)
 from .snapchat import SnapchatSpotlightIE
 from .snotr import SnotrIE
 from .softwhiteunderbelly import SoftWhiteUnderbellyIE
@@ -1929,10 +1919,6 @@ from .spiegel import SpiegelIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .sportdeutschland import SportDeutschlandIE
-from .spotify import (
-    SpotifyIE,
-    SpotifyShowIE,
-)
 from .spreaker import (
     SpreakerIE,
     SpreakerShowIE,
@@ -2153,6 +2139,7 @@ from .tubitv import (
 )
 from .tumblr import TumblrIE
 from .tunein import (
+    TuneInEmbedIE,
     TuneInPodcastEpisodeIE,
     TuneInPodcastIE,
     TuneInShortenerIE,
@@ -2287,7 +2274,6 @@ from .utreon import UtreonIE
 from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veo import VeoIE
-from .vesti import VestiIE
 from .vevo import (
     VevoIE,
     VevoPlaylistIE,
@@ -2476,7 +2462,6 @@ from .wykop import (
     WykopPostCommentIE,
     WykopPostIE,
 )
-from .xanimu import XanimuIE
 from .xboxclips import XboxClipsIE
 from .xhamster import (
     XHamsterEmbedIE,

yt_dlp/extractor/applepodcasts.py

@@ -1,5 +1,6 @@
 from .common import InfoExtractor
 from ..utils import (
+    clean_html,
     clean_podcast_url,
     int_or_none,
     parse_iso8601,
@@ -17,7 +18,7 @@ class ApplePodcastsIE(InfoExtractor):
             'ext': 'mp3',
             'title': 'Ferreck Dawn - To The Break of Dawn 117',
             'episode': 'Ferreck Dawn - To The Break of Dawn 117',
-            'description': 'md5:1fc571102f79dbd0a77bfd71ffda23bc',
+            'description': 'md5:8c4f5c2c30af17ed6a98b0b9daf15b76',
             'upload_date': '20240812',
             'timestamp': 1723449600,
             'duration': 3596,
@@ -58,7 +59,7 @@ class ApplePodcastsIE(InfoExtractor):
             r'<script [^>]*\bid=["\']serialized-server-data["\'][^>]*>', webpage,
             'server data', episode_id, contains_pattern=r'\[{(?s:.+)}\]')[0]['data']
         model_data = traverse_obj(server_data, (
-            'headerButtonItems', lambda _, v: v['$kind'] == 'bookmark' and v['modelType'] == 'EpisodeOffer',
+            'headerButtonItems', lambda _, v: v['$kind'] == 'share' and v['modelType'] == 'EpisodeLockup',
             'model', {dict}, any))
 
         return {
@@ -68,7 +69,8 @@ class ApplePodcastsIE(InfoExtractor):
                 or self._yield_json_ld(webpage, episode_id, fatal=False), episode_id, fatal=False),
             **traverse_obj(model_data, {
                 'title': ('title', {str}),
-                'url': ('streamUrl', {clean_podcast_url}),
+                'description': ('summary', {clean_html}),
+                'url': ('playAction', 'episodeOffer', 'streamUrl', {clean_podcast_url}),
                 'timestamp': ('releaseDate', {parse_iso8601}),
                 'duration': ('duration', {int_or_none}),
             }),

yt_dlp/extractor/bilibili.py

@@ -1366,7 +1366,7 @@ class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
                 else:
                     yield self.url_result(f'https://www.bilibili.com/video/{entry["bvid"]}', BiliBiliIE, entry['bvid'])
 
-        metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
+        _, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
         return self.playlist_result(paged_list, playlist_id)
 
 
@@ -1400,7 +1400,7 @@ class BilibiliSpaceAudioIE(BilibiliSpaceBaseIE):
             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)
+        _, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
         return self.playlist_result(paged_list, playlist_id)
 
 

yt_dlp/extractor/brainpop.py

@@ -174,7 +174,7 @@ class BrainPOPLegacyBaseIE(BrainPOPBaseIE):
         }
 
     def _real_extract(self, url):
-        slug, display_id = self._match_valid_url(url).group('slug', 'id')
+        display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         topic_data = self._search_json(
             r'var\s+content\s*=\s*', webpage, 'content data',

yt_dlp/extractor/cbsnews.py

@@ -5,8 +5,6 @@ import zlib
 
 from .anvato import AnvatoIE
 from .common import InfoExtractor
-from .paramountplus import ParamountPlusIE
-from ..networking import HEADRequest
 from ..utils import (
     ExtractorError,
     UserNotLive,
@@ -132,13 +130,7 @@ class CBSNewsEmbedIE(CBSNewsBaseIE):
         video_id = item['mpxRefId']
         video_url = self._get_video_url(item)
         if not video_url:
-            # Old embeds redirect user to ParamountPlus but most links are 404
-            pplus_url = f'https://www.paramountplus.com/shows/video/{video_id}'
-            try:
-                self._request_webpage(HEADRequest(pplus_url), video_id)
-                return self.url_result(pplus_url, ParamountPlusIE)
-            except ExtractorError:
-                self.raise_no_formats('This video is no longer available', True, video_id)
+            raise ExtractorError('This video is no longer available', expected=True)
 
         return self._extract_video(item, video_url, video_id)
 

yt_dlp/extractor/cnn.py

@@ -272,6 +272,7 @@ class CNNIndonesiaIE(InfoExtractor):
         return merge_dicts(json_ld_data, {
             '_type': 'url_transparent',
             'url': embed_url,
+            'id': video_id,
             'upload_date': upload_date,
             'tags': try_call(lambda: self._html_search_meta('keywords', webpage).split(', ')),
         })

yt_dlp/extractor/crackle.py

@@ -1,243 +0,0 @@
-import hashlib
-import hmac
-import re
-import time
-
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    determine_ext,
-    float_or_none,
-    int_or_none,
-    orderedSet,
-    parse_age_limit,
-    parse_duration,
-    url_or_none,
-)
-
-
-class CrackleIE(InfoExtractor):
-    _VALID_URL = r'(?:crackle:|https?://(?:(?:www|m)\.)?(?:sony)?crackle\.com/(?:playlist/\d+/|(?:[^/]+/)+))(?P<id>\d+)'
-    _TESTS = [{
-        # Crackle is available in the United States and territories
-        'url': 'https://www.crackle.com/thanksgiving/2510064',
-        'info_dict': {
-            'id': '2510064',
-            'ext': 'mp4',
-            'title': 'Touch Football',
-            'description': 'md5:cfbb513cf5de41e8b56d7ab756cff4df',
-            'duration': 1398,
-            'view_count': int,
-            'average_rating': 0,
-            'age_limit': 17,
-            'genre': 'Comedy',
-            'creator': 'Daniel Powell',
-            'artist': 'Chris Elliott, Amy Sedaris',
-            'release_year': 2016,
-            'series': 'Thanksgiving',
-            'episode': 'Touch Football',
-            'season_number': 1,
-            'episode_number': 1,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'expected_warnings': [
-            'Trying with a list of known countries',
-        ],
-    }, {
-        'url': 'https://www.sonycrackle.com/thanksgiving/2510064',
-        'only_matching': True,
-    }]
-
-    _MEDIA_FILE_SLOTS = {
-        '360p.mp4': {
-            'width': 640,
-            'height': 360,
-        },
-        '480p.mp4': {
-            'width': 768,
-            'height': 432,
-        },
-        '480p_1mbps.mp4': {
-            'width': 852,
-            'height': 480,
-        },
-    }
-
-    def _download_json(self, url, *args, **kwargs):
-        # Authorization generation algorithm is reverse engineered from:
-        # https://www.sonycrackle.com/static/js/main.ea93451f.chunk.js
-        timestamp = time.strftime('%Y%m%d%H%M', time.gmtime())
-        h = hmac.new(b'IGSLUQCBDFHEOIFM', '|'.join([url, timestamp]).encode(), hashlib.sha1).hexdigest().upper()
-        headers = {
-            'Accept': 'application/json',
-            'Authorization': '|'.join([h, timestamp, '117', '1']),
-        }
-        return InfoExtractor._download_json(self, url, *args, headers=headers, **kwargs)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        geo_bypass_country = self.get_param('geo_bypass_country', None)
-        countries = orderedSet((geo_bypass_country, 'US', 'AU', 'CA', 'AS', 'FM', 'GU', 'MP', 'PR', 'PW', 'MH', 'VI', ''))
-        num_countries, num = len(countries) - 1, 0
-
-        media = {}
-        for num, country in enumerate(countries):
-            if num == 1:  # start hard-coded list
-                self.report_warning('%s. Trying with a list of known countries' % (
-                    f'Unable to obtain video formats from {geo_bypass_country} API' if geo_bypass_country
-                    else 'No country code was given using --geo-bypass-country'))
-            elif num == num_countries:  # end of list
-                geo_info = self._download_json(
-                    'https://web-api-us.crackle.com/Service.svc/geo/country',
-                    video_id, fatal=False, note='Downloading geo-location information from crackle API',
-                    errnote='Unable to fetch geo-location information from crackle') or {}
-                country = geo_info.get('CountryCode')
-                if country is None:
-                    continue
-                self.to_screen(f'{self.IE_NAME} identified country as {country}')
-                if country in countries:
-                    self.to_screen(f'Downloading from {country} API was already attempted. Skipping...')
-                    continue
-
-            if country is None:
-                continue
-            try:
-                media = self._download_json(
-                    f'https://web-api-us.crackle.com/Service.svc/details/media/{video_id}/{country}?disableProtocols=true',
-                    video_id, note=f'Downloading media JSON from {country} API',
-                    errnote='Unable to download media JSON')
-            except ExtractorError as e:
-                # 401 means geo restriction, trying next country
-                if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                    continue
-                raise
-
-            status = media.get('status')
-            if status.get('messageCode') != '0':
-                raise ExtractorError(
-                    '{} said: {} {} - {}'.format(
-                        self.IE_NAME, status.get('messageCodeDescription'), status.get('messageCode'), status.get('message')),
-                    expected=True)
-
-            # Found video formats
-            if isinstance(media.get('MediaURLs'), list):
-                break
-
-        ignore_no_formats = self.get_param('ignore_no_formats_error')
-
-        if not media or (not media.get('MediaURLs') and not ignore_no_formats):
-            raise ExtractorError(
-                'Unable to access the crackle API. Try passing your country code '
-                'to --geo-bypass-country. If it still does not work and the '
-                'video is available in your country')
-        title = media['Title']
-
-        formats, subtitles = [], {}
-        has_drm = False
-        for e in media.get('MediaURLs') or []:
-            if e.get('UseDRM'):
-                has_drm = True
-                format_url = url_or_none(e.get('DRMPath'))
-            else:
-                format_url = url_or_none(e.get('Path'))
-            if not format_url:
-                continue
-            ext = determine_ext(format_url)
-            if ext == 'm3u8':
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    format_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id='hls', fatal=False)
-                formats.extend(fmts)
-                subtitles = self._merge_subtitles(subtitles, subs)
-            elif ext == 'mpd':
-                fmts, subs = self._extract_mpd_formats_and_subtitles(
-                    format_url, video_id, mpd_id='dash', fatal=False)
-                formats.extend(fmts)
-                subtitles = self._merge_subtitles(subtitles, subs)
-            elif format_url.endswith('.ism/Manifest'):
-                fmts, subs = self._extract_ism_formats_and_subtitles(
-                    format_url, video_id, ism_id='mss', fatal=False)
-                formats.extend(fmts)
-                subtitles = self._merge_subtitles(subtitles, subs)
-            else:
-                mfs_path = e.get('Type')
-                mfs_info = self._MEDIA_FILE_SLOTS.get(mfs_path)
-                if not mfs_info:
-                    continue
-                formats.append({
-                    'url': format_url,
-                    'format_id': 'http-' + mfs_path.split('.')[0],
-                    'width': mfs_info['width'],
-                    'height': mfs_info['height'],
-                })
-        if not formats and has_drm:
-            self.report_drm(video_id)
-
-        description = media.get('Description')
-        duration = int_or_none(media.get(
-            'DurationInSeconds')) or parse_duration(media.get('Duration'))
-        view_count = int_or_none(media.get('CountViews'))
-        average_rating = float_or_none(media.get('UserRating'))
-        age_limit = parse_age_limit(media.get('Rating'))
-        genre = media.get('Genre')
-        release_year = int_or_none(media.get('ReleaseYear'))
-        creator = media.get('Directors')
-        artist = media.get('Cast')
-
-        if media.get('MediaTypeDisplayValue') == 'Full Episode':
-            series = media.get('ShowName')
-            episode = title
-            season_number = int_or_none(media.get('Season'))
-            episode_number = int_or_none(media.get('Episode'))
-        else:
-            series = episode = season_number = episode_number = None
-
-        cc_files = media.get('ClosedCaptionFiles')
-        if isinstance(cc_files, list):
-            for cc_file in cc_files:
-                if not isinstance(cc_file, dict):
-                    continue
-                cc_url = url_or_none(cc_file.get('Path'))
-                if not cc_url:
-                    continue
-                lang = cc_file.get('Locale') or 'en'
-                subtitles.setdefault(lang, []).append({'url': cc_url})
-
-        thumbnails = []
-        images = media.get('Images')
-        if isinstance(images, list):
-            for image_key, image_url in images.items():
-                mobj = re.search(r'Img_(\d+)[xX](\d+)', image_key)
-                if not mobj:
-                    continue
-                thumbnails.append({
-                    'url': image_url,
-                    'width': int(mobj.group(1)),
-                    'height': int(mobj.group(2)),
-                })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'view_count': view_count,
-            'average_rating': average_rating,
-            'age_limit': age_limit,
-            'genre': genre,
-            'creator': creator,
-            'artist': artist,
-            'release_year': release_year,
-            'series': series,
-            'episode': episode,
-            'season_number': season_number,
-            'episode_number': episode_number,
-            'thumbnails': thumbnails,
-            'subtitles': subtitles,
-            'formats': formats,
-        }

yt_dlp/extractor/cwtv.py

@@ -1,180 +0,0 @@
-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|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',
-        'info_dict': {
-            'id': '9149a1e1-4cb2-46d7-81b2-47d35bbd332b',
-            'ext': 'mp4',
-            'title': 'A Stitch in Time',
-            'description': r're:(?s)City Protective Services officer Kiera Cameron is transported from 2077.+',
-            'thumbnail': r're:https?://.+\.jpe?g',
-            'duration': 2632,
-            'timestamp': 1736928000,
-            'uploader': 'CWTV',
-            'chapters': 'count:5',
-            'series': 'Continuum',
-            'season_number': 1,
-            'episode_number': 1,
-            'age_limit': 14,
-            'upload_date': '20250115',
-            'season': 'Season 1',
-            'episode': 'Episode 1',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://cwtv.com/shows/arrow/legends-of-yesterday/?play=6b15e985-9345-4f60-baf8-56e96be57c63',
-        'info_dict': {
-            '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.+',
-            'duration': 2665,
-            'series': 'Arrow',
-            'season_number': 4,
-            'season': '4',
-            'episode_number': 8,
-            'upload_date': '20151203',
-            'timestamp': 1449122100,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'skip': 'redirect to http://cwtv.com/shows/arrow/',
-    }, {
-        'url': 'http://www.cwseed.com/shows/whose-line-is-it-anyway/jeff-davis-4/?play=24282b12-ead2-42f2-95ad-26770c2c6088',
-        'info_dict': {
-            'id': '24282b12-ead2-42f2-95ad-26770c2c6088',
-            'ext': 'mp4',
-            'title': 'Jeff Davis 4',
-            'description': 'Jeff Davis is back to make you laugh.',
-            'duration': 1263,
-            'series': 'Whose Line Is It Anyway?',
-            'season_number': 11,
-            'episode_number': 20,
-            'upload_date': '20151006',
-            'timestamp': 1444107300,
-            'age_limit': 14,
-            'uploader': 'CWTV',
-            'thumbnail': r're:https?://.+\.jpe?g',
-            'chapters': 'count:4',
-            'episode': 'Episode 20',
-            'season': 'Season 11',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://cwtv.com/thecw/chroniclesofcisco/?play=8adebe35-f447-465f-ab52-e863506ff6d6',
-        'only_matching': True,
-    }, {
-        'url': 'http://cwtvpr.com/the-cw/video?watch=9eee3f60-ef4e-440b-b3b2-49428ac9c54e',
-        'only_matching': True,
-    }, {
-        '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)
-        if traverse_obj(data, 'result') != 'ok':
-            raise ExtractorError(traverse_obj(data, (('error_msg', 'msg'), {str}, any)), expected=True)
-        video_data = data['video']
-        title = video_data['title']
-        mpx_url = update_url_query(
-            video_data.get('mpx_url') or f'https://link.theplatform.com/s/cwtv/media/guid/2703454149/{video_id}',
-            {'formats': 'M3U+none'})
-
-        season = str_or_none(video_data.get('season'))
-        episode = str_or_none(video_data.get('episode'))
-        if episode and season:
-            episode = episode[len(season):]
-
-        return {
-            '_type': 'url_transparent',
-            'id': video_id,
-            'title': title,
-            'url': smuggle_url(mpx_url, {'force_smil_url': True}),
-            'description': video_data.get('description_long'),
-            'duration': int_or_none(video_data.get('duration_secs')),
-            'series': video_data.get('series_name'),
-            'season_number': int_or_none(season),
-            'episode_number': int_or_none(episode),
-            'timestamp': parse_iso8601(video_data.get('start_time')),
-            'age_limit': parse_age_limit(video_data.get('rating')),
-            '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/fifa.py

@@ -7,7 +7,7 @@ from ..utils import (
 
 
 class FifaIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.fifa\.com/fifaplus/(?P<locale>\w{2})/watch/([^#?]+/)?(?P<id>\w+)'
+    _VALID_URL = r'https?://www\.fifa\.com/fifaplus/\w{2}/watch/([^#?]+/)?(?P<id>\w+)'
     _TESTS = [{
         'url': 'https://www.fifa.com/fifaplus/en/watch/7on10qPcnyLajDDU3ntg6y',
         'info_dict': {
@@ -51,7 +51,7 @@ class FifaIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        video_id, locale = self._match_valid_url(url).group('id', 'locale')
+        video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
         preconnect_link = self._search_regex(

yt_dlp/extractor/flextv.py

@@ -3,15 +3,19 @@ from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     UserNotLive,
+    int_or_none,
+    join_nonempty,
     parse_iso8601,
     str_or_none,
-    traverse_obj,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class FlexTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?flextv\.co\.kr/channels/(?P<id>\d+)/live'
+    IE_NAME = 'ttinglive'
+    IE_DESC = '띵라이브 (formerly FlexTV)'
+    _VALID_URL = r'https?://(?:www\.)?(?:ttinglive\.com|flextv\.co\.kr)/channels/(?P<id>\d+)/live'
     _TESTS = [{
         'url': 'https://www.flextv.co.kr/channels/231638/live',
         'info_dict': {
@@ -36,21 +40,32 @@ class FlexTVIE(InfoExtractor):
 
         try:
             stream_data = self._download_json(
-                f'https://api.flextv.co.kr/api/channels/{channel_id}/stream',
+                f'https://api.ttinglive.com/api/channels/{channel_id}/stream',
                 channel_id, query={'option': 'all'})
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 400:
                 raise UserNotLive(video_id=channel_id)
             raise
 
-        playlist_url = stream_data['sources'][0]['url']
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-            playlist_url, channel_id, 'mp4')
+        formats = []
+        for stream in traverse_obj(stream_data, ('sources', ..., {dict})):
+            if stream.get('format') == 'ivs' and url_or_none(stream.get('url')):
+                formats.extend(self._extract_m3u8_formats(
+                    stream['url'], channel_id, 'mp4', live=True, fatal=False, m3u8_id='ivs'))
+            for format_type in ['hls', 'flv']:
+                for data in traverse_obj(stream, (
+                        'urlDetail', format_type, 'resolution', lambda _, v: url_or_none(v['url']))):
+                    formats.append({
+                        'format_id': join_nonempty(format_type, data.get('suffixName'), delim=''),
+                        'url': data['url'],
+                        'height': int_or_none(data.get('resolution')),
+                        'ext': 'mp4' if format_type == 'hls' else 'flv',
+                        'protocol': 'm3u8_native' if format_type == 'hls' else 'http',
+                    })
 
         return {
             'id': channel_id,
             'formats': formats,
-            'subtitles': subtitles,
             'is_live': True,
             **traverse_obj(stream_data, {
                 'title': ('stream', 'title', {str}),

yt_dlp/extractor/loco.py

@@ -37,7 +37,7 @@ class LocoIE(InfoExtractor):
         },
     }, {
         'url': 'https://loco.com/stream/c64916eb-10fb-46a9-9a19-8c4b7ed064e7',
-        'md5': '45ebc8a47ee1c2240178757caf8881b5',
+        'md5': '8b9bda03eba4d066928ae8d71f19befb',
         'info_dict': {
             'id': 'c64916eb-10fb-46a9-9a19-8c4b7ed064e7',
             'ext': 'mp4',
@@ -55,9 +55,9 @@ class LocoIE(InfoExtractor):
             'tags': ['Gameplay'],
             'series': 'GTA 5',
             'timestamp': 1740612872,
-            'modified_timestamp': 1740613037,
+            'modified_timestamp': 1750948439,
             'upload_date': '20250226',
-            'modified_date': '20250226',
+            'modified_date': '20250626',
         },
     }, {
         # Requires video authorization
@@ -123,8 +123,8 @@ class LocoIE(InfoExtractor):
     def _real_extract(self, url):
         video_type, video_id = self._match_valid_url(url).group('type', 'id')
         webpage = self._download_webpage(url, video_id)
-        stream = traverse_obj(self._search_nextjs_data(webpage, video_id), (
-            'props', 'pageProps', ('liveStreamData', 'stream', 'liveStream'), {dict}, any, {require('stream info')}))
+        stream = traverse_obj(self._search_nextjs_v13_data(webpage, video_id), (
+            ..., (None, 'ssrData'), ('liveStreamData', 'stream', 'liveStream'), {dict}, any, {require('stream info')}))
 
         if access_token := self._get_access_token(video_id):
             self._request_webpage(

yt_dlp/extractor/mitele.py

@@ -1,102 +0,0 @@
-from .telecinco import TelecincoBaseIE
-from ..utils import (
-    int_or_none,
-    parse_iso8601,
-)
-
-
-class MiTeleIE(TelecincoBaseIE):
-    IE_DESC = 'mitele.es'
-    _VALID_URL = r'https?://(?:www\.)?mitele\.es/(?:[^/]+/)+(?P<id>[^/]+)/player'
-    _TESTS = [{
-        'url': 'http://www.mitele.es/programas-tv/diario-de/57b0dfb9c715da65618b4afa/player',
-        'info_dict': {
-            'id': 'FhYW1iNTE6J6H7NkQRIEzfne6t2quqPg',
-            'ext': 'mp4',
-            'title': 'Diario de La redacción Programa 144',
-            'description': 'md5:07c35a7b11abb05876a6a79185b58d27',
-            'series': 'Diario de',
-            'season': 'Season 14',
-            'season_number': 14,
-            'episode': 'Tor, la web invisible',
-            'episode_number': 3,
-            'thumbnail': r're:(?i)^https?://.*\.jpg$',
-            'duration': 2913,
-            'age_limit': 16,
-            'timestamp': 1471209401,
-            'upload_date': '20160814',
-        },
-        'skip': 'HTTP Error 404 Not Found',
-    }, {
-        # no explicit title
-        'url': 'http://www.mitele.es/programas-tv/cuarto-milenio/57b0de3dc915da14058b4876/player',
-        'info_dict': {
-            'id': 'oyNG1iNTE6TAPP-JmCjbwfwJqqMMX3Vq',
-            'ext': 'mp4',
-            'title': 'Cuarto Milenio Temporada 6 Programa 226',
-            'description': 'md5:5ff132013f0cd968ffbf1f5f3538a65f',
-            'series': 'Cuarto Milenio',
-            'season': 'Season 6',
-            'season_number': 6,
-            'episode': 'Episode 24',
-            'episode_number': 24,
-            'thumbnail': r're:(?i)^https?://.*\.jpg$',
-            'duration': 7313,
-            'age_limit': 12,
-            'timestamp': 1471209021,
-            'upload_date': '20160814',
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'HTTP Error 404 Not Found',
-    }, {
-        'url': 'https://www.mitele.es/programas-tv/horizonte/temporada-5/programa-171-40_013480051/player/',
-        'info_dict': {
-            'id': '7adbe22e-cd41-4787-afa4-36f3da7c2c6f',
-            'ext': 'mp4',
-            'title': 'Horizonte Temporada 5 Programa 171',
-            'description': 'md5:97f1fb712c5ac27e5693a8b3c5c0c6e3',
-            'episode': 'Las Zonas de Bajas Emisiones, a debate',
-            'episode_number': 171,
-            'season': 'Season 5',
-            'season_number': 5,
-            'series': 'Horizonte',
-            'duration': 7012,
-            'upload_date': '20240927',
-            'timestamp': 1727416450,
-            'thumbnail': 'https://album.mediaset.es/eimg/2024/09/27/horizonte-171_9f02.jpg',
-            'age_limit': 12,
-        },
-        'params': {'geo_bypass_country': 'ES'},
-    }, {
-        'url': 'http://www.mitele.es/series-online/la-que-se-avecina/57aac5c1c915da951a8b45ed/player',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144-40_1006364575251/player/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        pre_player = self._search_json(
-            r'window\.\$REACTBASE_STATE\.prePlayer_mtweb\s*=',
-            webpage, 'Pre Player', display_id)['prePlayer']
-        title = pre_player['title']
-        video_info = self._parse_content(pre_player['video'], url)
-        content = pre_player.get('content') or {}
-        info = content.get('info') or {}
-
-        video_info.update({
-            'title': title,
-            'description': info.get('synopsis'),
-            'series': content.get('title'),
-            'season_number': int_or_none(info.get('season_number')),
-            'episode': content.get('subtitle'),
-            'episode_number': int_or_none(info.get('episode_number')),
-            'duration': int_or_none(info.get('duration')),
-            'age_limit': int_or_none(info.get('rating')),
-            'timestamp': parse_iso8601(pre_player.get('publishedTime')),
-        })
-        return video_info

yt_dlp/extractor/newspicks.py

@@ -50,7 +50,14 @@ class NewsPicksIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         fragment = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['fragment']
-        m3u8_url = traverse_obj(fragment, ('movie', 'movieUrl', {url_or_none}, {require('m3u8 URL')}))
+        movie = fragment['movie']
+
+        if traverse_obj(movie, ('viewable', {str})) == 'PARTIAL_FREE' and not traverse_obj(movie, ('canWatch', {bool})):
+            self.report_warning(
+                'Full video is for Premium members. Without cookies, '
+                f'only the preview is downloaded. {self._login_hint()}', video_id)
+
+        m3u8_url = traverse_obj(movie, ('movieUrl', {url_or_none}, {require('m3u8 URL')}))
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, 'mp4')
 
         return {
@@ -59,12 +66,12 @@ class NewsPicksIE(InfoExtractor):
             'series': traverse_obj(fragment, ('series', 'title', {str})),
             'series_id': series_id,
             'subtitles': subtitles,
-            **traverse_obj(fragment, ('movie', {
+            **traverse_obj(movie, {
                 'title': ('title', {str}),
                 'cast': ('relatedUsers', ..., 'displayName', {str}, filter, all, filter),
                 'description': ('explanation', {clean_html}),
                 'release_timestamp': ('onAirStartDate', {parse_iso8601}),
                 'thumbnail': (('image', 'coverImageUrl'), {url_or_none}, any),
                 'timestamp': ('published', {parse_iso8601}),
-            })),
+            }),
         }

yt_dlp/extractor/nowness.py

@@ -129,7 +129,7 @@ class NownessSeriesIE(NownessBaseIE):
     }
 
     def _real_extract(self, url):
-        display_id, series = self._api_request(url, 'series/getBySlug/%s')
+        _, series = self._api_request(url, 'series/getBySlug/%s')
         entries = [self._extract_url_result(post) for post in series['posts']]
         series_title = None
         series_description = None

yt_dlp/extractor/onsen.py

@@ -0,0 +1,151 @@
+import base64
+import json
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    int_or_none,
+    parse_qs,
+    str_or_none,
+    strftime_or_none,
+    update_url,
+    update_url_query,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class OnsenIE(InfoExtractor):
+    IE_NAME = 'onsen'
+    IE_DESC = 'インターネットラジオステーション＜音泉＞'
+
+    _BASE_URL = 'https://www.onsen.ag'
+    _HEADERS = {'Referer': f'{_BASE_URL}/'}
+    _NETRC_MACHINE = 'onsen'
+    _VALID_URL = r'https?://(?:(?:share|www)\.)onsen\.ag/program/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://share.onsen.ag/program/onsenking?p=90&c=MTA0NjI',
+        'info_dict': {
+            'id': '10462',
+            'ext': 'm4a',
+            'title': '第SP回',
+            'cast': 'count:3',
+            'description': 'md5:de62c80a41c4c8d84da53a1ee681ad18',
+            'display_id': 'MTA0NjI=',
+            'media_type': 'sound',
+            'section_start': 0,
+            'series': '音泉キング「下野紘」のラジオ きみはもちろん、＜音泉＞ファミリーだよね？',
+            'series_id': 'onsenking',
+            'tags': 'count:2',
+            'thumbnail': r're:https?://d3bzklg4lms4gh\.cloudfront\.net/program_info/image/default/production/.+',
+            'upload_date': '20220627',
+            'webpage_url': 'https://www.onsen.ag/program/onsenking?c=MTA0NjI=',
+        },
+    }, {
+        'url': 'https://share.onsen.ag/program/girls-band-cry-radio?p=370&c=MTgwMDE',
+        'info_dict': {
+            'id': '18001',
+            'ext': 'mp4',
+            'title': '第4回',
+            'cast': 'count:5',
+            'description': 'md5:bbca8a389d99c90cbbce8f383c85fedd',
+            'display_id': 'MTgwMDE=',
+            'media_type': 'movie',
+            'section_start': 0,
+            'series': 'TVアニメ『ガールズバンドクライ』WEBラジオ「ガールズバンドクライ～ラジオにも全部ぶち込め。～」',
+            'series_id': 'girls-band-cry-radio',
+            'tags': 'count:3',
+            'thumbnail': r're:https?://d3bzklg4lms4gh\.cloudfront\.net/program_info/image/default/production/.+',
+            'upload_date': '20240425',
+            'webpage_url': 'https://www.onsen.ag/program/girls-band-cry-radio?c=MTgwMDE=',
+        },
+        'skip': 'Only available for premium supporters',
+    }, {
+        'url': 'https://www.onsen.ag/program/uma',
+        'info_dict': {
+            'id': 'uma',
+            'title': 'UMA YELL RADIO',
+        },
+        'playlist_mincount': 35,
+    }]
+
+    @staticmethod
+    def _get_encoded_id(program):
+        return base64.urlsafe_b64encode(str(program['id']).encode()).decode()
+
+    def _perform_login(self, username, password):
+        sign_in = self._download_json(
+            f'{self._BASE_URL}/web_api/signin', None, 'Logging in', headers={
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+            }, data=json.dumps({
+                'session': {
+                    'email': username,
+                    'password': password,
+                },
+            }).encode(), expected_status=401)
+
+        if sign_in.get('error'):
+            raise ExtractorError('Invalid username or password', expected=True)
+
+    def _real_extract(self, url):
+        program_id = self._match_id(url)
+        try:
+            programs = self._download_json(
+                f'{self._BASE_URL}/web_api/programs/{program_id}', program_id)
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 404:
+                raise ExtractorError('Invalid URL', expected=True)
+            raise
+
+        query = {k: v[-1] for k, v in parse_qs(url).items() if v}
+        if 'c' not in query:
+            entries = [
+                self.url_result(update_url_query(url, {'c': self._get_encoded_id(program)}), OnsenIE)
+                for program in traverse_obj(programs, ('contents', lambda _, v: v['id']))
+            ]
+
+            return self.playlist_result(
+                entries, program_id, traverse_obj(programs, ('program_info', 'title', {clean_html})))
+
+        raw_id = base64.urlsafe_b64decode(f'{query["c"]}===').decode()
+        p_keys = ('contents', lambda _, v: v['id'] == int(raw_id))
+
+        program = traverse_obj(programs, (*p_keys, any))
+        if not program:
+            raise ExtractorError(
+                'This program is no longer available', expected=True)
+        m3u8_url = traverse_obj(program, ('streaming_url', {url_or_none}))
+        if not m3u8_url:
+            self.raise_login_required(
+                'This program is only available for premium supporters')
+
+        display_id = self._get_encoded_id(program)
+        date_str = self._search_regex(
+            rf'{program_id}0?(\d{{6}})', m3u8_url, 'date string', default=None)
+
+        return {
+            'display_id': display_id,
+            'formats': self._extract_m3u8_formats(m3u8_url, raw_id, headers=self._HEADERS),
+            'http_headers': self._HEADERS,
+            'section_start': int_or_none(query.get('t', 0)),
+            'upload_date': strftime_or_none(f'20{date_str}'),
+            'webpage_url': f'{self._BASE_URL}/program/{program_id}?c={display_id}',
+            **traverse_obj(program, {
+                'id': ('id', {int}, {str_or_none}),
+                'title': ('title', {clean_html}),
+                'media_type': ('media_type', {str}),
+                'thumbnail': ('poster_image_url', {url_or_none}, {update_url(query=None)}),
+            }),
+            **traverse_obj(programs, {
+                'cast': (('performers', (*p_keys, 'guests')), ..., 'name', {str}, filter),
+                'series_id': ('directory_name', {str}),
+            }),
+            **traverse_obj(programs, ('program_info', {
+                'description': ('description', {clean_html}, filter),
+                'series': ('title', {clean_html}),
+                'tags': ('hashtag_list', ..., {str}, filter),
+            })),
+        }

yt_dlp/extractor/paramountplus.py

@@ -1,201 +0,0 @@
-import itertools
-
-from .cbs import CBSBaseIE
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    url_or_none,
-)
-
-
-class ParamountPlusIE(CBSBaseIE):
-    _VALID_URL = r'''(?x)
-        (?:
-            paramountplus:|
-            https?://(?:www\.)?(?:
-                paramountplus\.com/(?:shows|movies)/(?:video|[^/]+/video|[^/]+)/
-        )(?P<id>[\w-]+))'''
-
-    # All tests are blocked outside US
-    _TESTS = [{
-        'url': 'https://www.paramountplus.com/shows/video/Oe44g5_NrlgiZE3aQVONleD6vXc8kP0k/',
-        'info_dict': {
-            'id': 'Oe44g5_NrlgiZE3aQVONleD6vXc8kP0k',
-            'ext': 'mp4',
-            'title': 'CatDog - Climb Every CatDog/The Canine Mutiny',
-            'description': 'md5:7ac835000645a69933df226940e3c859',
-            'duration': 1426,
-            'timestamp': 920264400,
-            'upload_date': '19990301',
-            'uploader': 'CBSI-NEW',
-            'episode_number': 5,
-            'thumbnail': r're:https?://.+\.jpg$',
-            'season': 'Season 2',
-            'chapters': 'count:3',
-            'episode': 'Episode 5',
-            'season_number': 2,
-            'series': 'CatDog',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-    }, {
-        'url': 'https://www.paramountplus.com/shows/video/6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd/',
-        'info_dict': {
-            'id': '6hSWYWRrR9EUTz7IEe5fJKBhYvSUfexd',
-            'ext': 'mp4',
-            'title': '7/23/21 WEEK IN REVIEW (Rep. Jahana Hayes/Howard Fineman/Sen. Michael Bennet/Sheera Frenkel & Cecilia Kang)',
-            'description': 'md5:f4adcea3e8b106192022e121f1565bae',
-            'duration': 2506,
-            'timestamp': 1627063200,
-            'upload_date': '20210723',
-            'uploader': 'CBSI-NEW',
-            'episode_number': 81,
-            'thumbnail': r're:https?://.+\.jpg$',
-            'season': 'Season 2',
-            'chapters': 'count:4',
-            'episode': 'Episode 81',
-            'season_number': 2,
-            'series': 'Tooning Out The News',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-    }, {
-        'url': 'https://www.paramountplus.com/movies/video/vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC/',
-        'info_dict': {
-            'id': 'vM2vm0kE6vsS2U41VhMRKTOVHyQAr6pC',
-            'ext': 'mp4',
-            'title': 'Daddy\'s Home',
-            'upload_date': '20151225',
-            'description': 'md5:9a6300c504d5e12000e8707f20c54745',
-            'uploader': 'CBSI-NEW',
-            'timestamp': 1451030400,
-            'thumbnail': r're:https?://.+\.jpg$',
-            'chapters': 'count:0',
-            'duration': 5761,
-            'series': 'Paramount+ Movies',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-        'skip': 'DRM',
-    }, {
-        'url': 'https://www.paramountplus.com/movies/video/5EKDXPOzdVf9voUqW6oRuocyAEeJGbEc/',
-        'info_dict': {
-            'id': '5EKDXPOzdVf9voUqW6oRuocyAEeJGbEc',
-            'ext': 'mp4',
-            'uploader': 'CBSI-NEW',
-            'description': 'md5:bc7b6fea84ba631ef77a9bda9f2ff911',
-            'timestamp': 1577865600,
-            'title': 'Sonic the Hedgehog',
-            'upload_date': '20200101',
-            'thumbnail': r're:https?://.+\.jpg$',
-            'chapters': 'count:0',
-            'duration': 5932,
-            'series': 'Paramount+ Movies',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-        'skip': 'DRM',
-    }, {
-        'url': 'https://www.paramountplus.com/shows/the-real-world/video/mOVeHeL9ub9yWdyzSZFYz8Uj4ZBkVzQg/the-real-world-reunion/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.paramountplus.com/shows/video/mOVeHeL9ub9yWdyzSZFYz8Uj4ZBkVzQg/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.paramountplus.com/movies/video/W0VyStQqUnqKzJkrpSAIARuCc9YuYGNy/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.paramountplus.com/movies/paw-patrol-the-movie/W0VyStQqUnqKzJkrpSAIARuCc9YuYGNy/',
-        'only_matching': True,
-    }]
-
-    def _extract_video_info(self, content_id, mpx_acc=2198311517):
-        items_data = self._download_json(
-            f'https://www.paramountplus.com/apps-api/v2.0/androidtv/video/cid/{content_id}.json',
-            content_id, query={
-                'locale': 'en-us',
-                'at': 'ABCXgPuoStiPipsK0OHVXIVh68zNys+G4f7nW9R6qH68GDOcneW6Kg89cJXGfiQCsj0=',
-            }, headers=self.geo_verification_headers())
-
-        asset_types = {
-            item.get('assetType'): {
-                'format': 'SMIL',
-                'formats': 'M3U+none,MPEG4',  # '+none' specifies ProtectionScheme (no DRM)
-            } for item in items_data['itemList']
-        }
-        item = items_data['itemList'][-1]
-
-        info, error = {}, None
-        metadata = {
-            'title': item.get('title'),
-            'series': item.get('seriesTitle'),
-            'season_number': int_or_none(item.get('seasonNum')),
-            'episode_number': int_or_none(item.get('episodeNum')),
-            'duration': int_or_none(item.get('duration')),
-            'thumbnail': url_or_none(item.get('thumbnail')),
-        }
-        try:
-            info = self._extract_common_video_info(content_id, asset_types, mpx_acc, extra_info=metadata)
-        except ExtractorError as e:
-            error = e
-
-        # Check for DRM formats to give appropriate error
-        if not info.get('formats'):
-            for query in asset_types.values():
-                query['formats'] = 'MPEG-DASH,M3U,MPEG4'  # allows DRM formats
-
-            try:
-                drm_info = self._extract_common_video_info(content_id, asset_types, mpx_acc, extra_info=metadata)
-            except ExtractorError:
-                if error:
-                    raise error from None
-                raise
-            if drm_info['formats']:
-                self.report_drm(content_id)
-            elif error:
-                raise error
-
-        return info
-
-
-class ParamountPlusSeriesIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?paramountplus\.com/shows/(?P<id>[a-zA-Z0-9-_]+)/?(?:[#?]|$)'
-    _TESTS = [{
-        'url': 'https://www.paramountplus.com/shows/drake-josh',
-        'playlist_mincount': 50,
-        'info_dict': {
-            'id': 'drake-josh',
-        },
-    }, {
-        'url': 'https://www.paramountplus.com/shows/hawaii_five_0/',
-        'playlist_mincount': 240,
-        'info_dict': {
-            'id': 'hawaii_five_0',
-        },
-    }, {
-        'url': 'https://www.paramountplus.com/shows/spongebob-squarepants/',
-        'playlist_mincount': 248,
-        'info_dict': {
-            'id': 'spongebob-squarepants',
-        },
-    }]
-
-    def _entries(self, show_name):
-        for page in itertools.count():
-            show_json = self._download_json(
-                f'https://www.paramountplus.com/shows/{show_name}/xhr/episodes/page/{page}/size/50/xs/0/season/0', show_name)
-            if not show_json.get('success'):
-                return
-            for episode in show_json['result']['data']:
-                yield self.url_result(
-                    'https://www.paramountplus.com{}'.format(episode['url']),
-                    ie=ParamountPlusIE.ie_key(), video_id=episode['content_id'])
-
-    def _real_extract(self, url):
-        show_name = self._match_id(url)
-        return self.playlist_result(self._entries(show_name), playlist_id=show_name)

yt_dlp/extractor/pixivsketch.py

@@ -1,119 +0,0 @@
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    traverse_obj,
-    unified_timestamp,
-)
-
-
-class PixivSketchBaseIE(InfoExtractor):
-    def _call_api(self, video_id, path, referer, note='Downloading JSON metadata'):
-        response = self._download_json(f'https://sketch.pixiv.net/api/{path}', video_id, note=note, headers={
-            'Referer': referer,
-            'X-Requested-With': referer,
-        })
-        errors = traverse_obj(response, ('errors', ..., 'message'))
-        if errors:
-            raise ExtractorError(' '.join(f'{e}.' for e in errors))
-        return response.get('data') or {}
-
-
-class PixivSketchIE(PixivSketchBaseIE):
-    IE_NAME = 'pixiv:sketch'
-    _VALID_URL = r'https?://sketch\.pixiv\.net/@(?P<uploader_id>[a-zA-Z0-9_-]+)/lives/(?P<id>\d+)/?'
-    _TESTS = [{
-        'url': 'https://sketch.pixiv.net/@nuhutya/lives/3654620468641830507',
-        'info_dict': {
-            'id': '7370666691623196569',
-            'title': 'まにあえクリスマス！',
-            'uploader': 'ぬふちゃ',
-            'uploader_id': 'nuhutya',
-            'channel_id': '9844815',
-            'age_limit': 0,
-            'timestamp': 1640351536,
-        },
-        'skip': True,
-    }, {
-        # these two (age_limit > 0) requires you to login on website, but it's actually not required for download
-        'url': 'https://sketch.pixiv.net/@namahyou/lives/4393103321546851377',
-        'info_dict': {
-            'id': '4907995960957946943',
-            'title': 'クリスマスなんて知らん🖕',
-            'uploader': 'すゃもり',
-            'uploader_id': 'suya2mori2',
-            'channel_id': '31169300',
-            'age_limit': 15,
-            'timestamp': 1640347640,
-        },
-        'skip': True,
-    }, {
-        'url': 'https://sketch.pixiv.net/@8aki/lives/3553803162487249670',
-        'info_dict': {
-            'id': '1593420639479156945',
-            'title': 'おまけ本作業(リョナ有)',
-            'uploader': 'おぶい / Obui',
-            'uploader_id': 'oving',
-            'channel_id': '17606',
-            'age_limit': 18,
-            'timestamp': 1640330263,
-        },
-        'skip': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id, uploader_id = self._match_valid_url(url).group('id', 'uploader_id')
-        data = self._call_api(video_id, f'lives/{video_id}.json', url)
-
-        if not traverse_obj(data, 'is_broadcasting'):
-            raise ExtractorError(f'This live is offline. Use https://sketch.pixiv.net/@{uploader_id} for ongoing live.', expected=True)
-
-        m3u8_url = traverse_obj(data, ('owner', 'hls_movie', 'url'))
-        formats = self._extract_m3u8_formats(
-            m3u8_url, video_id, ext='mp4',
-            entry_protocol='m3u8_native', m3u8_id='hls')
-
-        return {
-            'id': video_id,
-            'title': data.get('name'),
-            'formats': formats,
-            'uploader': traverse_obj(data, ('user', 'name'), ('owner', 'user', 'name')),
-            'uploader_id': traverse_obj(data, ('user', 'unique_name'), ('owner', 'user', 'unique_name')),
-            'channel_id': str(traverse_obj(data, ('user', 'pixiv_user_id'), ('owner', 'user', 'pixiv_user_id'))),
-            'age_limit': 18 if data.get('is_r18') else 15 if data.get('is_r15') else 0,
-            'timestamp': unified_timestamp(data.get('created_at')),
-            'is_live': True,
-        }
-
-
-class PixivSketchUserIE(PixivSketchBaseIE):
-    IE_NAME = 'pixiv:sketch:user'
-    _VALID_URL = r'https?://sketch\.pixiv\.net/@(?P<id>[a-zA-Z0-9_-]+)/?'
-    _TESTS = [{
-        'url': 'https://sketch.pixiv.net/@nuhutya',
-        'only_matching': True,
-    }, {
-        'url': 'https://sketch.pixiv.net/@namahyou',
-        'only_matching': True,
-    }, {
-        'url': 'https://sketch.pixiv.net/@8aki',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return super().suitable(url) and not PixivSketchIE.suitable(url)
-
-    def _real_extract(self, url):
-        user_id = self._match_id(url)
-        data = self._call_api(user_id, f'lives/users/@{user_id}.json', url)
-
-        if not traverse_obj(data, 'is_broadcasting'):
-            try:
-                self._call_api(user_id, 'users/current.json', url, 'Investigating reason for request failure')
-            except ExtractorError as e:
-                if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                    self.raise_login_required(f'Please log in, or use direct link like https://sketch.pixiv.net/@{user_id}/1234567890', method='cookies')
-            raise ExtractorError('This user is offline', expected=True)
-
-        return self.url_result(f'https://sketch.pixiv.net/@{user_id}/lives/{data["id"]}')

yt_dlp/extractor/radiofrance.py

@@ -414,7 +414,7 @@ class RadioFranceProgramScheduleIE(RadioFranceBaseIE):
     _VALID_URL = rf'''(?x)
         {RadioFranceBaseIE._VALID_URL_BASE}
         /(?P<station>{RadioFranceBaseIE._STATIONS_RE})
-        /grille-programmes(?:\?date=(?P<date>[\d-]+))?
+        /grille-programmes
     '''
 
     _TESTS = [{
@@ -463,7 +463,7 @@ class RadioFranceProgramScheduleIE(RadioFranceBaseIE):
                 }))
 
     def _real_extract(self, url):
-        station, date = self._match_valid_url(url).group('station', 'date')
+        station = self._match_valid_url(url).group('station')
         webpage = self._download_webpage(url, station)
         grid_data = self._extract_data_from_webpage(webpage, station, 'grid')
         upload_date = strftime_or_none(grid_data.get('date'), '%Y%m%d')

yt_dlp/extractor/rcti.py

@@ -321,7 +321,7 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
                 f'Only {video_type} will be downloaded. '
                 f'To download everything from the series, remove "/{video_type}" from the URL')
 
-        series_meta, meta_paths = self._call_api(
+        series_meta, _ = self._call_api(
             f'https://api.rctiplus.com/api/v1/program/{series_id}/detail', display_id, 'Downloading series metadata')
         metadata = {
             'age_limit': try_get(series_meta, lambda x: self._AGE_RATINGS[x['age_restriction'][0]['code']]),

yt_dlp/extractor/rutv.py

@@ -1,191 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import ExtractorError, int_or_none, str_to_int
-
-
-class RUTVIE(InfoExtractor):
-    IE_DESC = 'RUTV.RU'
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:test)?player\.(?:rutv\.ru|vgtrk\.com)/
-                        (?P<path>
-                            flash\d+v/container\.swf\?id=|
-                            iframe/(?P<type>swf|video|live)/id/|
-                            index/iframe/cast_id/
-                        )
-                        (?P<id>\d+)
-                    '''
-    _EMBED_REGEX = [
-        r'<iframe[^>]+?src=(["\'])(?P<url>https?://(?:test)?player\.(?:rutv\.ru|vgtrk\.com)/(?:iframe/(?:swf|video|live)/id|index/iframe/cast_id)/.+?)\1',
-        r'<meta[^>]+?property=(["\'])og:video\1[^>]+?content=(["\'])(?P<url>https?://(?:test)?player\.(?:rutv\.ru|vgtrk\.com)/flash\d+v/container\.swf\?id=.+?\2)',
-    ]
-
-    _TESTS = [{
-        'url': 'http://player.rutv.ru/flash2v/container.swf?id=774471&sid=kultura&fbv=true&isPlay=true&ssl=false&i=560&acc_video_id=episode_id/972347/video_id/978186/brand_id/31724',
-        'info_dict': {
-            'id': '774471',
-            'ext': 'mp4',
-            'title': 'Монологи на все времена. Концерт',
-            'description': 'md5:18d8b5e6a41fb1faa53819471852d5d5',
-            'duration': 2906,
-            'thumbnail': r're:https?://cdn-st2\.smotrim\.ru/.+\.jpg',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://player.vgtrk.com/flash2v/container.swf?id=774016&sid=russiatv&fbv=true&isPlay=true&ssl=false&i=560&acc_video_id=episode_id/972098/video_id/977760/brand_id/57638',
-        'info_dict': {
-            'id': '774016',
-            'ext': 'mp4',
-            'title': 'Чужой в семье Сталина',
-            'description': '',
-            'duration': 2539,
-        },
-        'skip': 'Invalid URL',
-    }, {
-        'url': 'http://player.rutv.ru/iframe/swf/id/766888/sid/hitech/?acc_video_id=4000',
-        'info_dict': {
-            'id': '766888',
-            'ext': 'mp4',
-            'title': 'Вести.net: интернет-гиганты начали перетягивание программных "одеял"',
-            'description': 'md5:65ddd47f9830c4f42ed6475f8730c995',
-            'duration': 279,
-            'thumbnail': r're:https?://cdn-st2\.smotrim\.ru/.+\.jpg',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'http://player.rutv.ru/iframe/video/id/771852/start_zoom/true/showZoomBtn/false/sid/russiatv/?acc_video_id=episode_id/970443/video_id/975648/brand_id/5169',
-        'info_dict': {
-            'id': '771852',
-            'ext': 'mp4',
-            'title': 'Прямой эфир. Жертвы загадочной болезни: смерть от старости в 17 лет',
-            'description': 'md5:b81c8c55247a4bd996b43ce17395b2d8',
-            'duration': 3096,
-            'thumbnail': r're:https?://cdn-st2\.smotrim\.ru/.+\.jpg',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'http://player.rutv.ru/iframe/live/id/51499/showZoomBtn/false/isPlay/true/sid/sochi2014',
-        'info_dict': {
-            'id': '51499',
-            'ext': 'flv',
-            'title': 'Сочи-2014. Биатлон. Индивидуальная гонка. Мужчины ',
-            'description': 'md5:9e0ed5c9d2fa1efbfdfed90c9a6d179c',
-        },
-        'skip': 'Invalid URL',
-    }, {
-        'url': 'http://player.rutv.ru/iframe/live/id/21/showZoomBtn/false/isPlay/true/',
-        'info_dict': {
-            'id': '21',
-            'ext': 'mp4',
-            'title': str,
-            'is_live': True,
-        },
-        'skip': 'Invalid URL',
-    }, {
-        'url': 'https://testplayer.vgtrk.com/iframe/live/id/19201/showZoomBtn/false/isPlay/true/',
-        'only_matching': True,
-    }]
-    _WEBPAGE_TESTS = [{
-        'url': 'http://istoriya-teatra.ru/news/item/f00/s05/n0000545/index.shtml',
-        'info_dict': {
-            'id': '1952012',
-            'ext': 'mp4',
-            'title': 'Новости культуры. Эфир от 10.10.2019 (23:30). Театр Сатиры отмечает день рождения премьерой',
-            'description': 'md5:fced27112ff01ff8fc4a452fc088bad6',
-            'duration': 191,
-            'thumbnail': r're:https?://cdn-st2\.smotrim\.ru/.+\.jpg',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        video_path = mobj.group('path')
-
-        if re.match(r'flash\d+v', video_path):
-            video_type = 'video'
-        elif video_path.startswith('iframe'):
-            video_type = mobj.group('type')
-            if video_type == 'swf':
-                video_type = 'video'
-        elif video_path.startswith('index/iframe/cast_id'):
-            video_type = 'live'
-
-        is_live = video_type == 'live'
-
-        json_data = self._download_json(
-            'http://player.vgtrk.com/iframe/data{}/id/{}'.format('live' if is_live else 'video', video_id),
-            video_id, 'Downloading JSON')
-
-        if json_data['errors']:
-            raise ExtractorError('{} said: {}'.format(self.IE_NAME, json_data['errors']), expected=True)
-
-        playlist = json_data['data']['playlist']
-        medialist = playlist['medialist']
-        media = medialist[0]
-
-        if media['errors']:
-            raise ExtractorError('{} said: {}'.format(self.IE_NAME, media['errors']), expected=True)
-
-        view_count = int_or_none(playlist.get('count_views'))
-        priority_transport = playlist['priority_transport']
-
-        thumbnail = media['picture']
-        width = int_or_none(media['width'])
-        height = int_or_none(media['height'])
-        description = media['anons']
-        title = media['title']
-        duration = int_or_none(media.get('duration'))
-
-        formats = []
-        subtitles = {}
-
-        for transport, links in media['sources'].items():
-            for quality, url in links.items():
-                preference = -1 if priority_transport == transport else -2
-                if transport == 'rtmp':
-                    mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+))/(?P<playpath>.+)$', url)
-                    if not mobj:
-                        continue
-                    fmt = {
-                        'url': mobj.group('url'),
-                        'play_path': mobj.group('playpath'),
-                        'app': mobj.group('app'),
-                        'page_url': 'http://player.rutv.ru',
-                        'player_url': 'http://player.rutv.ru/flash3v/osmf.swf?i=22',
-                        'rtmp_live': True,
-                        'ext': 'flv',
-                        'vbr': str_to_int(quality),
-                    }
-                elif transport == 'm3u8':
-                    fmt, subs = self._extract_m3u8_formats_and_subtitles(
-                        url, video_id, 'mp4', quality=preference, m3u8_id='hls')
-                    formats.extend(fmt)
-                    self._merge_subtitles(subs, target=subtitles)
-                    continue
-                else:
-                    fmt = {
-                        'url': url,
-                    }
-                fmt.update({
-                    'width': int_or_none(quality, default=height, invscale=width, scale=height),
-                    'height': int_or_none(quality, default=height),
-                    'format_id': f'{transport}-{quality}',
-                    'source_preference': preference,
-                })
-                formats.append(fmt)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'view_count': view_count,
-            'duration': duration,
-            'formats': formats,
-            'subtitles': subtitles,
-            'is_live': is_live,
-            '_format_sort_fields': ('source', ),
-        }

yt_dlp/extractor/sixplay.py

@@ -1,119 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    parse_qs,
-    qualities,
-    try_get,
-)
-
-
-class SixPlayIE(InfoExtractor):
-    IE_NAME = '6play'
-    _VALID_URL = r'(?:6play:|https?://(?:www\.)?(?P<domain>6play\.fr|rtlplay\.be|play\.rtl\.hr|rtlmost\.hu)/.+?-c_)(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'https://www.6play.fr/minute-par-minute-p_9533/le-but-qui-a-marque-lhistoire-du-football-francais-c_12041051',
-        'md5': '31fcd112637baa0c2ab92c4fcd8baf27',
-        'info_dict': {
-            'id': '12041051',
-            'ext': 'mp4',
-            'title': 'Le but qui a marqué l\'histoire du football français !',
-            'description': 'md5:b59e7e841d646ef1eb42a7868eb6a851',
-        },
-    }, {
-        'url': 'https://www.rtlplay.be/rtl-info-13h-p_8551/les-titres-du-rtlinfo-13h-c_12045869',
-        'only_matching': True,
-    }, {
-        'url': 'https://play.rtl.hr/pj-masks-p_9455/epizoda-34-sezona-1-catboyevo-cudo-na-dva-kotaca-c_11984989',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.rtlmost.hu/megtorve-p_14167/megtorve-6-resz-c_12397787',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        domain, video_id = self._match_valid_url(url).groups()
-        service, consumer_name = {
-            '6play.fr': ('6play', 'm6web'),
-            'rtlplay.be': ('rtlbe_rtl_play', 'rtlbe'),
-            'play.rtl.hr': ('rtlhr_rtl_play', 'rtlhr'),
-            'rtlmost.hu': ('rtlhu_rtl_most', 'rtlhu'),
-        }.get(domain, ('6play', 'm6web'))
-
-        data = self._download_json(
-            f'https://pc.middleware.6play.fr/6play/v2/platforms/m6group_web/services/{service}/videos/clip_{video_id}',
-            video_id, headers={
-                'x-customer-name': consumer_name,
-            }, query={
-                'csa': 5,
-                'with': 'clips',
-            })
-
-        clip_data = data['clips'][0]
-        title = clip_data['title']
-
-        urls = []
-        quality_key = qualities(['lq', 'sd', 'hq', 'hd'])
-        formats = []
-        subtitles = {}
-        assets = clip_data.get('assets') or []
-        for asset in assets:
-            asset_url = asset.get('full_physical_path')
-            protocol = asset.get('protocol')
-            if not asset_url or ((protocol == 'primetime' or asset.get('type') == 'usp_hlsfp_h264') and not ('_drmnp.ism/' in asset_url or '_unpnp.ism/' in asset_url)) or asset_url in urls:
-                continue
-            urls.append(asset_url)
-            container = asset.get('video_container')
-            ext = determine_ext(asset_url)
-            if protocol == 'http_subtitle' or ext == 'vtt':
-                subtitles.setdefault('fr', []).append({'url': asset_url})
-                continue
-            if container == 'm3u8' or ext == 'm3u8':
-                if protocol == 'usp':
-                    if parse_qs(asset_url).get('token', [None])[0]:
-                        urlh = self._request_webpage(
-                            asset_url, video_id, fatal=False,
-                            headers=self.geo_verification_headers())
-                        if not urlh:
-                            continue
-                        asset_url = urlh.url
-                    asset_url = asset_url.replace('_drmnp.ism/', '_unpnp.ism/')
-                    for i in range(3, 0, -1):
-                        asset_url = asset_url.replace('_sd1/', f'_sd{i}/')
-                        m3u8_formats = self._extract_m3u8_formats(
-                            asset_url, video_id, 'mp4', 'm3u8_native',
-                            m3u8_id='hls', fatal=False)
-                        formats.extend(m3u8_formats)
-                        formats.extend(self._extract_mpd_formats(
-                            asset_url.replace('.m3u8', '.mpd'),
-                            video_id, mpd_id='dash', fatal=False))
-                        if m3u8_formats:
-                            break
-                else:
-                    formats.extend(self._extract_m3u8_formats(
-                        asset_url, video_id, 'mp4', 'm3u8_native',
-                        m3u8_id='hls', fatal=False))
-            elif container == 'mp4' or ext == 'mp4':
-                quality = asset.get('video_quality')
-                formats.append({
-                    'url': asset_url,
-                    'format_id': quality,
-                    'quality': quality_key(quality),
-                    'ext': ext,
-                })
-
-        def get(getter):
-            for src in (data, clip_data):
-                v = try_get(src, getter, str)
-                if v:
-                    return v
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': get(lambda x: x['description']),
-            'duration': int_or_none(clip_data.get('duration')),
-            'series': get(lambda x: x['program']['title']),
-            'formats': formats,
-            'subtitles': subtitles,
-        }

yt_dlp/extractor/smotrim.py

@@ -1,65 +1,403 @@
+import functools
+import json
+import re
+import urllib.parse
+
 from .common import InfoExtractor
-from ..utils import ExtractorError
+from ..utils import (
+    OnDemandPagedList,
+    clean_html,
+    determine_ext,
+    extract_attributes,
+    int_or_none,
+    parse_iso8601,
+    str_or_none,
+    unescapeHTML,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import (
+    find_element,
+    find_elements,
+    require,
+    traverse_obj,
+)
 
 
-class SmotrimIE(InfoExtractor):
-    _VALID_URL = r'https?://smotrim\.ru/(?P<type>brand|video|article|live)/(?P<id>[0-9]+)'
-    _TESTS = [{  # video
+class SmotrimBaseIE(InfoExtractor):
+    _BASE_URL = 'https://smotrim.ru'
+    _GEO_BYPASS = False
+    _GEO_COUNTRIES = ['RU']
+
+    def _extract_from_smotrim_api(self, typ, item_id):
+        path = f'data{typ.replace("-", "")}/{"uid" if typ == "live" else "id"}'
+        data = self._download_json(
+            f'https://player.smotrim.ru/iframe/{path}/{item_id}/sid/smotrim', item_id)
+        media = traverse_obj(data, ('data', 'playlist', 'medialist', -1, {dict}))
+        if traverse_obj(media, ('locked', {bool})):
+            self.raise_login_required()
+        if error_msg := traverse_obj(media, ('errors', {clean_html})):
+            self.raise_geo_restricted(error_msg, countries=self._GEO_COUNTRIES)
+
+        webpage_url = traverse_obj(data, ('data', 'template', 'share_url', {url_or_none}))
+        webpage = self._download_webpage(webpage_url, item_id)
+        common = {
+            'thumbnail': self._html_search_meta(['og:image', 'twitter:image'], webpage, default=None),
+            **traverse_obj(media, {
+                'id': ('id', {str_or_none}),
+                'title': (('episodeTitle', 'title'), {clean_html}, filter, any),
+                'channel_id': ('channelId', {str_or_none}),
+                'description': ('anons', {clean_html}, filter),
+                'season': ('season', {clean_html}, filter),
+                'series': (('brand_title', 'brandTitle'), {clean_html}, filter, any),
+                'series_id': ('brand_id', {str_or_none}),
+            }),
+        }
+
+        if typ == 'audio':
+            bookmark = self._search_json(
+                r'class="bookmark"[^>]+value\s*=\s*"', webpage,
+                'bookmark', item_id, default={}, transform_source=unescapeHTML)
+
+            metadata = {
+                'vcodec': 'none',
+                **common,
+                **traverse_obj(media, {
+                    'ext': ('audio_url', {determine_ext(default_ext='mp3')}),
+                    'duration': ('duration', {int_or_none}),
+                    'url': ('audio_url', {url_or_none}),
+                }),
+                **traverse_obj(bookmark, {
+                    'title': ('subtitle', {clean_html}),
+                    'timestamp': ('published', {parse_iso8601}),
+                }),
+            }
+        elif typ == 'audio-live':
+            metadata = {
+                'ext': 'mp3',
+                'url': traverse_obj(media, ('source', 'auto', {url_or_none})),
+                'vcodec': 'none',
+                **common,
+            }
+        else:
+            formats, subtitles = [], {}
+            for m3u8_url in traverse_obj(media, (
+                'sources', 'm3u8', {dict.values}, ..., {url_or_none},
+            )):
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    m3u8_url, item_id, 'mp4', m3u8_id='hls', fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+
+            metadata = {
+                'formats': formats,
+                'subtitles': subtitles,
+                **self._search_json_ld(webpage, item_id),
+                **common,
+            }
+
+        return {
+            'age_limit': traverse_obj(data, ('data', 'age_restrictions', {int_or_none})),
+            'is_live': typ in ('audio-live', 'live'),
+            'tags': traverse_obj(webpage, (
+                {find_elements(cls='tags-list__link')}, ..., {clean_html}, filter, all, filter)),
+            'webpage_url': webpage_url,
+            **metadata,
+        }
+
+
+class SmotrimIE(SmotrimBaseIE):
+    IE_NAME = 'smotrim'
+    _VALID_URL = r'(?:https?:)?//(?:(?:player|www)\.)?smotrim\.ru(?:/iframe)?/video(?:/id)?/(?P<id>\d+)'
+    _EMBED_REGEX = [fr'<iframe\b[^>]+\bsrc=["\'](?P<url>{_VALID_URL})']
+    _TESTS = [{
         'url': 'https://smotrim.ru/video/1539617',
-        'md5': 'b1923a533c8cab09679789d720d0b1c5',
         'info_dict': {
             'id': '1539617',
             'ext': 'mp4',
-            'title': 'Полиглот. Китайский с нуля за 16 часов! Урок №16',
-            'description': '',
+            'title': 'Урок №16',
+            'duration': 2631,
+            'series': 'Полиглот. Китайский с нуля за 16 часов!',
+            'series_id': '60562',
+            'tags': 'mincount:6',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': 1466771100,
+            'upload_date': '20160624',
+            'view_count': int,
         },
-        'add_ie': ['RUTV'],
-    }, {  # article (geo-restricted? plays fine from the US and JP)
+    }, {
+        'url': 'https://player.smotrim.ru/iframe/video/id/2988590',
+        'info_dict': {
+            'id': '2988590',
+            'ext': 'mp4',
+            'title': 'Трейлер',
+            'age_limit': 16,
+            'description': 'md5:6af7e68ecf4ed7b8ff6720d20c4da47b',
+            'duration': 30,
+            'series': 'Мы в разводе',
+            'series_id': '71624',
+            'tags': 'mincount:5',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': 1750670040,
+            'upload_date': '20250623',
+            'view_count': int,
+            'webpage_url': 'https://smotrim.ru/video/2988590',
+        },
+    }]
+    _WEBPAGE_TESTS = [{
         'url': 'https://smotrim.ru/article/2813445',
-        'md5': 'e0ac453952afbc6a2742e850b4dc8e77',
         'info_dict': {
             'id': '2431846',
             'ext': 'mp4',
-            'title': 'Новости культуры. Съёмки первой программы "Большие и маленькие"',
-            'description': 'md5:94a4a22472da4252bf5587a4ee441b99',
+            'title': 'Съёмки первой программы "Большие и маленькие"',
+            'description': 'md5:446c9a5d334b995152a813946353f447',
+            'duration': 240,
+            'series': 'Новости культуры',
+            'series_id': '19725',
+            'tags': 'mincount:6',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': 1656054443,
+            'upload_date': '20220624',
+            'view_count': int,
+            'webpage_url': 'https://smotrim.ru/video/2431846',
         },
-        'add_ie': ['RUTV'],
-    }, {  # brand, redirect
-        'url': 'https://smotrim.ru/brand/64356',
-        'md5': '740472999ccff81d7f6df79cecd91c18',
+    }, {
+        'url': 'https://www.vesti.ru/article/4642878',
         'info_dict': {
-            'id': '2354523',
+            'id': '3007209',
             'ext': 'mp4',
-            'title': 'Большие и маленькие. Лучшее. 4-й выпуск',
-            'description': 'md5:84089e834429008371ea41ea3507b989',
+            'title': 'Иностранные мессенджеры используют не только мошенники, но и вербовщики',
+            'description': 'md5:74ab625a0a89b87b2e0ed98d6391b182',
+            'duration': 265,
+            'series': 'Вести. Дежурная часть',
+            'series_id': '5204',
+            'tags': 'mincount:6',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': 1754756280,
+            'upload_date': '20250809',
+            'view_count': int,
+            'webpage_url': 'https://smotrim.ru/video/3007209',
         },
-        'add_ie': ['RUTV'],
-    }, {  # live
-        'url': 'https://smotrim.ru/live/19201',
-        'info_dict': {
-            'id': '19201',
-            'ext': 'mp4',
-            # this looks like a TV channel name
-            'title': 'Россия Культура. Прямой эфир',
-            'description': '',
-        },
-        'add_ie': ['RUTV'],
     }]
 
     def _real_extract(self, url):
-        video_id, typ = self._match_valid_url(url).group('id', 'type')
-        rutv_type = 'video'
-        if typ not in ('video', 'live'):
-            webpage = self._download_webpage(url, video_id, f'Resolving {typ} link')
-            # there are two cases matching regex:
-            # 1. "embedUrl" in JSON LD (/brand/)
-            # 2. "src" attribute from iframe (/article/)
-            video_id = self._search_regex(
-                r'"https://player.smotrim.ru/iframe/video/id/(?P<video_id>\d+)/',
-                webpage, 'video_id', default=None)
-            if not video_id:
-                raise ExtractorError('There are no video in this page.', expected=True)
-        elif typ == 'live':
-            rutv_type = 'live'
+        video_id = self._match_id(url)
 
-        return self.url_result(f'https://player.vgtrk.com/iframe/{rutv_type}/id/{video_id}')
+        return self._extract_from_smotrim_api('video', video_id)
+
+
+class SmotrimAudioIE(SmotrimBaseIE):
+    IE_NAME = 'smotrim:audio'
+    _VALID_URL = r'https?://(?:(?:player|www)\.)?smotrim\.ru(?:/iframe)?/audio(?:/id)?/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://smotrim.ru/audio/2573986',
+        'md5': 'e28d94c20da524e242b2d00caef41a8e',
+        'info_dict': {
+            'id': '2573986',
+            'ext': 'mp3',
+            'title': 'Радиоспектакль',
+            'description': 'md5:4bcaaf7d532bc78f76e478fad944e388',
+            'duration': 3072,
+            'series': 'Морис Леблан. Арсен Люпен, джентльмен-грабитель',
+            'series_id': '66461',
+            'tags': 'mincount:7',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': 1624884358,
+            'upload_date': '20210628',
+        },
+    }, {
+        'url': 'https://player.smotrim.ru/iframe/audio/id/2860468',
+        'md5': '5a6bc1fa24c7142958be1ad9cfae58a8',
+        'info_dict': {
+            'id': '2860468',
+            'ext': 'mp3',
+            'title': 'Колобок и музыкальная игра "Терем-теремок"',
+            'duration': 1501,
+            'series': 'Веселый колобок',
+            'series_id': '68880',
+            'tags': 'mincount:4',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': 1755925800,
+            'upload_date': '20250823',
+            'webpage_url': 'https://smotrim.ru/audio/2860468',
+        },
+    }]
+
+    def _real_extract(self, url):
+        audio_id = self._match_id(url)
+
+        return self._extract_from_smotrim_api('audio', audio_id)
+
+
+class SmotrimLiveIE(SmotrimBaseIE):
+    IE_NAME = 'smotrim:live'
+    _VALID_URL = r'''(?x:
+        (?:https?:)?//
+            (?:(?:(?:test)?player|www)\.)?
+            (?:
+                smotrim\.ru|
+                vgtrk\.com
+            )
+            (?:/iframe)?/
+            (?P<type>
+                channel|
+                (?:audio-)?live
+            )
+            (?:/u?id)?/(?P<id>[\da-f-]+)
+    )'''
+    _EMBED_REGEX = [fr'<iframe\b[^>]+\bsrc=["\'](?P<url>{_VALID_URL})']
+    _TESTS = [{
+        'url': 'https://smotrim.ru/channel/76',
+        'info_dict': {
+            'id': '1661',
+            'ext': 'mp4',
+            'title': str,
+            'channel_id': '76',
+            'description': 'Смотрим прямой эфир «Москва 24»',
+            'display_id': '76',
+            'live_status': 'is_live',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': int,
+            'upload_date': str,
+        },
+        'params': {'skip_download': 'Livestream'},
+    }, {
+        # Radio
+        'url': 'https://smotrim.ru/channel/81',
+        'info_dict': {
+            'id': '81',
+            'ext': 'mp3',
+            'title': str,
+            'channel_id': '81',
+            'live_status': 'is_live',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+        },
+        'params': {'skip_download': 'Livestream'},
+    }, {
+        # Sometimes geo-restricted to Russia
+        'url': 'https://player.smotrim.ru/iframe/live/uid/381308c7-a066-4c4f-9656-83e2e792a7b4',
+        'info_dict': {
+            'id': '19201',
+            'ext': 'mp4',
+            'title': str,
+            'channel_id': '4',
+            'description': 'Смотрим прямой эфир «Россия К»',
+            'display_id': '381308c7-a066-4c4f-9656-83e2e792a7b4',
+            'live_status': 'is_live',
+            'thumbnail': r're:https?://cdn-st\d+\.smotrim\.ru/.+\.(?:jpg|png)',
+            'timestamp': int,
+            'upload_date': str,
+            'webpage_url': 'https://smotrim.ru/channel/4',
+        },
+        'params': {'skip_download': 'Livestream'},
+    }, {
+        'url': 'https://smotrim.ru/live/19201',
+        'only_matching': True,
+    }, {
+        'url': 'https://player.smotrim.ru/iframe/audio-live/id/81',
+        'only_matching': True,
+    }, {
+        'url': 'https://testplayer.vgtrk.com/iframe/live/id/19201',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        typ, display_id = self._match_valid_url(url).group('type', 'id')
+
+        if typ == 'live' and re.fullmatch(r'[0-9]+', display_id):
+            url = self._request_webpage(url, display_id).url
+            typ = self._match_valid_url(url).group('type')
+
+        if typ == 'channel':
+            webpage = self._download_webpage(url, display_id)
+            src_url = traverse_obj(webpage, ((
+                ({find_element(cls='main-player__frame', html=True)}, {extract_attributes}, 'src'),
+                ({find_element(cls='audio-play-button', html=True)},
+                    {extract_attributes}, 'value', {urllib.parse.unquote}, {json.loads}, 'source'),
+            ), any, {self._proto_relative_url}, {url_or_none}, {require('src URL')}))
+            typ, video_id = self._match_valid_url(src_url).group('type', 'id')
+        else:
+            video_id = display_id
+
+        return {
+            'display_id': display_id,
+            **self._extract_from_smotrim_api(typ, video_id),
+        }
+
+
+class SmotrimPlaylistIE(SmotrimBaseIE):
+    IE_NAME = 'smotrim:playlist'
+    _PAGE_SIZE = 15
+    _VALID_URL = r'https?://smotrim\.ru/(?P<type>brand|podcast)/(?P<id>\d+)/?(?P<season>[\w-]+)?'
+    _TESTS = [{
+        # Video
+        'url': 'https://smotrim.ru/brand/64356',
+        'info_dict': {
+            'id': '64356',
+            'title': 'Большие и маленькие',
+        },
+        'playlist_mincount': 55,
+    }, {
+        # Video, season
+        'url': 'https://smotrim.ru/brand/65293/3-sezon',
+        'info_dict': {
+            'id': '65293',
+            'title': 'Спасская',
+            'season': '3 сезон',
+        },
+        'playlist_count': 16,
+    }, {
+        # Audio
+        'url': 'https://smotrim.ru/brand/68880',
+        'info_dict': {
+            'id': '68880',
+            'title': 'Веселый колобок',
+        },
+        'playlist_mincount': 156,
+    }, {
+        # Podcast
+        'url': 'https://smotrim.ru/podcast/8021',
+        'info_dict': {
+            'id': '8021',
+            'title': 'Сила звука',
+        },
+        'playlist_mincount': 27,
+    }]
+
+    def _fetch_page(self, endpoint, key, playlist_id, page):
+        page += 1
+        items = self._download_json(
+            f'{self._BASE_URL}/api/{endpoint}', playlist_id,
+            f'Downloading page {page}', query={
+                key: playlist_id,
+                'limit': self._PAGE_SIZE,
+                'page': page,
+            },
+        )
+
+        for link in traverse_obj(items, ('contents', -1, 'list', ..., 'link', {str})):
+            yield self.url_result(urljoin(self._BASE_URL, link))
+
+    def _real_extract(self, url):
+        playlist_type, playlist_id, season = self._match_valid_url(url).group('type', 'id', 'season')
+        key = 'rubricId' if playlist_type == 'podcast' else 'brandId'
+        webpage = self._download_webpage(url, playlist_id)
+        playlist_title = self._html_search_meta(['og:title', 'twitter:title'], webpage, default=None)
+
+        if season:
+            return self.playlist_from_matches(traverse_obj(webpage, (
+                {find_elements(tag='a', attr='href', value=r'/video/\d+', html=True, regex=True)},
+                ..., {extract_attributes}, 'href', {str},
+            )), playlist_id, playlist_title, season=traverse_obj(webpage, (
+                {find_element(cls='seasons__item seasons__item--selected')}, {clean_html},
+            )), ie=SmotrimIE, getter=urljoin(self._BASE_URL))
+
+        if traverse_obj(webpage, (
+            {find_element(cls='brand-main-item__videos')}, {clean_html}, filter,
+        )):
+            endpoint = 'videos'
+        else:
+            endpoint = 'audios'
+
+        return self.playlist_result(OnDemandPagedList(
+            functools.partial(self._fetch_page, endpoint, key, playlist_id), self._PAGE_SIZE), playlist_id, playlist_title)

yt_dlp/extractor/spotify.py

@@ -1,167 +0,0 @@
-import functools
-import json
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    OnDemandPagedList,
-    clean_podcast_url,
-    float_or_none,
-    int_or_none,
-    strip_or_none,
-    traverse_obj,
-    try_get,
-    unified_strdate,
-)
-
-
-class SpotifyBaseIE(InfoExtractor):
-    _WORKING = False
-    _ACCESS_TOKEN = None
-    _OPERATION_HASHES = {
-        'Episode': '8276d4423d709ae9b68ec1b74cc047ba0f7479059a37820be730f125189ac2bf',
-        'MinimalShow': '13ee079672fad3f858ea45a55eb109553b4fb0969ed793185b2e34cbb6ee7cc0',
-        'ShowEpisodes': 'e0e5ce27bd7748d2c59b4d44ba245a8992a05be75d6fabc3b20753fc8857444d',
-    }
-    _VALID_URL_TEMPL = r'https?://open\.spotify\.com/(?:embed-podcast/|embed/|)%s/(?P<id>[^/?&#]+)'
-    _EMBED_REGEX = [r'<iframe[^>]+src="(?P<url>https?://open\.spotify.com/embed/[^"]+)"']
-
-    def _real_initialize(self):
-        self._ACCESS_TOKEN = self._download_json(
-            'https://open.spotify.com/get_access_token', None)['accessToken']
-
-    def _call_api(self, operation, video_id, variables, **kwargs):
-        return self._download_json(
-            'https://api-partner.spotify.com/pathfinder/v1/query', video_id, query={
-                'operationName': 'query' + operation,
-                'variables': json.dumps(variables),
-                'extensions': json.dumps({
-                    'persistedQuery': {
-                        'sha256Hash': self._OPERATION_HASHES[operation],
-                    },
-                }),
-            }, headers={'authorization': 'Bearer ' + self._ACCESS_TOKEN},
-            **kwargs)['data']
-
-    def _extract_episode(self, episode, series):
-        episode_id = episode['id']
-        title = episode['name'].strip()
-
-        formats = []
-        audio_preview = episode.get('audioPreview') or {}
-        audio_preview_url = audio_preview.get('url')
-        if audio_preview_url:
-            f = {
-                'url': audio_preview_url.replace('://p.scdn.co/mp3-preview/', '://anon-podcast.scdn.co/'),
-                'vcodec': 'none',
-            }
-            audio_preview_format = audio_preview.get('format')
-            if audio_preview_format:
-                f['format_id'] = audio_preview_format
-                mobj = re.match(r'([0-9A-Z]{3})_(?:[A-Z]+_)?(\d+)', audio_preview_format)
-                if mobj:
-                    f.update({
-                        'abr': int(mobj.group(2)),
-                        'ext': mobj.group(1).lower(),
-                    })
-            formats.append(f)
-
-        for item in (try_get(episode, lambda x: x['audio']['items']) or []):
-            item_url = item.get('url')
-            if not (item_url and item.get('externallyHosted')):
-                continue
-            formats.append({
-                'url': clean_podcast_url(item_url),
-                'vcodec': 'none',
-            })
-
-        thumbnails = []
-        for source in (try_get(episode, lambda x: x['coverArt']['sources']) or []):
-            source_url = source.get('url')
-            if not source_url:
-                continue
-            thumbnails.append({
-                'url': source_url,
-                'width': int_or_none(source.get('width')),
-                'height': int_or_none(source.get('height')),
-            })
-
-        return {
-            'id': episode_id,
-            'title': title,
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'description': strip_or_none(episode.get('description')),
-            'duration': float_or_none(try_get(
-                episode, lambda x: x['duration']['totalMilliseconds']), 1000),
-            'release_date': unified_strdate(try_get(
-                episode, lambda x: x['releaseDate']['isoString'])),
-            'series': series,
-        }
-
-
-class SpotifyIE(SpotifyBaseIE):
-    IE_NAME = 'spotify'
-    IE_DESC = 'Spotify episodes'
-    _VALID_URL = SpotifyBaseIE._VALID_URL_TEMPL % 'episode'
-    _TESTS = [{
-        'url': 'https://open.spotify.com/episode/4Z7GAJ50bgctf6uclHlWKo',
-        'md5': '74010a1e3fa4d9e1ab3aa7ad14e42d3b',
-        'info_dict': {
-            'id': '4Z7GAJ50bgctf6uclHlWKo',
-            'ext': 'mp3',
-            'title': 'From the archive: Why time management is ruining our lives',
-            'description': 'md5:b120d9c4ff4135b42aa9b6d9cde86935',
-            'duration': 2083.605,
-            'release_date': '20201217',
-            'series': "The Guardian's Audio Long Reads",
-        },
-    }, {
-        'url': 'https://open.spotify.com/embed/episode/4TvCsKKs2thXmarHigWvXE?si=7eatS8AbQb6RxqO2raIuWA',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        episode_id = self._match_id(url)
-        episode = self._call_api('Episode', episode_id, {
-            'uri': 'spotify:episode:' + episode_id,
-        })['episode']
-        return self._extract_episode(
-            episode, try_get(episode, lambda x: x['podcast']['name']))
-
-
-class SpotifyShowIE(SpotifyBaseIE):
-    IE_NAME = 'spotify:show'
-    IE_DESC = 'Spotify shows'
-    _VALID_URL = SpotifyBaseIE._VALID_URL_TEMPL % 'show'
-    _TEST = {
-        'url': 'https://open.spotify.com/show/4PM9Ke6l66IRNpottHKV9M',
-        'info_dict': {
-            'id': '4PM9Ke6l66IRNpottHKV9M',
-            'title': 'The Story from the Guardian',
-            'description': 'The Story podcast is dedicated to our finest audio documentaries, investigations and long form stories',
-        },
-        'playlist_mincount': 36,
-    }
-    _PER_PAGE = 100
-
-    def _fetch_page(self, show_id, page=0):
-        return self._call_api('ShowEpisodes', show_id, {
-            'limit': 100,
-            'offset': page * self._PER_PAGE,
-            'uri': f'spotify:show:{show_id}',
-        }, note=f'Downloading page {page + 1} JSON metadata')['podcast']
-
-    def _real_extract(self, url):
-        show_id = self._match_id(url)
-        first_page = self._fetch_page(show_id)
-
-        def _entries(page):
-            podcast = self._fetch_page(show_id, page) if page else first_page
-            yield from map(
-                functools.partial(self._extract_episode, series=podcast.get('name')),
-                traverse_obj(podcast, ('episodes', 'items', ..., 'episode')))
-
-        return self.playlist_result(
-            OnDemandPagedList(_entries, self._PER_PAGE),
-            show_id, first_page.get('name'), first_page.get('description'))

yt_dlp/extractor/substack.py

@@ -12,7 +12,7 @@ from ..utils.traversal import traverse_obj
 
 
 class SubstackIE(InfoExtractor):
-    _VALID_URL = r'https?://(?P<username>[\w-]+)\.substack\.com/p/(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://[\w-]+\.substack\.com/p/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://haleynahman.substack.com/p/i-made-a-vlog?s=r',
         'md5': 'f27e4fc6252001d48d479f45e65cdfd5',
@@ -116,7 +116,7 @@ class SubstackIE(InfoExtractor):
         return formats, subtitles
 
     def _real_extract(self, url):
-        display_id, username = self._match_valid_url(url).group('id', 'username')
+        display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
 
         webpage_info = self._parse_json(self._search_json(

yt_dlp/extractor/telecinco.py

@@ -46,7 +46,7 @@ class TelecincoBaseIE(InfoExtractor):
                 error_code = traverse_obj(
                     self._webpage_read_content(error.cause.response, caronte['cerbero'], video_id, fatal=False),
                     ({json.loads}, 'code', {int}))
-                if error_code in (4038, 40313):
+                if error_code in (4036, 4038, 40313):
                     self.raise_geo_restricted(countries=['ES'])
             raise
 
@@ -140,7 +140,7 @@ class TelecincoIE(TelecincoBaseIE):
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
+        webpage = self._download_webpage(url, display_id, impersonate=True)
         article = self._search_json(
             r'window\.\$REACTBASE_STATE\.article(?:_multisite)?\s*=',
             webpage, 'article', display_id)['article']

yt_dlp/extractor/tenplay.py

@@ -2,7 +2,14 @@ import itertools
 
 from .common import InfoExtractor
 from ..networking import HEADRequest
-from ..utils import int_or_none, traverse_obj, url_or_none, urljoin
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    update_url_query,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
 
 
 class TenPlayIE(InfoExtractor):
@@ -102,14 +109,19 @@ class TenPlayIE(InfoExtractor):
         video_data = self._download_json(
             f'https://vod.ten.com.au/api/videos/bcquery?command=find_videos_by_id&video_id={data["altId"]}',
             content_id, 'Downloading video JSON')
+        # Dash URL 404s, changing the m3u8 format works
         m3u8_url = self._request_webpage(
-            HEADRequest(video_data['items'][0]['HLSURL']),
+            HEADRequest(update_url_query(video_data['items'][0]['dashManifestUrl'], {
+                'manifest': 'm3u',
+            })),
             content_id, 'Checking stream URL').url
         if '10play-not-in-oz' in m3u8_url:
             self.raise_geo_restricted(countries=['AU'])
+        if '10play_unsupported' in m3u8_url:
+            raise ExtractorError('Unable to extract stream')
         # Attempt to get a higher quality stream
         formats = self._extract_m3u8_formats(
-            m3u8_url.replace(',150,75,55,0000', ',300,150,75,55,0000'),
+            m3u8_url.replace(',150,75,55,0000', ',500,300,150,75,55,0000'),
             content_id, 'mp4', fatal=False)
         if not formats:
             formats = self._extract_m3u8_formats(m3u8_url, content_id, 'mp4')

yt_dlp/extractor/tiktok.py

@@ -1518,19 +1518,22 @@ class TikTokLiveIE(TikTokBaseIE):
 
     def _real_extract(self, url):
         uploader, room_id = self._match_valid_url(url).group('uploader', 'id')
-        webpage = self._download_webpage(
-            url, uploader or room_id, headers={'User-Agent': 'Mozilla/5.0'}, fatal=not room_id)
+        if not room_id:
+            webpage = self._download_webpage(
+                format_field(uploader, None, self._UPLOADER_URL_FORMAT), uploader)
+            room_id = traverse_obj(
+                self._get_universal_data(webpage, uploader),
+                ('webapp.user-detail', 'userInfo', 'user', 'roomId', {str}))
 
-        if webpage:
+        if not uploader or not room_id:
+            webpage = self._download_webpage(url, uploader or room_id, fatal=not room_id)
             data = self._get_sigi_state(webpage, uploader or room_id)
-            room_id = (
-                traverse_obj(data, ((
-                    ('LiveRoom', 'liveRoomUserInfo', 'user'),
-                    ('UserModule', 'users', ...)), 'roomId', {str}, any))
-                or self._search_regex(r'snssdk\d*://live\?room_id=(\d+)', webpage, 'room ID', default=room_id))
-            uploader = uploader or traverse_obj(
-                data, ('LiveRoom', 'liveRoomUserInfo', 'user', 'uniqueId'),
-                ('UserModule', 'users', ..., 'uniqueId'), get_all=False, expected_type=str)
+            room_id = room_id or traverse_obj(data, ((
+                ('LiveRoom', 'liveRoomUserInfo', 'user'),
+                ('UserModule', 'users', ...)), 'roomId', {str}, any))
+            uploader = uploader or traverse_obj(data, ((
+                ('LiveRoom', 'liveRoomUserInfo', 'user'),
+                ('UserModule', 'users', ...)), 'uniqueId', {str}, any))
 
         if not room_id:
             raise UserNotLive(video_id=uploader)

yt_dlp/extractor/tunein.py

@@ -1,244 +1,335 @@
+import functools
 import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
     OnDemandPagedList,
-    determine_ext,
+    UnsupportedError,
+    clean_html,
+    int_or_none,
+    join_nonempty,
     parse_iso8601,
-    traverse_obj,
+    update_url_query,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class TuneInBaseIE(InfoExtractor):
-    _VALID_URL_BASE = r'https?://(?:www\.)?tunein\.com'
-
-    def _extract_metadata(self, webpage, content_id):
-        return self._search_json(r'window.INITIAL_STATE=', webpage, 'hydration', content_id, fatal=False)
+    def _call_api(self, item_id, endpoint=None, note='Downloading JSON metadata', fatal=False, query=None):
+        return self._download_json(
+            join_nonempty('https://api.tunein.com/profiles', item_id, endpoint, delim='/'),
+            item_id, note=note, fatal=fatal, query=query) or {}
 
     def _extract_formats_and_subtitles(self, content_id):
         streams = self._download_json(
-            f'https://opml.radiotime.com/Tune.ashx?render=json&formats=mp3,aac,ogg,flash,hls&id={content_id}',
-            content_id)['body']
+            'https://opml.radiotime.com/Tune.ashx', content_id, query={
+                'formats': 'mp3,aac,ogg,flash,hls',
+                'id': content_id,
+                'render': 'json',
+            })
 
         formats, subtitles = [], {}
-        for stream in streams:
+        for stream in traverse_obj(streams, ('body', lambda _, v: url_or_none(v['url']))):
             if stream.get('media_type') == 'hls':
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(stream['url'], content_id, fatal=False)
                 formats.extend(fmts)
                 self._merge_subtitles(subs, target=subtitles)
-            elif determine_ext(stream['url']) == 'pls':
-                playlist_content = self._download_webpage(stream['url'], content_id)
-                formats.append({
-                    'url': self._search_regex(r'File1=(.*)', playlist_content, 'url', fatal=False),
-                    'abr': stream.get('bitrate'),
-                    'ext': stream.get('media_type'),
-                })
             else:
-                formats.append({
-                    'url': stream['url'],
-                    'abr': stream.get('bitrate'),
-                    'ext': stream.get('media_type'),
-                })
+                formats.append(traverse_obj(stream, {
+                    'abr': ('bitrate', {int_or_none}),
+                    'ext': ('media_type', {str}),
+                    'url': ('url', {self._proto_relative_url}),
+                }))
 
         return formats, subtitles
 
 
 class TuneInStationIE(TuneInBaseIE):
-    _VALID_URL = TuneInBaseIE._VALID_URL_BASE + r'(?:/radio/[^?#]+-|/embed/player/)(?P<id>s\d+)'
-    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>(?:https?://)?tunein\.com/embed/player/s\d+)']
-
+    IE_NAME = 'tunein:station'
+    _VALID_URL = r'https?://tunein\.com/radio/[^/?#]+(?P<id>s\d+)'
     _TESTS = [{
         'url': 'https://tunein.com/radio/Jazz24-885-s34682/',
         'info_dict': {
             'id': 's34682',
-            'title': str,
-            'description': 'md5:d6d0b89063fd68d529fa7058ee98619b',
-            'thumbnail': r're:https?://cdn-profiles\.tunein\.com/.+',
-            'location': 'Seattle-Tacoma, US',
             'ext': 'mp3',
+            'title': str,
+            'alt_title': 'World Class Jazz',
+            'channel_follower_count': int,
+            'description': 'md5:d6d0b89063fd68d529fa7058ee98619b',
+            'location': r're:Seattle-Tacoma, (?:US|WA)',
             'live_status': 'is_live',
+            'thumbnail': r're:https?://.+',
         },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://tunein.com/embed/player/s6404/',
-        'only_matching': True,
+        'params': {'skip_download': 'Livestream'},
     }, {
         'url': 'https://tunein.com/radio/BBC-Radio-1-988-s24939/',
         'info_dict': {
             'id': 's24939',
-            'title': str,
-            'description': 'md5:ee2c56794844610d045f8caf5ff34d0c',
-            'thumbnail': r're:https?://cdn-profiles\.tunein\.com/.+',
-            'location': 'London, UK',
             'ext': 'm4a',
+            'title': str,
+            'alt_title': 'The biggest new pop and all-day vibes',
+            'channel_follower_count': int,
+            'description': 'md5:ee2c56794844610d045f8caf5ff34d0c',
+            'location': 'London, UK',
             'live_status': 'is_live',
+            'thumbnail': r're:https?://.+',
         },
-        'params': {
-            'skip_download': True,
+        'params': {'skip_download': 'Livestream'},
+    }]
+
+    def _real_extract(self, url):
+        station_id = self._match_id(url)
+        formats, subtitles = self._extract_formats_and_subtitles(station_id)
+
+        return {
+            'id': station_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(self._call_api(station_id), ('Item', {
+                'title': ('Title', {clean_html}),
+                'alt_title': ('Subtitle', {clean_html}, filter),
+                'channel_follower_count': ('Actions', 'Follow', 'FollowerCount', {int_or_none}),
+                'description': ('Description', {clean_html}, filter),
+                'is_live': ('Actions', 'Play', 'IsLive', {bool}),
+                'location': ('Properties', 'Location', 'DisplayName', {str}),
+                'thumbnail': ('Image', {url_or_none}),
+            })),
+        }
+
+
+class TuneInPodcastIE(TuneInBaseIE):
+    IE_NAME = 'tunein:podcast:program'
+    _PAGE_SIZE = 20
+    _VALID_URL = r'https?://tunein\.com/podcasts(?:/[^/?#]+){1,2}(?P<id>p\d+)'
+    _TESTS = [{
+        'url': 'https://tunein.com/podcasts/Technology-Podcasts/Artificial-Intelligence-p1153019/',
+        'info_dict': {
+            'id': 'p1153019',
+            'title': 'Lex Fridman Podcast',
         },
+        'playlist_mincount': 200,
+    }, {
+        'url': 'https://tunein.com/podcasts/World-News/BBC-News-p14/',
+        'info_dict': {
+            'id': 'p14',
+            'title': 'BBC News',
+        },
+        'playlist_mincount': 35,
+    }]
+
+    @classmethod
+    def suitable(cls, url):
+        return False if TuneInPodcastEpisodeIE.suitable(url) else super().suitable(url)
+
+    def _fetch_page(self, url, podcast_id, page=0):
+        items = self._call_api(
+            podcast_id, 'contents', f'Downloading page {page + 1}', query={
+                'filter': 't:free',
+                'limit': self._PAGE_SIZE,
+                'offset': page * self._PAGE_SIZE,
+            },
+        )['Items']
+
+        for item in traverse_obj(items, (..., 'GuideId', {str}, filter)):
+            yield self.url_result(update_url_query(url, {'topicId': item[1:]}))
+
+    def _real_extract(self, url):
+        podcast_id = self._match_id(url)
+
+        return self.playlist_result(OnDemandPagedList(
+            functools.partial(self._fetch_page, url, podcast_id), self._PAGE_SIZE),
+            podcast_id, traverse_obj(self._call_api(podcast_id), ('Item', 'Title', {str})))
+
+
+class TuneInPodcastEpisodeIE(TuneInBaseIE):
+    IE_NAME = 'tunein:podcast'
+    _VALID_URL = r'https?://tunein\.com/podcasts(?:/[^/?#]+){1,2}(?P<series_id>p\d+)/?\?(?:[^#]+&)?(?i:topicid)=(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://tunein.com/podcasts/Technology-Podcasts/Artificial-Intelligence-p1153019/?topicId=236404354',
+        'info_dict': {
+            'id': 't236404354',
+            'ext': 'mp3',
+            'title': '#351 – MrBeast: Future of YouTube, Twitter, TikTok, and Instagram',
+            'alt_title': 'Technology Podcasts >',
+            'cast': 'count:1',
+            'description': 'md5:1029895354ef073ff00f20b82eb6eb71',
+            'display_id': '236404354',
+            'duration': 8330,
+            'thumbnail': r're:https?://.+',
+            'timestamp': 1673458571,
+            'upload_date': '20230111',
+            'series': 'Lex Fridman Podcast',
+            'series_id': 'p1153019',
+        },
+    }, {
+        'url': 'https://tunein.com/podcasts/The-BOB--TOM-Show-Free-Podcast-p20069/?topicId=174556405',
+        'info_dict': {
+            'id': 't174556405',
+            'ext': 'mp3',
+            'title': 'B&T Extra: Ohhh Yeah, It\'s Sexy Time',
+            'alt_title': 'Westwood One >',
+            'cast': 'count:2',
+            'description': 'md5:6828234f410ab88c85655495c5fcfa88',
+            'display_id': '174556405',
+            'duration': 1203,
+            'series': 'The BOB & TOM Show Free Podcast',
+            'series_id': 'p20069',
+            'thumbnail': r're:https?://.+',
+            'timestamp': 1661799600,
+            'upload_date': '20220829',
+        },
+    }]
+
+    def _real_extract(self, url):
+        series_id, display_id = self._match_valid_url(url).group('series_id', 'id')
+        episode_id = f't{display_id}'
+        formats, subtitles = self._extract_formats_and_subtitles(episode_id)
+
+        return {
+            'id': episode_id,
+            'display_id': display_id,
+            'formats': formats,
+            'series': traverse_obj(self._call_api(series_id), ('Item', 'Title', {clean_html})),
+            'series_id': series_id,
+            'subtitles': subtitles,
+            **traverse_obj(self._call_api(episode_id), ('Item', {
+                'title': ('Title', {clean_html}),
+                'alt_title': ('Subtitle', {clean_html}, filter),
+                'cast': (
+                    'Properties', 'ParentProgram', 'Hosts', {clean_html},
+                    {lambda x: x.split(';')}, ..., {str.strip}, filter, all, filter),
+                'description': ('Description', {clean_html}, filter),
+                'duration': ('Actions', 'Play', 'Duration', {int_or_none}),
+                'thumbnail': ('Image', {url_or_none}),
+                'timestamp': ('Actions', 'Play', 'PublishTime', {parse_iso8601}),
+            })),
+        }
+
+
+class TuneInEmbedIE(TuneInBaseIE):
+    IE_NAME = 'tunein:embed'
+    _VALID_URL = r'https?://tunein\.com/embed/player/(?P<id>[^/?#]+)'
+    _EMBED_REGEX = [r'<iframe\b[^>]+\bsrc=["\'](?P<url>(?:https?:)?//tunein\.com/embed/player/[^/?#"\']+)']
+    _TESTS = [{
+        'url': 'https://tunein.com/embed/player/s6404/',
+        'info_dict': {
+            'id': 's6404',
+            'ext': 'mp3',
+            'title': str,
+            'alt_title': 'South Africa\'s News and Information Leader',
+            'channel_follower_count': int,
+            'live_status': 'is_live',
+            'location': 'Johannesburg, South Africa',
+            'thumbnail': r're:https?://.+',
+        },
+        'params': {'skip_download': 'Livestream'},
+    }, {
+        'url': 'https://tunein.com/embed/player/t236404354/',
+        'info_dict': {
+            'id': 't236404354',
+            'ext': 'mp3',
+            'title': '#351 – MrBeast: Future of YouTube, Twitter, TikTok, and Instagram',
+            'alt_title': 'Technology Podcasts >',
+            'cast': 'count:1',
+            'description': 'md5:1029895354ef073ff00f20b82eb6eb71',
+            'display_id': '236404354',
+            'duration': 8330,
+            'series': 'Lex Fridman Podcast',
+            'series_id': 'p1153019',
+            'thumbnail': r're:https?://.+',
+            'timestamp': 1673458571,
+            'upload_date': '20230111',
+        },
+    }, {
+        'url': 'https://tunein.com/embed/player/p191660/',
+        'info_dict': {
+            'id': 'p191660',
+            'title': 'SBS Tamil',
+        },
+        'playlist_mincount': 195,
     }]
     _WEBPAGE_TESTS = [{
         'url': 'https://www.martiniinthemorning.com/',
         'info_dict': {
             'id': 's55412',
             'ext': 'mp3',
-            'title': 'TuneInStation video #s55412',
+            'title': str,
+            'alt_title': 'Now that\'s music!',
+            'channel_follower_count': int,
+            'description': 'md5:41588a3e2cf34b3eafc6c33522fa611a',
+            'live_status': 'is_live',
+            'location': 'US',
+            'thumbnail': r're:https?://.+',
         },
-        'expected_warnings': ['unable to extract hydration', 'Extractor failed to obtain "title"'],
+        'params': {'skip_download': 'Livestream'},
     }]
 
     def _real_extract(self, url):
-        station_id = self._match_id(url)
+        embed_id = self._match_id(url)
+        kind = {
+            'p': 'program',
+            's': 'station',
+            't': 'topic',
+        }.get(embed_id[:1])
 
-        webpage = self._download_webpage(url, station_id)
-        metadata = self._extract_metadata(webpage, station_id)
-
-        formats, subtitles = self._extract_formats_and_subtitles(station_id)
-        return {
-            'id': station_id,
-            'title': traverse_obj(metadata, ('profiles', station_id, 'title')),
-            'description': traverse_obj(metadata, ('profiles', station_id, 'description')),
-            'thumbnail': traverse_obj(metadata, ('profiles', station_id, 'image')),
-            'timestamp': parse_iso8601(
-                traverse_obj(metadata, ('profiles', station_id, 'actions', 'play', 'publishTime'))),
-            'location': traverse_obj(
-                metadata, ('profiles', station_id, 'metadata', 'properties', 'location', 'displayName'),
-                ('profiles', station_id, 'properties', 'location', 'displayName')),
-            'formats': formats,
-            'subtitles': subtitles,
-            'is_live': traverse_obj(metadata, ('profiles', station_id, 'actions', 'play', 'isLive')),
-        }
-
-
-class TuneInPodcastIE(TuneInBaseIE):
-    _VALID_URL = TuneInBaseIE._VALID_URL_BASE + r'/(?:podcasts/[^?#]+-|embed/player/)(?P<id>p\d+)/?(?:#|$)'
-    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>(?:https?://)?tunein\.com/embed/player/p\d+)']
-
-    _TESTS = [{
-        'url': 'https://tunein.com/podcasts/Technology-Podcasts/Artificial-Intelligence-p1153019',
-        'info_dict': {
-            'id': 'p1153019',
-            'title': 'Lex Fridman Podcast',
-            'description': 'md5:bedc4e5f1c94f7dec6e4317b5654b00d',
-        },
-        'playlist_mincount': 200,
-    }, {
-        'url': 'https://tunein.com/embed/player/p191660/',
-        'only_matching': True,
-    }, {
-        'url': 'https://tunein.com/podcasts/World-News/BBC-News-p14/',
-        'info_dict': {
-            'id': 'p14',
-            'title': 'BBC News',
-            'description': 'md5:30b9622bcc4bd101d4acd6f38f284aed',
-        },
-        'playlist_mincount': 36,
-    }]
-
-    _PAGE_SIZE = 30
-
-    def _real_extract(self, url):
-        podcast_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, podcast_id, fatal=False)
-        metadata = self._extract_metadata(webpage, podcast_id)
-
-        def page_func(page_num):
-            api_response = self._download_json(
-                f'https://api.tunein.com/profiles/{podcast_id}/contents', podcast_id,
-                note=f'Downloading page {page_num + 1}', query={
-                    'filter': 't:free',
-                    'offset': page_num * self._PAGE_SIZE,
-                    'limit': self._PAGE_SIZE,
-                })
-
-            return [
-                self.url_result(
-                    f'https://tunein.com/podcasts/{podcast_id}?topicId={episode["GuideId"][1:]}',
-                    TuneInPodcastEpisodeIE, title=episode.get('Title'))
-                for episode in api_response['Items']]
-
-        entries = OnDemandPagedList(page_func, self._PAGE_SIZE)
-        return self.playlist_result(
-            entries, playlist_id=podcast_id, title=traverse_obj(metadata, ('profiles', podcast_id, 'title')),
-            description=traverse_obj(metadata, ('profiles', podcast_id, 'description')))
-
-
-class TuneInPodcastEpisodeIE(TuneInBaseIE):
-    _VALID_URL = TuneInBaseIE._VALID_URL_BASE + r'/podcasts/(?:[^?&]+-)?(?P<podcast_id>p\d+)/?\?topicId=(?P<id>\w\d+)'
-
-    _TESTS = [{
-        'url': 'https://tunein.com/podcasts/Technology-Podcasts/Artificial-Intelligence-p1153019/?topicId=236404354',
-        'info_dict': {
-            'id': 't236404354',
-            'title': '#351 – MrBeast: Future of YouTube, Twitter, TikTok, and Instagram',
-            'description': 'md5:2784533b98f8ac45c0820b1e4a8d8bb2',
-            'thumbnail': r're:https?://cdn-profiles\.tunein\.com/.+',
-            'timestamp': 1673458571,
-            'upload_date': '20230111',
-            'series_id': 'p1153019',
-            'series': 'Lex Fridman Podcast',
-            'ext': 'mp3',
-        },
-    }]
-
-    def _real_extract(self, url):
-        podcast_id, episode_id = self._match_valid_url(url).group('podcast_id', 'id')
-        episode_id = f't{episode_id}'
-
-        webpage = self._download_webpage(url, episode_id)
-        metadata = self._extract_metadata(webpage, episode_id)
-
-        formats, subtitles = self._extract_formats_and_subtitles(episode_id)
-        return {
-            'id': episode_id,
-            'title': traverse_obj(metadata, ('profiles', episode_id, 'title')),
-            'description': traverse_obj(metadata, ('profiles', episode_id, 'description')),
-            'thumbnail': traverse_obj(metadata, ('profiles', episode_id, 'image')),
-            'timestamp': parse_iso8601(
-                traverse_obj(metadata, ('profiles', episode_id, 'actions', 'play', 'publishTime'))),
-            'series_id': podcast_id,
-            'series': traverse_obj(metadata, ('profiles', podcast_id, 'title')),
-            'formats': formats,
-            'subtitles': subtitles,
-        }
+        return self.url_result(
+            f'https://tunein.com/{kind}/?{kind}id={embed_id[1:]}')
 
 
 class TuneInShortenerIE(InfoExtractor):
-    _WORKING = False
     IE_NAME = 'tunein:shortener'
     IE_DESC = False  # Do not list
-    _VALID_URL = r'https?://tun\.in/(?P<id>[A-Za-z0-9]+)'
-
+    _VALID_URL = r'https?://tun\.in/(?P<id>[^/?#]+)'
     _TESTS = [{
-        # test redirection
         'url': 'http://tun.in/ser7s',
         'info_dict': {
             'id': 's34682',
             'title': str,
-            'description': 'md5:d6d0b89063fd68d529fa7058ee98619b',
-            'thumbnail': r're:https?://cdn-profiles\.tunein\.com/.+',
-            'location': 'Seattle-Tacoma, US',
             'ext': 'mp3',
+            'alt_title': 'World Class Jazz',
+            'channel_follower_count': int,
+            'description': 'md5:d6d0b89063fd68d529fa7058ee98619b',
+            'location': r're:Seattle-Tacoma, (?:US|WA)',
             'live_status': 'is_live',
+            'thumbnail': r're:https?://.+',
         },
-        'params': {
-            'skip_download': True,  # live stream
+        'params': {'skip_download': 'Livestream'},
+    }, {
+        'url': 'http://tun.in/tqeeFw',
+        'info_dict': {
+            'id': 't236404354',
+            'title': str,
+            'ext': 'mp3',
+            'alt_title': 'Technology Podcasts >',
+            'cast': 'count:1',
+            'description': 'md5:1029895354ef073ff00f20b82eb6eb71',
+            'display_id': '236404354',
+            'duration': 8330,
+            'series': 'Lex Fridman Podcast',
+            'series_id': 'p1153019',
+            'thumbnail': r're:https?://.+',
+            'timestamp': 1673458571,
+            'upload_date': '20230111',
         },
+        'params': {'skip_download': 'Livestream'},
+    }, {
+        'url': 'http://tun.in/pei6i',
+        'info_dict': {
+            'id': 'p14',
+            'title': 'BBC News',
+        },
+        'playlist_mincount': 35,
     }]
 
     def _real_extract(self, url):
         redirect_id = self._match_id(url)
         # The server doesn't support HEAD requests
-        urlh = self._request_webpage(
-            url, redirect_id, note='Downloading redirect page')
-
-        url = urlh.url
-        url_parsed = urllib.parse.urlparse(url)
-        if url_parsed.port == 443:
-            url = url_parsed._replace(netloc=url_parsed.hostname).url
-
-        self.to_screen(f'Following redirect: {url}')
-        return self.url_result(url)
+        urlh = self._request_webpage(url, redirect_id, 'Downloading redirect page')
+        # Need to strip port from URL
+        parsed = urllib.parse.urlparse(urlh.url)
+        new_url = parsed._replace(netloc=parsed.hostname).geturl()
+        # Prevent infinite loop in case redirect fails
+        if self.suitable(new_url):
+            raise UnsupportedError(new_url)
+        return self.url_result(new_url)

yt_dlp/extractor/twitch.py

@@ -44,7 +44,7 @@ class TwitchBaseIE(InfoExtractor):
         'CollectionSideBar': '27111f1b382effad0b6def325caef1909c733fe6a4fbabf54f8d491ef2cf2f14',
         'FilterableVideoTower_Videos': 'a937f1d22e269e39a03b509f65a7490f9fc247d7f83d6ac1421523e3b68042cb',
         'ClipsCards__User': 'b73ad2bfaecfd30a9e6c28fada15bd97032c83ec77a0440766a56fe0bd632777',
-        'ShareClipRenderStatus': 'f130048a462a0ac86bb54d653c968c514e9ab9ca94db52368c1179e97b0f16eb',
+        'ShareClipRenderStatus': 'e0a46b287d760c6890a39d1ccd736af5ec9479a267d02c710e9ac33326b651d2',
         'ChannelCollectionsContent': '447aec6a0cc1e8d0a8d7732d47eb0762c336a2294fdb009e9c9d854e49d484b9',
         'StreamMetadata': 'a647c2a13599e5991e175155f798ca7f1ecddde73f7f341f39009c14dbf59962',
         'ComscoreStreamingQuery': 'e1edae8122517d013405f237ffcc124515dc6ded82480a88daef69c83b53ac01',
@@ -1153,8 +1153,8 @@ class TwitchClipsIE(TwitchBaseIE):
             'channel_id': '25163635',
             'channel_is_verified': False,
             'channel_follower_count': int,
-            'uploader': 'EA',
-            'uploader_id': '25163635',
+            'uploader': 'stereotype_',
+            'uploader_id': '43566419',
         },
     }, {
         'url': 'https://www.twitch.tv/xqc/clip/CulturedAmazingKuduDatSheffy-TiZ_-ixAGYR3y2Uy',
@@ -1174,8 +1174,8 @@ class TwitchClipsIE(TwitchBaseIE):
             'channel_id': '71092938',
             'channel_is_verified': True,
             'channel_follower_count': int,
-            'uploader': 'xQc',
-            'uploader_id': '71092938',
+            'uploader': 'okSTFUdude',
+            'uploader_id': '744085721',
             'categories': ['Just Chatting'],
         },
     }, {

yt_dlp/extractor/txxx.py

@@ -343,22 +343,6 @@ class TxxxIE(InfoExtractor):
             'thumbnail': 'https://tn.voyeurhit.com/contents/videos_sources/332000/332875/screenshots/1.jpg',
         },
     }]
-    _WEBPAGE_TESTS = [{
-        'url': 'https://pornzog.com/video/9125519/michelle-malone-dreamgirls-wild-wet-3/',
-        'info_dict': {
-            'id': '5119660',
-            'display_id': '5119660',
-            'ext': 'mp4',
-            'title': 'Michelle Malone - Dreamgirls - Wild Wet 3',
-            'uploader': 'FallenAngel12',
-            'duration': 402,
-            'view_count': int,
-            'like_count': int,
-            'dislike_count': int,
-            'age_limit': 18,
-            'thumbnail': 'https://hctn.nv7s.com/contents/videos_sources/5119000/5119660/screenshots/1.jpg',
-        },
-    }]
 
     def _call_api(self, url, video_id, fatal=False, **kwargs):
         content = self._download_json(url, video_id, fatal=fatal, **kwargs)

yt_dlp/extractor/unsupported.py

@@ -30,13 +30,13 @@ class KnownDRMIE(UnsupportedInfoExtractor):
         r'play\.hbomax\.com',
         r'channel(?:4|5)\.com',
         r'peacocktv\.com',
-        r'(?:[\w\.]+\.)?disneyplus\.com',
-        r'open\.spotify\.com/(?:track|playlist|album|artist)',
+        r'(?:[\w.]+\.)?disneyplus\.com',
+        r'open\.spotify\.com',
         r'tvnz\.co\.nz',
         r'oneplus\.ch',
         r'artstation\.com/learning/courses',
         r'philo\.com',
-        r'(?:[\w\.]+\.)?mech-plus\.com',
+        r'(?:[\w.]+\.)?mech-plus\.com',
         r'aha\.video',
         r'mubi\.com',
         r'vootkids\.com',
@@ -57,6 +57,15 @@ class KnownDRMIE(UnsupportedInfoExtractor):
         r'ctv\.ca',
         r'noovo\.ca',
         r'tsn\.ca',
+        r'paramountplus\.com',
+        r'(?:m\.)?(?:sony)?crackle\.com',
+        r'cw(?:tv(?:pr)?|seed)\.com',
+        r'6play\.fr',
+        r'rtlplay\.be',
+        r'play\.rtl\.hr',
+        r'rtlmost\.hu',
+        r'plus\.rtl\.de(?!/podcast/)',
+        r'mediasetinfinity\.es',
     )
 
     _TESTS = [{
@@ -78,10 +87,7 @@ class KnownDRMIE(UnsupportedInfoExtractor):
         'url': r'https://www.disneyplus.com',
         'only_matching': True,
     }, {
-        'url': 'https://open.spotify.com/artist/',
-        'only_matching': True,
-    }, {
-        'url': 'https://open.spotify.com/track/',
+        'url': 'https://open.spotify.com',
         'only_matching': True,
     }, {
         # https://github.com/yt-dlp/yt-dlp/issues/4122
@@ -184,6 +190,42 @@ class KnownDRMIE(UnsupportedInfoExtractor):
     }, {
         'url': 'https://www.tsn.ca/video/relaxed-oilers-look-to-put-emotional-game-2-loss-in-the-rearview%7E3148747',
         'only_matching': True,
+    }, {
+        'url': 'https://www.paramountplus.com',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.crackle.com',
+        'only_matching': True,
+    }, {
+        'url': 'https://m.sonycrackle.com',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.cwtv.com',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.cwseed.com',
+        'only_matching': True,
+    }, {
+        'url': 'https://cwtvpr.com',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.6play.fr',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.rtlplay.be',
+        'only_matching': True,
+    }, {
+        'url': 'https://play.rtl.hr',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.rtlmost.hu',
+        'only_matching': True,
+    }, {
+        'url': 'https://plus.rtl.de/video-tv/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.mediasetinfinity.es/',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -222,6 +264,7 @@ class KnownPiracyIE(UnsupportedInfoExtractor):
         r'91porn\.com',
         r'einthusan\.(?:tv|com|ca)',
         r'yourupload\.com',
+        r'xanimu\.com',
     )
 
     _TESTS = [{

yt_dlp/extractor/vesti.py

@@ -1,119 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from .rutv import RUTVIE
-from ..utils import ExtractorError
-
-
-class VestiIE(InfoExtractor):
-    _WORKING = False
-    IE_DESC = 'Вести.Ru'
-    _VALID_URL = r'https?://(?:.+?\.)?vesti\.ru/(?P<id>.+)'
-
-    _TESTS = [
-        {
-            'url': 'http://www.vesti.ru/videos?vid=575582&cid=1',
-            'info_dict': {
-                'id': '765035',
-                'ext': 'mp4',
-                'title': 'Вести.net: биткоины в России не являются законными',
-                'description': 'md5:d4bb3859dc1177b28a94c5014c35a36b',
-                'duration': 302,
-            },
-            'params': {
-                # m3u8 download
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'http://www.vesti.ru/doc.html?id=1349233',
-            'info_dict': {
-                'id': '773865',
-                'ext': 'mp4',
-                'title': 'Участники митинга штурмуют Донецкую областную администрацию',
-                'description': 'md5:1a160e98b3195379b4c849f2f4958009',
-                'duration': 210,
-            },
-            'params': {
-                # m3u8 download
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'http://www.vesti.ru/only_video.html?vid=576180',
-            'info_dict': {
-                'id': '766048',
-                'ext': 'mp4',
-                'title': 'США заморозило, Британию затопило',
-                'description': 'md5:f0ed0695ec05aed27c56a70a58dc4cc1',
-                'duration': 87,
-            },
-            'params': {
-                # m3u8 download
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'http://hitech.vesti.ru/news/view/id/4000',
-            'info_dict': {
-                'id': '766888',
-                'ext': 'mp4',
-                'title': 'Вести.net: интернет-гиганты начали перетягивание программных "одеял"',
-                'description': 'md5:65ddd47f9830c4f42ed6475f8730c995',
-                'duration': 279,
-            },
-            'params': {
-                # m3u8 download
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'http://sochi2014.vesti.ru/video/index/video_id/766403',
-            'info_dict': {
-                'id': '766403',
-                'ext': 'mp4',
-                'title': 'XXII зимние Олимпийские игры. Российские хоккеисты стартовали на Олимпиаде с победы',
-                'description': 'md5:55805dfd35763a890ff50fa9e35e31b3',
-                'duration': 271,
-            },
-            'params': {
-                # m3u8 download
-                'skip_download': True,
-            },
-            'skip': 'Blocked outside Russia',
-        },
-        {
-            'url': 'http://sochi2014.vesti.ru/live/play/live_id/301',
-            'info_dict': {
-                'id': '51499',
-                'ext': 'flv',
-                'title': 'Сочи-2014. Биатлон. Индивидуальная гонка. Мужчины ',
-                'description': 'md5:9e0ed5c9d2fa1efbfdfed90c9a6d179c',
-            },
-            'params': {
-                # rtmp download
-                'skip_download': True,
-            },
-            'skip': 'Translation has finished',
-        },
-    ]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-
-        page = self._download_webpage(url, video_id, 'Downloading page')
-
-        mobj = re.search(
-            r'<meta[^>]+?property="og:video"[^>]+?content="http://www\.vesti\.ru/i/flvplayer_videoHost\.swf\?vid=(?P<id>\d+)',
-            page)
-        if mobj:
-            video_id = mobj.group('id')
-            page = self._download_webpage(f'http://www.vesti.ru/only_video.html?vid={video_id}', video_id,
-                                          'Downloading video page')
-
-        rutv_url = RUTVIE._extract_url(page)
-        if rutv_url:
-            return self.url_result(rutv_url, 'RUTV')
-
-        raise ExtractorError('No video found', expected=True)

yt_dlp/extractor/vimeo.py

@@ -151,7 +151,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                     'Referer': self._LOGIN_URL,
                 })
         except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status in (405, 418):
+            if isinstance(e.cause, HTTPError) and e.cause.status in (404, 405, 418):
                 raise ExtractorError(
                     'Unable to log in: bad username or password',
                     expected=True)

yt_dlp/extractor/vk.py

@@ -96,12 +96,12 @@ class VKIE(VKBaseIE):
                     https?://
                         (?:
                             (?:
-                                (?:(?:m|new)\.)?vk(?:(?:video)?\.ru|\.com)/video_|
+                                (?:(?:m|new|vksport)\.)?vk(?:(?:video)?\.ru|\.com)/video_|
                                 (?:www\.)?daxab\.com/
                             )
                             ext\.php\?(?P<embed_query>.*?\boid=(?P<oid>-?\d+).*?\bid=(?P<id>\d+).*)|
                             (?:
-                                (?:(?:m|new)\.)?vk(?:(?:video)?\.ru|\.com)/(?:.+?\?.*?z=)?(?:video|clip)|
+                                (?:(?:m|new|vksport)\.)?vk(?:(?:video)?\.ru|\.com)/(?:.+?\?.*?z=)?(?:video|clip)|
                                 (?:www\.)?daxab\.com/embed/
                             )
                             (?P<videoid>-?\d+_\d+)(?:.*\blist=(?P<list_id>([\da-f]+)|(ln-[\da-zA-Z]+)))?
@@ -359,6 +359,10 @@ class VKIE(VKBaseIE):
             'url': 'https://vk.ru/video-220754053_456242564',
             'only_matching': True,
         },
+        {
+            'url': 'https://vksport.vkvideo.ru/video-124096712_456240773',
+            'only_matching': True,
+        },
     ]
 
     def _real_extract(self, url):
@@ -568,7 +572,7 @@ class VKUserVideosIE(VKBaseIE):
     IE_DESC = "VK - User's Videos"
     _BASE_URL_RE = r'https?://(?:(?:m|new)\.)?vk(?:video\.ru|\.com/video)'
     _VALID_URL = [
-        rf'{_BASE_URL_RE}/playlist/(?P<id>-?\d+_\d+)',
+        rf'{_BASE_URL_RE}/playlist/(?P<id>-?\d+_-?\d+)',
         rf'{_BASE_URL_RE}/(?P<id>@[^/?#]+)(?:/all)?/?(?!\?.*\bz=video)(?:[?#]|$)',
     ]
     _TESTS = [{
@@ -598,6 +602,9 @@ class VKUserVideosIE(VKBaseIE):
     }, {
         'url': 'https://vk.com/video/playlist/-174476437_2',
         'only_matching': True,
+    }, {
+        'url': 'https://vkvideo.ru/playlist/-51890028_-2',
+        'only_matching': True,
     }]
     _VIDEO = collections.namedtuple('Video', ['owner_id', 'id'])
 
@@ -723,7 +730,7 @@ class VKWallPostIE(VKBaseIE):
     def _unmask_url(self, mask_url, vk_id):
         if 'audio_api_unavailable' in mask_url:
             extra = mask_url.split('?extra=')[1].split('#')
-            func, base = self._decode(extra[1]).split(chr(11))
+            _, base = self._decode(extra[1]).split(chr(11))
             mask_url = list(self._decode(extra[0]))
             url_len = len(mask_url)
             indexes = [None] * url_len

yt_dlp/extractor/xanimu.py

@@ -1,52 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import int_or_none
-
-
-class XanimuIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?xanimu\.com/(?P<id>[^/]+)/?'
-    _TESTS = [{
-        'url': 'https://xanimu.com/51944-the-princess-the-frog-hentai/',
-        'md5': '899b88091d753d92dad4cb63bbf357a7',
-        'info_dict': {
-            'id': '51944-the-princess-the-frog-hentai',
-            'ext': 'mp4',
-            'title': 'The Princess + The Frog Hentai',
-            'thumbnail': 'https://xanimu.com/storage/2020/09/the-princess-and-the-frog-hentai.jpg',
-            'description': r're:^Enjoy The Princess \+ The Frog Hentai',
-            'duration': 207.0,
-            'age_limit': 18,
-        },
-    }, {
-        'url': 'https://xanimu.com/huge-expansion/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        formats = []
-        for format_id in ['videoHigh', 'videoLow']:
-            format_url = self._search_json(
-                rf'var\s+{re.escape(format_id)}\s*=', webpage, format_id,
-                video_id, default=None, contains_pattern=r'[\'"]([^\'"]+)[\'"]')
-            if format_url:
-                formats.append({
-                    'url': format_url,
-                    'format_id': format_id,
-                    'quality': -2 if format_id.endswith('Low') else None,
-                })
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': self._search_regex(r'[\'"]headline[\'"]:\s*[\'"]([^"]+)[\'"]', webpage,
-                                        'title', default=None) or self._html_extract_title(webpage),
-            'thumbnail': self._html_search_meta('thumbnailUrl', webpage, default=None),
-            'description': self._html_search_meta('description', webpage, default=None),
-            'duration': int_or_none(self._search_regex(r'duration:\s*[\'"]([^\'"]+?)[\'"]',
-                                    webpage, 'duration', fatal=False)),
-            'age_limit': 18,
-        }

yt_dlp/extractor/xhamster.py

@@ -1,3 +1,5 @@
+import base64
+import codecs
 import itertools
 import re
 
@@ -10,12 +12,13 @@ from ..utils import (
     extract_attributes,
     float_or_none,
     int_or_none,
+    join_nonempty,
     parse_duration,
     str_or_none,
+    try_call,
     try_get,
     unified_strdate,
     url_or_none,
-    urljoin,
 )
 
 
@@ -140,6 +143,27 @@ class XHamsterIE(InfoExtractor):
         'only_matching': True,
     }]
 
+    _XOR_KEY = b'xh7999'
+
+    def _decipher_format_url(self, format_url, format_id):
+        cipher_type, _, ciphertext = try_call(
+            lambda: base64.b64decode(format_url).decode().partition('_')) or [None] * 3
+
+        if not cipher_type or not ciphertext:
+            self.report_warning(f'Skipping format "{format_id}": failed to decipher URL')
+            return None
+
+        if cipher_type == 'xor':
+            return bytes(
+                a ^ b for a, b in
+                zip(ciphertext.encode(), itertools.cycle(self._XOR_KEY))).decode()
+
+        if cipher_type == 'rot13':
+            return codecs.decode(ciphertext, cipher_type)
+
+        self.report_warning(f'Skipping format "{format_id}": unsupported cipher type "{cipher_type}"')
+        return None
+
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         video_id = mobj.group('id') or mobj.group('id_2')
@@ -210,7 +234,7 @@ class XHamsterIE(InfoExtractor):
                         hls_url = hls_sources.get(hls_format_key)
                         if not hls_url:
                             continue
-                        hls_url = urljoin(url, hls_url)
+                        hls_url = self._decipher_format_url(hls_url, f'hls-{hls_format_key}')
                         if not hls_url or hls_url in format_urls:
                             continue
                         format_urls.add(hls_url)
@@ -219,7 +243,7 @@ class XHamsterIE(InfoExtractor):
                             m3u8_id='hls', fatal=False))
                 standard_sources = xplayer_sources.get('standard')
                 if isinstance(standard_sources, dict):
-                    for format_id, formats_list in standard_sources.items():
+                    for identifier, formats_list in standard_sources.items():
                         if not isinstance(formats_list, list):
                             continue
                         for standard_format in formats_list:
@@ -229,7 +253,11 @@ class XHamsterIE(InfoExtractor):
                                 standard_url = standard_format.get(standard_format_key)
                                 if not standard_url:
                                     continue
-                                standard_url = urljoin(url, standard_url)
+                                quality = (str_or_none(standard_format.get('quality'))
+                                           or str_or_none(standard_format.get('label'))
+                                           or '')
+                                format_id = join_nonempty(identifier, quality)
+                                standard_url = self._decipher_format_url(standard_url, format_id)
                                 if not standard_url or standard_url in format_urls:
                                     continue
                                 format_urls.add(standard_url)
@@ -239,11 +267,9 @@ class XHamsterIE(InfoExtractor):
                                         standard_url, video_id, 'mp4', entry_protocol='m3u8_native',
                                         m3u8_id='hls', fatal=False))
                                     continue
-                                quality = (str_or_none(standard_format.get('quality'))
-                                           or str_or_none(standard_format.get('label'))
-                                           or '')
+
                                 formats.append({
-                                    'format_id': f'{format_id}-{quality}',
+                                    'format_id': format_id,
                                     'url': standard_url,
                                     'ext': ext,
                                     'height': get_height(quality),

yt_dlp/extractor/youtube/_video.py

@@ -2015,16 +2015,28 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
 
             time.sleep(max(0, FETCH_SPAN + fetch_time - time.time()))
 
+    def _get_player_js_version(self):
+        player_js_version = self._configuration_arg('player_js_version', [''])[0] or '20348@0004de42'
+        if player_js_version == 'actual':
+            return None, None
+        if not re.fullmatch(r'[0-9]{5,}@[0-9a-f]{8,}', player_js_version):
+            self.report_warning(
+                f'Invalid player JS version "{player_js_version}" specified. '
+                f'It should be "actual" or in the format of STS@HASH', only_once=True)
+            return None, None
+        return player_js_version.split('@')
+
     def _extract_player_url(self, *ytcfgs, webpage=None):
         player_url = traverse_obj(
             ytcfgs, (..., 'PLAYER_JS_URL'), (..., 'WEB_PLAYER_CONTEXT_CONFIGS', ..., 'jsUrl'),
             get_all=False, expected_type=str)
         if not player_url:
             return
+        player_id_override = self._get_player_js_version()[1]
 
         requested_js_variant = self._configuration_arg('player_js_variant', [''])[0] or 'main'
         if requested_js_variant in self._PLAYER_JS_VARIANT_MAP:
-            player_id = self._extract_player_info(player_url)
+            player_id = player_id_override or self._extract_player_info(player_url)
             original_url = player_url
             player_url = f'/s/player/{player_id}/{self._PLAYER_JS_VARIANT_MAP[requested_js_variant]}'
             if original_url != player_url:
@@ -2107,47 +2119,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
 
         return lambda s: ''.join(s[i] for i in cache_spec)
 
-    def _print_sig_code(self, func, example_sig):
-        if not self.get_param('youtube_print_sig_code'):
-            return
-
-        def gen_sig_code(idxs):
-            def _genslice(start, end, step):
-                starts = '' if start == 0 else str(start)
-                ends = (':%d' % (end + step)) if end + step >= 0 else ':'
-                steps = '' if step == 1 else (':%d' % step)
-                return f's[{starts}{ends}{steps}]'
-
-            step = None
-            # Quelch pyflakes warnings - start will be set when step is set
-            start = '(Never used)'
-            for i, prev in zip(idxs[1:], idxs[:-1]):
-                if step is not None:
-                    if i - prev == step:
-                        continue
-                    yield _genslice(start, prev, step)
-                    step = None
-                    continue
-                if i - prev in [-1, 1]:
-                    step = i - prev
-                    start = prev
-                    continue
-                else:
-                    yield 's[%d]' % prev
-            if step is None:
-                yield 's[%d]' % i
-            else:
-                yield _genslice(start, i, step)
-
-        test_string = ''.join(map(chr, range(len(example_sig))))
-        cache_res = func(test_string)
-        cache_spec = [ord(c) for c in cache_res]
-        expr_code = ' + '.join(gen_sig_code(cache_spec))
-        signature_id_tuple = '({})'.format(', '.join(str(len(p)) for p in example_sig.split('.')))
-        code = (f'if tuple(len(p) for p in s.split(\'.\')) == {signature_id_tuple}:\n'
-                f'    return {expr_code}\n')
-        self.to_screen('Extracted signature function:\n' + code)
-
     def _parse_sig_js(self, jscode, player_url):
         # Examples where `sig` is funcname:
         # sig=function(a){a=a.split(""); ... ;return a.join("")};
@@ -2216,7 +2187,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         extract_sig = self._cached(
             self._extract_signature_function, 'sig', player_url, self._signature_cache_id(s))
         func = extract_sig(video_id, player_url, s)
-        self._print_sig_code(func, s)
         return func(s)
 
     def _decrypt_nsig(self, s, video_id, player_url):
@@ -2226,11 +2196,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         player_url = urljoin('https://www.youtube.com', player_url)
 
         try:
-            jsi, player_id, func_code = self._extract_n_function_code(video_id, player_url)
+            jsi, _, func_code = self._extract_n_function_code(video_id, player_url)
         except ExtractorError as e:
             raise ExtractorError('Unable to extract nsig function code', cause=e)
-        if self.get_param('youtube_print_sig_code'):
-            self.to_screen(f'Extracted nsig function from {player_id}:\n{func_code[1]}\n')
 
         try:
             extract_nsig = self._cached(self._extract_n_function_from_code, self._NSIG_FUNC_CACHE_ID, player_url)
@@ -2431,6 +2399,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         Extract signatureTimestamp (sts)
         Required to tell API what sig/player version is in use.
         """
+        player_sts_override = self._get_player_js_version()[0]
+        if player_sts_override:
+            return int(player_sts_override)
+
         if sts := traverse_obj(ytcfg, ('STS', {int_or_none})):
             return sts
 
@@ -2760,7 +2732,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         if max_depth == 1 and parent:
             return
 
-        max_comments, max_parents, max_replies, max_replies_per_thread, *_ = (
+        _max_comments, max_parents, max_replies, max_replies_per_thread, *_ = (
             int_or_none(p, default=sys.maxsize) for p in self._configuration_arg('max_comments') + [''] * 4)
 
         continuation = self._extract_continuation(root_continuation_data)
@@ -3580,23 +3552,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
 
         needs_live_processing = self._needs_live_processing(live_status, duration)
         skip_bad_formats = 'incomplete' not in format_types
-        if self._configuration_arg('include_incomplete_formats'):
-            skip_bad_formats = False
-            self._downloader.deprecated_feature('[youtube] include_incomplete_formats extractor argument is deprecated. '
-                                                'Use formats=incomplete extractor argument instead')
 
         skip_manifests = set(self._configuration_arg('skip'))
-        if (not self.get_param('youtube_include_hls_manifest', True)
-                or needs_live_processing == 'is_live'  # These will be filtered out by YoutubeDL anyway
+        if (needs_live_processing == 'is_live'  # These will be filtered out by YoutubeDL anyway
                 or (needs_live_processing and skip_bad_formats)):
             skip_manifests.add('hls')
-
-        if not self.get_param('youtube_include_dash_manifest', True):
-            skip_manifests.add('dash')
-        if self._configuration_arg('include_live_dash'):
-            self._downloader.deprecated_feature('[youtube] include_live_dash extractor argument is deprecated. '
-                                                'Use formats=incomplete extractor argument instead')
-        elif skip_bad_formats and live_status == 'is_live' and needs_live_processing != 'is_live':
+        if skip_bad_formats and live_status == 'is_live' and needs_live_processing != 'is_live':
             skip_manifests.add('dash')
 
         def process_manifest_format(f, proto, client_name, itag, missing_pot):

yt_dlp/extractor/zingmp3.py

@@ -476,7 +476,7 @@ class ZingMp3UserIE(ZingMp3BaseIE):
 
 class ZingMp3HubIE(ZingMp3BaseIE):
     IE_NAME = 'zingmp3:hub'
-    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<type>hub)/(?P<regions>[^/]+)/(?P<id>[^\.]+)'
+    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<type>hub)/[^/?#]+/(?P<id>[^./?#]+)'
     _TESTS = [{
         'url': 'https://zingmp3.vn/hub/Nhac-Moi/IWZ9Z0CA.html',
         'info_dict': {
@@ -496,7 +496,7 @@ class ZingMp3HubIE(ZingMp3BaseIE):
     }]
 
     def _real_extract(self, url):
-        song_id, regions, url_type = self._match_valid_url(url).group('id', 'regions', 'type')
+        song_id, url_type = self._match_valid_url(url).group('id', 'type')
         hub_detail = self._call_api(url_type, {'id': song_id})
         entries = self._parse_items(traverse_obj(hub_detail, (
             'sections', lambda _, v: v['sectionId'] == 'hub', 'items', ...)))

yt_dlp/networking/_helper.py

@@ -200,7 +200,7 @@ def wrap_request_errors(func):
 
 
 def _socket_connect(ip_addr, timeout, source_address):
-    af, socktype, proto, canonname, sa = ip_addr
+    af, socktype, proto, _canonname, sa = ip_addr
     sock = socket.socket(af, socktype, proto)
     try:
         if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
@@ -215,7 +215,7 @@ def _socket_connect(ip_addr, timeout, source_address):
 
 
 def create_socks_proxy_socket(dest_addr, proxy_args, proxy_ip_addr, timeout, source_address):
-    af, socktype, proto, canonname, sa = proxy_ip_addr
+    af, socktype, proto, _canonname, sa = proxy_ip_addr
     sock = sockssocket(af, socktype, proto)
     try:
         connect_proxy_args = proxy_args.copy()

yt_dlp/options.py

@@ -389,10 +389,6 @@ def create_parser():
         '--abort-on-error', '--no-ignore-errors',
         action='store_false', dest='ignoreerrors',
         help='Abort downloading of further videos if an error occurs (Alias: --no-ignore-errors)')
-    general.add_option(
-        '--dump-user-agent',
-        action='store_true', dest='dump_user_agent', default=False,
-        help='Display the current user-agent and exit')
     general.add_option(
         '--list-extractors',
         action='store_true', dest='list_extractors', default=False,
@@ -616,10 +612,6 @@ def create_parser():
         help=(
             'Use this proxy to verify the IP address for some geo-restricted sites. '
             'The default proxy specified by --proxy (or none, if the option is not present) is used for the actual downloading'))
-    geo.add_option(
-        '--cn-verification-proxy',
-        dest='cn_verification_proxy', default=None, metavar='URL',
-        help=optparse.SUPPRESS_HELP)
     geo.add_option(
         '--xff', metavar='VALUE',
         dest='geo_bypass', default='default',
@@ -778,14 +770,6 @@ def create_parser():
         '--skip-playlist-after-errors', metavar='N',
         dest='skip_playlist_after_errors', default=None, type=int,
         help='Number of allowed failures until the rest of the playlist is skipped')
-    selection.add_option(
-        '--include-ads',
-        dest='include_ads', action='store_true',
-        help=optparse.SUPPRESS_HELP)
-    selection.add_option(
-        '--no-include-ads',
-        dest='include_ads', action='store_false',
-        help=optparse.SUPPRESS_HELP)
 
     authentication = optparse.OptionGroup(parser, 'Authentication Options')
     authentication.add_option(
@@ -1071,10 +1055,6 @@ def create_parser():
         '--no-lazy-playlist',
         action='store_false', dest='lazy_playlist',
         help='Process videos in the playlist only after the entire playlist is parsed (default)')
-    downloader.add_option(
-        '--xattr-set-filesize',
-        dest='xattr_set_filesize', action='store_true',
-        help='Set file xattribute ytdl.filesize with expected file size')
     downloader.add_option(
         '--hls-prefer-native',
         dest='hls_prefer_native', action='store_true', default=None,
@@ -1335,7 +1315,7 @@ def create_parser():
         action='store_true', dest='verbose', default=False,
         help='Print various debugging information')
     verbosity.add_option(
-        '--dump-pages', '--dump-intermediate-pages',
+        '--dump-pages',
         action='store_true', dest='dump_intermediate_pages', default=False,
         help='Print downloaded pages encoded using base64 to debug problems (very verbose)')
     verbosity.add_option(
@@ -1347,23 +1327,9 @@ def create_parser():
         action='store_true', dest='load_pages', default=False,
         help=optparse.SUPPRESS_HELP)
     verbosity.add_option(
-        '--youtube-print-sig-code',
-        action='store_true', dest='youtube_print_sig_code', default=False,
-        help=optparse.SUPPRESS_HELP)
-    verbosity.add_option(
-        '--print-traffic', '--dump-headers',
+        '--print-traffic',
         dest='debug_printtraffic', action='store_true', default=False,
         help='Display sent and read HTTP traffic')
-    verbosity.add_option(
-        '-C', '--call-home',
-        dest='call_home', action='store_true', default=False,
-        # help='Contact the yt-dlp server for debugging')
-        help=optparse.SUPPRESS_HELP)
-    verbosity.add_option(
-        '--no-call-home',
-        dest='call_home', action='store_false',
-        # help='Do not contact the yt-dlp server for debugging (default)')
-        help=optparse.SUPPRESS_HELP)
 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(
@@ -1488,14 +1454,6 @@ def create_parser():
         '--no-write-info-json',
         action='store_false', dest='writeinfojson',
         help='Do not write video metadata (default)')
-    filesystem.add_option(
-        '--write-annotations',
-        action='store_true', dest='writeannotations', default=False,
-        help=optparse.SUPPRESS_HELP)
-    filesystem.add_option(
-        '--no-write-annotations',
-        action='store_false', dest='writeannotations',
-        help=optparse.SUPPRESS_HELP)
     filesystem.add_option(
         '--write-playlist-metafiles',
         action='store_true', dest='allow_playlist_files', default=None,
@@ -1755,15 +1713,7 @@ def create_parser():
             'detect_or_warn (the default; fix the file if we can, warn otherwise), '
             'force (try fixing even if the file already exists)'))
     postproc.add_option(
-        '--prefer-avconv', '--no-prefer-ffmpeg',
-        action='store_false', dest='prefer_ffmpeg',
-        help=optparse.SUPPRESS_HELP)
-    postproc.add_option(
-        '--prefer-ffmpeg', '--no-prefer-avconv',
-        action='store_true', dest='prefer_ffmpeg', default=True,
-        help=optparse.SUPPRESS_HELP)
-    postproc.add_option(
-        '--ffmpeg-location', '--avconv-location', metavar='PATH',
+        '--ffmpeg-location', metavar='PATH',
         dest='ffmpeg_location',
         help='Location of the ffmpeg binary; either the path to the binary or its containing directory')
     postproc.add_option(
@@ -1900,38 +1850,6 @@ def create_parser():
         default='https://sponsor.ajay.app', dest='sponsorblock_api',
         help='SponsorBlock API location, defaults to %default')
 
-    sponsorblock.add_option(
-        '--sponskrub',
-        action='store_true', dest='sponskrub', default=False,
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--no-sponskrub',
-        action='store_false', dest='sponskrub',
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--sponskrub-cut', default=False,
-        action='store_true', dest='sponskrub_cut',
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--no-sponskrub-cut',
-        action='store_false', dest='sponskrub_cut',
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--sponskrub-force', default=False,
-        action='store_true', dest='sponskrub_force',
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--no-sponskrub-force',
-        action='store_true', dest='sponskrub_force',
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--sponskrub-location', metavar='PATH',
-        dest='sponskrub_path', default='',
-        help=optparse.SUPPRESS_HELP)
-    sponsorblock.add_option(
-        '--sponskrub-args', dest='sponskrub_args', metavar='ARGS',
-        help=optparse.SUPPRESS_HELP)
-
     extractor = optparse.OptionGroup(parser, 'Extractor Options')
     extractor.add_option(
         '--extractor-retries',
@@ -1967,22 +1885,56 @@ def create_parser():
         }, help=(
             'Pass ARGS arguments to the IE_KEY extractor. See "EXTRACTOR ARGUMENTS" for details. '
             'You can use this option multiple times to give arguments for different extractors'))
-    extractor.add_option(
-        '--youtube-include-dash-manifest', '--no-youtube-skip-dash-manifest',
-        action='store_true', dest='youtube_include_dash_manifest', default=True,
-        help=optparse.SUPPRESS_HELP)
-    extractor.add_option(
-        '--youtube-skip-dash-manifest', '--no-youtube-include-dash-manifest',
-        action='store_false', dest='youtube_include_dash_manifest',
-        help=optparse.SUPPRESS_HELP)
-    extractor.add_option(
-        '--youtube-include-hls-manifest', '--no-youtube-skip-hls-manifest',
-        action='store_true', dest='youtube_include_hls_manifest', default=True,
-        help=optparse.SUPPRESS_HELP)
-    extractor.add_option(
-        '--youtube-skip-hls-manifest', '--no-youtube-include-hls-manifest',
-        action='store_false', dest='youtube_include_hls_manifest',
-        help=optparse.SUPPRESS_HELP)
+
+    def _deprecated_option_callback(option, opt_str, value, parser):
+        current = getattr(parser.values, '_deprecated_options', [])
+        parser.values._deprecated_options = [*current, opt_str]
+
+    deprecated_switches = [
+        '--xattr-set-filesize',
+        '--dump-user-agent',
+        '--youtube-include-dash-manifest',
+        '--no-youtube-skip-dash-manifest',
+        '--youtube-skip-dash-manifest',
+        '--no-youtube-include-dash-manifest',
+        '--youtube-include-hls-manifest',
+        '--no-youtube-skip-hls-manifest',
+        '--youtube-skip-hls-manifest',
+        '--no-youtube-include-hls-manifest',
+        '--youtube-print-sig-code',
+        '--sponskrub',
+        '--no-sponskrub',
+        '--sponskrub-cut',
+        '--no-sponskrub-cut',
+        '--sponskrub-force',
+        '--no-sponskrub-force',
+        '--prefer-avconv',
+        '--no-prefer-ffmpeg',
+        '--prefer-ffmpeg',
+        '--no-prefer-avconv',
+        '-C',  # this needs to remain deprecated until at least 2028
+        '--call-home',
+        '--no-call-home',
+        '--include-ads',
+        '--no-include-ads',
+        '--write-annotations',
+        '--no-write-annotations',
+    ]
+    deprecated_arguments = [
+        '--sponskrub-location',
+        '--sponskrub-args',
+        '--cn-verification-proxy',
+    ]
+
+    for opt in deprecated_switches:
+        parser.add_option(
+            opt, action='callback', callback=_deprecated_option_callback,
+            help=optparse.SUPPRESS_HELP)
+    for opt in deprecated_arguments:
+        parser.add_option(
+            opt, action='callback', callback=_deprecated_option_callback,
+            metavar='ARG', dest='_', type='str',
+            help=optparse.SUPPRESS_HELP)
 
     parser.add_option_group(general)
     parser.add_option_group(network)

yt_dlp/postprocessor/__init__.py

@@ -30,7 +30,6 @@ from .metadataparser import (
 )
 from .modify_chapters import ModifyChaptersPP
 from .movefilesafterdownload import MoveFilesAfterDownloadPP
-from .sponskrub import SponSkrubPP
 from .sponsorblock import SponsorBlockPP
 from .xattrpp import XAttrMetadataPP
 from ..globals import plugin_pps, postprocessors

yt_dlp/postprocessor/ffmpeg.py

@@ -88,7 +88,6 @@ class FFmpegPostProcessor(PostProcessor):
 
     def __init__(self, downloader=None):
         PostProcessor.__init__(self, downloader)
-        self._prefer_ffmpeg = self.get_param('prefer_ffmpeg', True)
         self._paths = self._determine_executables()
 
     @staticmethod
@@ -100,10 +99,8 @@ class FFmpegPostProcessor(PostProcessor):
     def get_versions(downloader=None):
         return FFmpegPostProcessor.get_versions_and_features(downloader)[0]
 
-    _ffmpeg_to_avconv = {'ffmpeg': 'avconv', 'ffprobe': 'avprobe'}
-
     def _determine_executables(self):
-        programs = [*self._ffmpeg_to_avconv.keys(), *self._ffmpeg_to_avconv.values()]
+        programs = ['ffmpeg', 'ffprobe']
 
         location = self.get_param('ffmpeg_location', self._ffmpeg_location.get())
         if location is None:
@@ -119,8 +116,6 @@ class FFmpegPostProcessor(PostProcessor):
             filename = os.path.basename(location)
             basename = next((p for p in programs if p in filename), 'ffmpeg')
             dirname = os.path.dirname(os.path.abspath(location))
-            if basename in self._ffmpeg_to_avconv:
-                self._prefer_ffmpeg = True
 
         paths = {p: os.path.join(dirname, p) for p in programs}
         if basename and basename in filename:
@@ -179,17 +174,12 @@ class FFmpegPostProcessor(PostProcessor):
 
     def _get_version(self, kind):
         executables = (kind, )
-        if not self._prefer_ffmpeg:
-            executables = (kind, self._ffmpeg_to_avconv[kind])
         basename, version, features = next(filter(
             lambda x: x[1], ((p, *self._get_ffmpeg_version(p)) for p in executables)), (None, None, {}))
         if kind == 'ffmpeg':
             self.basename, self._features = basename, features
         else:
             self.probe_basename = basename
-        if basename == self._ffmpeg_to_avconv[kind]:
-            self.deprecated_feature(f'Support for {self._ffmpeg_to_avconv[kind]} is deprecated and '
-                                    f'may be removed in a future version. Use {kind} instead')
         return version
 
     @functools.cached_property
@@ -231,7 +221,7 @@ class FFmpegPostProcessor(PostProcessor):
         if not self.available:
             raise FFmpegPostProcessorError('ffmpeg not found. Please install or provide the path using --ffmpeg-location')
 
-        required_version = '10-0' if self.basename == 'avconv' else '1.0'
+        required_version = '1.0'
         if is_outdated_version(self._version, required_version):
             self.report_warning(f'Your copy of {self.basename} is outdated, update {self.basename} '
                                 f'to version {required_version} or newer if you encounter any errors')
@@ -842,17 +832,6 @@ class FFmpegMergerPP(FFmpegPostProcessor):
 
     def can_merge(self):
         # TODO: figure out merge-capable ffmpeg version
-        if self.basename != 'avconv':
-            return True
-
-        required_version = '10-0'
-        if is_outdated_version(
-                self._versions[self.basename], required_version):
-            warning = (f'Your copy of {self.basename} is outdated and unable to properly mux separate video and audio files, '
-                       'yt-dlp will download single file media. '
-                       f'Update {self.basename} to version {required_version} or newer to fix this.')
-            self.report_warning(warning)
-            return False
         return True
 
 

yt_dlp/postprocessor/sponskrub.py

@@ -1,97 +0,0 @@
-import os
-import shlex
-import subprocess
-
-from .common import PostProcessor
-from ..utils import (
-    Popen,
-    PostProcessingError,
-    check_executable,
-    cli_option,
-    encodeArgument,
-    prepend_extension,
-    shell_quote,
-    str_or_none,
-)
-
-
-# Deprecated in favor of the native implementation
-class SponSkrubPP(PostProcessor):
-    _temp_ext = 'spons'
-    _exe_name = 'sponskrub'
-
-    def __init__(self, downloader, path='', args=None, ignoreerror=False, cut=False, force=False, _from_cli=False):
-        PostProcessor.__init__(self, downloader)
-        self.force = force
-        self.cutout = cut
-        self.args = str_or_none(args) or ''  # For backward compatibility
-        self.path = self.get_exe(path)
-
-        if not _from_cli:
-            self.deprecation_warning(
-                'yt_dlp.postprocessor.SponSkrubPP support is deprecated and may be removed in a future version. '
-                'Use yt_dlp.postprocessor.SponsorBlock and yt_dlp.postprocessor.ModifyChaptersPP instead')
-
-        if not ignoreerror and self.path is None:
-            if path:
-                raise PostProcessingError(f'sponskrub not found in "{path}"')
-            else:
-                raise PostProcessingError('sponskrub not found. Please install or provide the path using --sponskrub-path')
-
-    def get_exe(self, path=''):
-        if not path or not check_executable(path, ['-h']):
-            path = os.path.join(path, self._exe_name)
-            if not check_executable(path, ['-h']):
-                return None
-        return path
-
-    @PostProcessor._restrict_to(images=False)
-    def run(self, information):
-        if self.path is None:
-            return [], information
-
-        filename = information['filepath']
-        if not os.path.exists(filename):  # no download
-            return [], information
-
-        if information['extractor_key'].lower() != 'youtube':
-            self.to_screen('Skipping sponskrub since it is not a YouTube video')
-            return [], information
-        if self.cutout and not self.force and not information.get('__real_download', False):
-            self.report_warning(
-                'Skipping sponskrub since the video was already downloaded. '
-                'Use --sponskrub-force to run sponskrub anyway')
-            return [], information
-
-        self.to_screen('Trying to %s sponsor sections' % ('remove' if self.cutout else 'mark'))
-        if self.cutout:
-            self.report_warning('Cutting out sponsor segments will cause the subtitles to go out of sync.')
-            if not information.get('__real_download', False):
-                self.report_warning('If sponskrub is run multiple times, unintended parts of the video could be cut out.')
-
-        temp_filename = prepend_extension(filename, self._temp_ext)
-        if os.path.exists(temp_filename):
-            os.remove(temp_filename)
-
-        cmd = [self.path]
-        if not self.cutout:
-            cmd += ['-chapter']
-        cmd += cli_option(self._downloader.params, '-proxy', 'proxy')
-        cmd += shlex.split(self.args)  # For backward compatibility
-        cmd += self._configuration_args(self._exe_name, use_compat=False)
-        cmd += ['--', information['id'], filename, temp_filename]
-        cmd = [encodeArgument(i) for i in cmd]
-
-        self.write_debug(f'sponskrub command line: {shell_quote(cmd)}')
-        stdout, _, returncode = Popen.run(cmd, text=True, stdout=None if self.get_param('verbose') else subprocess.PIPE)
-
-        if not returncode:
-            os.replace(temp_filename, filename)
-            self.to_screen('Sponsor sections have been %s' % ('removed' if self.cutout else 'marked'))
-        elif returncode == 3:
-            self.to_screen('No segments in the SponsorBlock database')
-        else:
-            raise PostProcessingError(
-                stdout.strip().splitlines()[0 if stdout.strip().lower().startswith('unrecognised') else -1]
-                or f'sponskrub failed with error code {returncode}')
-        return [], information

yt_dlp/utils/_utils.py

@@ -47,6 +47,7 @@ import xml.etree.ElementTree
 from . import traversal
 
 from ..compat import (
+    compat_datetime_from_timestamp,
     compat_etree_fromstring,
     compat_expanduser,
     compat_HTMLParseError,
@@ -1376,6 +1377,7 @@ def datetime_round(dt_, precision='day'):
     if precision == 'microsecond':
         return dt_
 
+    time_scale = 1_000_000
     unit_seconds = {
         'day': 86400,
         'hour': 3600,
@@ -1383,8 +1385,8 @@ def datetime_round(dt_, precision='day'):
         'second': 1,
     }
     roundto = lambda x, n: ((x + n / 2) // n) * n
-    timestamp = roundto(calendar.timegm(dt_.timetuple()), unit_seconds[precision])
-    return dt.datetime.fromtimestamp(timestamp, dt.timezone.utc)
+    timestamp = roundto(calendar.timegm(dt_.timetuple()) + dt_.microsecond / time_scale, unit_seconds[precision])
+    return compat_datetime_from_timestamp(timestamp)
 
 
 def hyphenate_date(date_str):
@@ -2056,18 +2058,13 @@ def strftime_or_none(timestamp, date_format='%Y%m%d', default=None):
     datetime_object = None
     try:
         if isinstance(timestamp, (int, float)):  # unix timestamp
-            # Using naive datetime here can break timestamp() in Windows
-            # Ref: https://github.com/yt-dlp/yt-dlp/issues/5185, https://github.com/python/cpython/issues/94414
-            # Also, dt.datetime.fromtimestamp breaks for negative timestamps
-            # Ref: https://github.com/yt-dlp/yt-dlp/issues/6706#issuecomment-1496842642
-            datetime_object = (dt.datetime.fromtimestamp(0, dt.timezone.utc)
-                               + dt.timedelta(seconds=timestamp))
+            datetime_object = compat_datetime_from_timestamp(timestamp)
         elif isinstance(timestamp, str):  # assume YYYYMMDD
             datetime_object = dt.datetime.strptime(timestamp, '%Y%m%d')
         date_format = re.sub(  # Support %s on windows
             r'(?<!%)(%%)*%s', rf'\g<1>{int(datetime_object.timestamp())}', date_format)
         return datetime_object.strftime(date_format)
-    except (ValueError, TypeError, AttributeError):
+    except (ValueError, TypeError, AttributeError, OverflowError, OSError):
         return default
 
 
@@ -2948,6 +2945,7 @@ def mimetype2ext(mt, default=NO_DEFAULT):
         'x-ms-asf': 'asf',
         'x-ms-wmv': 'wmv',
         'x-msvideo': 'avi',
+        'vnd.dlna.mpeg-tts': 'mpeg',
 
         # application (streaming playlists)
         'dash+xml': 'mpd',
@@ -4773,7 +4771,7 @@ def jwt_encode(payload_data, key, *, alg='HS256', headers=None):
 
 # can be extended in future to verify the signature and parse header and return the algorithm used if it's not HS256
 def jwt_decode_hs256(jwt):
-    header_b64, payload_b64, signature_b64 = jwt.split('.')
+    _header_b64, payload_b64, _signature_b64 = jwt.split('.')
     # add trailing ='s that may have been stripped, superfluous ='s are ignored
     return json.loads(base64.urlsafe_b64decode(f'{payload_b64}==='))
 

yt_dlp/utils/networking.py

@@ -17,7 +17,7 @@ from .traversal import traverse_obj
 def random_user_agent():
     USER_AGENT_TMPL = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{} Safari/537.36'
     # Target versions released within the last ~6 months
-    CHROME_MAJOR_VERSION_RANGE = (132, 138)
+    CHROME_MAJOR_VERSION_RANGE = (134, 140)
     return USER_AGENT_TMPL.format(f'{random.randint(*CHROME_MAJOR_VERSION_RANGE)}.0.0.0')