Merge 25fbd01c3c 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

@@ -551,6 +551,7 @@ from .dropout import (
     DropoutIE,
     DropoutSeasonIE,
 )
+from .drtalks import DrTalksIE
 from .drtuber import DrTuberIE
 from .drtv import (
     DRTVIE,

yt_dlp/extractor/drtalks.py

@@ -0,0 +1,53 @@
+from .brightcove import BrightcoveNewIE
+from .common import InfoExtractor
+from ..utils import extract_attributes, smuggle_url
+
+
+class DrTalksIE(InfoExtractor):
+    _VALID_URL = r'https?://event\.drtalks\.com/(?P<id>.+/[^/]+)/?'
+
+    _TESTS = [{
+        'url': 'https://event.drtalks.com/reversing-heart-disease-summit/free-access-day-1',
+        'info_dict': {
+            'id': '1758074870279626053',
+            'title': 'Free Access Day 1 - Events at DrTalks',
+            'thumbnail': r're:https://event.drtalks.com/wp-content/uploads/.+',
+        },
+        'playlist_mincount': 11,
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://event.drtalks.com/bioenergetics-2022/free-access-day-1/',
+        'info_dict': {
+            'id': '1747611460188466596',
+            'title': 'The BioEnergetics Summit',
+            'thumbnail': r're:https://event.drtalks.com/wp-content/uploads/.+',
+        },
+        'playlist_mincount': 8,
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://event.drtalks.com/mitochondrial-summit/encore-access-day-6',
+        'only_matching': True,
+    }, {
+        'url': 'https://event.drtalks.com/medicine-of-mindset-summit/free-access-day-1/',
+        'only_matching': True,
+    }]
+    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_%s/index.html?playlistId=%s'
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        player_attrs = extract_attributes(self._search_regex(
+            r'(<video-js[^>]+\bid=(["\'])myPlayerID\2[^>]*>)', webpage, 'player'))
+        bc_url = smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % (
+            player_attrs.get('data-account', '6314452011001'),
+            player_attrs.get('data-player', 'f3rfrCUjm'),
+            player_attrs.get('data-embed', 'default'),
+            player_attrs['data-playlist-id']), {'source_url': url})
+
+        return self.url_result(
+            bc_url, BrightcoveNewIE.ie_key(), video_id, self._og_search_title(webpage),
+            url_transparent=True, thumbnail=self._og_search_thumbnail(webpage))