Merge 3aa60c8861 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

@@ -1523,6 +1523,7 @@ from .picarto import (
     PicartoIE,
     PicartoVodIE,
 )
+from .pietsmiet import PietsmietIE
 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pinterest import (

yt_dlp/extractor/pietsmiet.py

@@ -0,0 +1,57 @@
+from .common import InfoExtractor
+from ..utils import (
+    traverse_obj,
+)
+import base64
+
+
+class PietsmietIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?pietsmiet\.de/videos/(?P<id>\d+)-.*'
+    _TESTS = [{
+        'url': 'https://www.pietsmiet.de/videos/77307-brammen-erzahlt-vom-leben-als-geschaftsfuhrer',
+        'md5': '9bca7b377a34bfe4d7a437dd499ff46b',
+        'info_dict': {
+            'id': '77307',
+            'ext': 'mp4',
+            'title': 'Brammen erzählt vom Leben als Geschäftsführer',
+            'thumbnail': 'https://www.pietsmiet.de/storage/media/71/90/03/7161edccc3e3a9f6f78b6d8b637edc2d.jpg'
+        }
+    }]
+
+    # Pietsmiet.de uses base64 to hide a value needed to make API call
+    def _extract_integrity(self, vid):
+        integrity = self._search_json('window._i = ', self._web,
+                                      name='Extracting Origin Integrity',
+                                      video_id=vid,
+                                      fatal=True)
+
+        integrity = base64.b64decode(integrity['v']).decode("ascii")
+
+        return integrity
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        self._web = self._download_webpage(url, video_id, note='Caching webpage')
+
+        origin_integrity = self._extract_integrity(video_id)
+
+        data_json = self._download_json(
+            f'https://www.pietsmiet.de/api/v1/utility/player?video={video_id}&preset=quality',
+            video_id=video_id,
+            headers={'x-origin-integrity': origin_integrity})
+
+        title = traverse_obj(data_json, ('options', 'tracks', 0, 'full_title'))
+        aspect_ratio = traverse_obj(data_json, ('options', 'visual', 'aspect_ratio'))
+        thumbnail = traverse_obj(data_json, ('options', 'visual', 'thumbnail'))
+        m3u8_url = traverse_obj(data_json, ('options', 'tracks', 0, 'sources', 'hls', 'src'))
+
+        formats = self._extract_m3u8_formats(m3u8_url, video_id)
+
+        return {
+            'id': video_id,
+            'title': title,
+            'formats': formats,
+            'aspect_ratio': aspect_ratio,
+            'thumbnail': thumbnail,
+        }