Merge fb127cccd2 into b83ca24eb7

Authored by: seproDev

.github/workflows/build.yml

@@ -504,7 +504,8 @@ jobs:
       - windows32
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
           path: artifact
           pattern: build-bin-*

.github/workflows/release-master.yml

@@ -28,3 +28,20 @@ jobs:
       actions: write  # For cleaning up cache
       id-token: write  # mandatory for trusted publishing
     secrets: inherit
+
+  publish_pypi:
+    needs: [release]
+    if: vars.MASTER_PYPI_PROJECT != ''
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # mandatory for trusted publishing
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: dist
+          name: build-pypi
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: true

.github/workflows/release-nightly.yml

@@ -41,3 +41,20 @@ jobs:
       actions: write  # For cleaning up cache
       id-token: write  # mandatory for trusted publishing
     secrets: inherit
+
+  publish_pypi:
+    needs: [release]
+    if: vars.NIGHTLY_PYPI_PROJECT != ''
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # mandatory for trusted publishing
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: dist
+          name: build-pypi
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: true

.github/workflows/release.yml

@@ -2,10 +2,6 @@ name: Release
 on:
   workflow_call:
     inputs:
-      prerelease:
-        required: false
-        default: true
-        type: boolean
       source:
         required: false
         default: ''
@@ -18,6 +14,10 @@ on:
         required: false
         default: ''
         type: string
+      prerelease:
+        required: false
+        default: true
+        type: boolean
   workflow_dispatch:
     inputs:
       source:
@@ -278,11 +278,20 @@ jobs:
           make clean-cache
           python -m build --no-isolation .
 
+      - name: Upload artifacts
+        if: github.event_name != 'workflow_dispatch'
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-pypi
+          path: |
+            dist/*
+          compression-level: 0
+
       - name: Publish to PyPI
+        if: github.event_name == 'workflow_dispatch'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           verbose: true
-          attestations: false  # Currently doesn't work w/ reusable workflows (breaks nightly)
 
   publish:
     needs: [prepare, build]

pyproject.toml

@@ -52,7 +52,7 @@ default = [
     "pycryptodomex",
     "requests>=2.32.2,<3",
     "urllib3>=1.26.17,<3",
-    "websockets>=13.0",
+    "websockets>=13.0,<14",
 ]
 curl-cffi = [
     "curl-cffi==0.5.10; os_name=='nt' and implementation_name=='cpython'",

yt_dlp/dependencies/Cryptodome.py

@@ -24,7 +24,7 @@ try:
         from Crypto.Cipher import AES, PKCS1_OAEP, Blowfish, PKCS1_v1_5  # noqa: F401
         from Crypto.Hash import CMAC, SHA1  # noqa: F401
         from Crypto.PublicKey import RSA  # noqa: F401
-except ImportError:
+except (ImportError, OSError):
     __version__ = f'broken {__version__}'.strip()
 
 

yt_dlp/extractor/vidio.py

@@ -1,4 +1,5 @@
 from .common import InfoExtractor
+from ..compat import compat_urllib_parse_urlparse
 from ..utils import (
     ExtractorError,
     clean_html,
@@ -276,8 +277,16 @@ class VidioLiveIE(VidioBaseIE):
                     display_id, note='Downloading HLS token JSON', data=b'')
                 formats.extend(self._extract_m3u8_formats(
                     sources['source'] + '?' + token_json.get('token', ''), display_id, 'mp4', 'm3u8_native'))
-            if str_or_none(sources.get('source_dash')):
-                pass
+            if str_or_none(sources.get('source_dash')):  # TODO: Find live example with source_dash
+                parsed_base_dash = compat_urllib_parse_urlparse(sources['source_dash'])
+                token_json = self._download_json(
+                    'https://www.vidio.com/live/%s/tokens?type=dash' % video_id,
+                    display_id, note='Downloading DASH token JSON', data=b'')
+                parsed_tokenized_dash = parsed_base_dash._replace(path=token_json.get('token', '')
+                                                                  + (parsed_base_dash.path if parsed_base_dash.path[0] == '/'
+                                                                     else '/' + parsed_base_dash.path))
+                formats.extend(self._extract_mpd_formats(
+                    parsed_tokenized_dash.geturl(), display_id, 'dash'))
         else:
             if stream_meta.get('stream_token_url'):
                 token_json = self._download_json(
@@ -287,7 +296,15 @@ class VidioLiveIE(VidioBaseIE):
                     stream_meta['stream_token_url'] + '?' + token_json.get('token', ''),
                     display_id, 'mp4', 'm3u8_native'))
             if stream_meta.get('stream_dash_url'):
-                pass
+                parsed_base_dash = compat_urllib_parse_urlparse(stream_meta['stream_dash_url'])
+                token_json = self._download_json(
+                    'https://www.vidio.com/live/%s/tokens?type=dash' % video_id,
+                    display_id, note='Downloading DASH token JSON', data=b'')
+                parsed_tokenized_dash = parsed_base_dash._replace(path=token_json.get('token', '')
+                                                                  + (parsed_base_dash.path if parsed_base_dash.path[0] == '/'
+                                                                     else '/' + parsed_base_dash.path))
+                formats.extend(self._extract_mpd_formats(
+                    parsed_tokenized_dash.geturl(), display_id, 'dash'))
             if stream_meta.get('stream_url'):
                 formats.extend(self._extract_m3u8_formats(
                     stream_meta['stream_url'], display_id, 'mp4', 'm3u8_native'))