Merge b76f13229d 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

@@ -582,6 +582,7 @@ from .egghead import (
 )
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
+from .elemental_tv import ElementalTVIE
 from .elementorembed import ElementorEmbedIE
 from .elonet import ElonetIE
 from .elpais import ElPaisIE

yt_dlp/extractor/elemental_tv.py

@@ -0,0 +1,107 @@
+import json
+import re
+import time
+
+from ..extractor.common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import ExtractorError
+
+
+class ElementalTVIE(InfoExtractor):
+    _LOGIN_REQUIRED = True
+    _NETRC_MACHINE = 'elemental_tv'
+    _VALID_URL = r'https?://play\.elemental\.tv/channel/[0-9a-f]{24}'
+    _TESTS = [{
+        'url': 'https://play.elemental.tv/channel/573f5a14761973ec1d502507',
+        'info_dict': {
+            'id': '573f5a14761973ec1d502507',
+            'ext': 'mp4',
+            'title': 'БНТ 1 HD',
+            'thumbnail': 'https://play.elemental.tv/v1/tumblrs/573f5a14761973ec1d502507',
+            'age_limit': 0,
+        },
+    }]
+
+    access_token = ''
+    channel_id = ''
+
+    def _get_channel_id(self, url):
+        url_parts = re.search('(?<=channel/)[0-9a-f]{24}', url)
+
+        if not url_parts or not url_parts.group(0):
+            return None
+
+        self.channel_id = url_parts.group(0)
+        self.write_debug(f'Channel ID: {self.channel_id}')
+
+        if not self.channel_id:
+            raise ExtractorError('Channel ID not found')
+
+    def _get_stream_metadata(self):
+        try:
+            headers = {
+                'Authorization': 'Bearer ' + self.access_token,
+            }
+            res_api = self._download_json(
+                'https://play.elemental.tv/v1/channels', self.channel_id, headers=headers)
+            data = res_api.get('data').get(self.channel_id)
+
+            if not data:
+                self.write_debug('Getting metadata failed')
+                return {}
+
+            return {
+                'title': data.get('name'),
+                'age_limit': data.get('age'),
+                'thumbnail': data.get('tumblrurl'),
+            }
+        except Exception:
+            self.write_debug('Getting metadata failed')
+            return {}
+
+    def _get_stream_url(self):
+        # Stream URL needs current epoch time rounded to 10000s
+        begin = int((time.time() - 60) / 10000) * 10000
+        stream_url = 'https://play.elemental.tv/v1/playlists/%s/playlist.m3u8?begin=%d&access_token=%s' % (self.channel_id, begin, self.access_token)
+
+        if not stream_url or '.m3u8' not in stream_url:
+            raise ExtractorError('Unable to get stream URL')
+
+        return stream_url
+
+    def _perform_login(self, username, password):
+        post_data = {
+            'email': str(username),
+            'grant_type': 'client_credentials',
+            'password': str(password),
+            'rememberme': 'true',
+        }
+
+        try:
+            res_api = self._download_json(
+                'https://play.elemental.tv/v1/users/login', self.channel_id, data=json.dumps(post_data).encode()).get('data')
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+                error_message = self._parse_json(e.cause.response.read().decode(), self.channel_id).get('error_info').get('description')
+                raise ExtractorError(error_message, expected=True)
+
+        if not res_api or not res_api.get('access_token'):
+            raise ExtractorError('Accessing login token failed')
+
+        self.access_token = res_api.get('access_token')
+
+        if res_api.get('token_type') != 'Bearer':
+            raise ExtractorError('Unknown login token type')
+
+    def _real_extract(self, url):
+        self._get_channel_id(url)
+        stream_url = self._get_stream_url()
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(stream_url, self.channel_id, ext='mp4')
+
+        return {
+            'id': self.channel_id,
+            'is_live': True,
+            'formats': formats,
+            'subtitles': subtitles,
+            **self._get_stream_metadata(),
+        }