Merge 7642837a49 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/_extractors.py

@@ -1548,6 +1548,7 @@ from .pluralsight import (
     PluralsightIE,
 )
 from .plutotv import PlutoTVIE
+from .plvideo import PlVideoVideoIE
 from .podbayfm import (
     PodbayFMChannelIE,
     PodbayFMIE,

yt_dlp/extractor/plvideo.py

@@ -0,0 +1,91 @@
+from yt_dlp.utils._utils import qualities
+
+from .common import InfoExtractor
+
+
+class PlVideoVideoIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?plvideo\.ru/watch\?v=(?P<id>\w+)&?(.+)?'  # type: ignore
+    _TESTS = [
+        {
+            'url': 'https://plvideo.ru/watch?v=lYmu2gcUKOa9',
+            'md5': 'eb3e7830abb375a782d943f593d2646b',
+            'info_dict': {
+                'id': 'lYmu2gcUKOa9',
+                'ext': 'mp4',
+                'title': 'Запретная страсть. Премьера 2024. 18+Мелодрама. Триллер. 18+',
+                'uploader_id': 'y__S081jJiUt',
+                'uploader': 'Tvoja Mediateka',
+                'duration': 6238333,
+                'like_count': int,
+                'description': str,
+                'comment_count': int,
+                'thumbnail': r're:^https?://.*\.jpg',
+                'type': 'video',
+                'view_count': int,
+                'dislike_count': int,
+            },
+        },
+    ]
+
+    def _quality_to_dimensions(self, quality):
+        mapped = {
+            '240p': (426, 240),
+            '360p': (640, 360),
+            '468p': (720, 468),
+            '480p': (720, 480),
+            '720p': (1280, 720),
+            '1080p': (1920, 1080),
+        }
+        return mapped.get(quality)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        api_url = f'https://api.g1.plvideo.ru/v1/videos/{video_id}?Aud=18'
+
+        result = self._download_json(api_url, video_id, 'Downloading video JSON')
+        assert result.get('code') == 200, 'Failed to download video JSON'
+
+        item = result.get('item')
+        assert item is not None, 'Bad API response'
+
+        thumbnail = item.get('cover').get('paths').get('original').get('src')
+
+        formats = []
+        preference = qualities(['240p', '360p', '468p', '480p', '720p', '1080p'])
+
+        for key, value in item.get('profiles').items():
+            hlsurl = value.get('hls')
+            dimensions = self._quality_to_dimensions(key)
+            fmt = {
+                'url': hlsurl,
+                'ext': 'mp4',
+                'quality': preference(key),
+                'width': dimensions[0],
+                'height': dimensions[1],
+                'format_id': key,
+                'protocol': 'm3u8_native',
+                'aspect_ratio': float(value.get('aspectRatio')),
+            }
+
+            formats.append(fmt)
+
+        result = {
+            'id': video_id,
+            'title': item.get('title'),
+            'formats': formats,
+            'thumbnails': [{'url': thumbnail}],
+            'uploader': item.get('channel').get('name'),
+            'duration': item.get('uploadFile').get('videoDuration'),
+            'uploader_id': item.get('channel').get('id'),
+            'view_count': item.get('stats').get('viewTotalCount'),
+            'like_count': item.get('stats').get('likeCount'),
+            'comment_count': item.get('stats').get('commentCount'),
+            'dislike_count': item.get('stats').get('dislikeCount'),
+            'type': item.get('type'),
+        }
+
+        description = item.get('description')
+        if description:
+            result['description'] = description
+
+        return result