Merge bd62cdba1a into e398217aae

.github/workflows/build.yml

@@ -411,7 +411,7 @@ jobs:
         run: | # Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
           python devscripts/install_deps.py -o --include build
           python devscripts/install_deps.py --include curl-cffi
-          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-6.11.1-py3-none-any.whl"
+          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-6.10.0-py3-none-any.whl"
 
       - name: Prepare
         run: |
@@ -460,7 +460,7 @@ jobs:
         run: |
           python devscripts/install_deps.py -o --include build
           python devscripts/install_deps.py
-          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-6.11.1-py3-none-any.whl"
+          python -m pip install -U "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-6.10.0-py3-none-any.whl"
 
       - name: Prepare
         run: |

pyproject.toml

@@ -83,7 +83,7 @@ test = [
     "pytest-rerunfailures~=14.0",
 ]
 pyinstaller = [
-    "pyinstaller>=6.11.1",  # Windows temp cleanup fixed in 6.11.1
+    "pyinstaller>=6.10.0",  # Windows temp cleanup fixed in 6.10.0
 ]
 
 [project.urls]

yt_dlp/extractor/_extractors.py

@@ -1156,7 +1156,6 @@ from .mitele import MiTeleIE
 from .mixch import (
     MixchArchiveIE,
     MixchIE,
-    MixchMovieIE,
 )
 from .mixcloud import (
     MixcloudIE,
@@ -1941,6 +1940,7 @@ from .spotify import (
 from .spreaker import (
     SpreakerIE,
     SpreakerShowIE,
+    SpreakerShowPageIE,
 )
 from .springboardplatform import SpringboardPlatformIE
 from .sprout import SproutIE

yt_dlp/extractor/chaturbate.py

@@ -9,7 +9,7 @@ from ..utils import (
 
 
 class ChaturbateIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?chaturbate\.(?P<tld>com|eu|global)/(?:fullvideo/?\?.*?\bb=)?(?P<id>[^/?&#]+)'
+    _VALID_URL = r'https?://(?:[^/]+\.)?chaturbate\.com/(?:fullvideo/?\?.*?\bb=)?(?P<id>[^/?&#]+)'
     _TESTS = [{
         'url': 'https://www.chaturbate.com/siswet19/',
         'info_dict': {
@@ -29,24 +29,15 @@ class ChaturbateIE(InfoExtractor):
     }, {
         'url': 'https://en.chaturbate.com/siswet19/',
         'only_matching': True,
-    }, {
-        'url': 'https://chaturbate.eu/siswet19/',
-        'only_matching': True,
-    }, {
-        'url': 'https://chaturbate.eu/fullvideo/?b=caylin',
-        'only_matching': True,
-    }, {
-        'url': 'https://chaturbate.global/siswet19/',
-        'only_matching': True,
     }]
 
     _ROOM_OFFLINE = 'Room is currently offline'
 
     def _real_extract(self, url):
-        video_id, tld = self._match_valid_url(url).group('id', 'tld')
+        video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            f'https://chaturbate.{tld}/{video_id}/', video_id,
+            f'https://chaturbate.com/{video_id}/', video_id,
             headers=self.geo_verification_headers())
 
         found_m3u8_urls = []

yt_dlp/extractor/cloudflarestream.py

@@ -8,7 +8,7 @@ class CloudflareStreamIE(InfoExtractor):
     _DOMAIN_RE = r'(?:cloudflarestream\.com|(?:videodelivery|bytehighway)\.net)'
     _EMBED_RE = rf'(?:embed\.|{_SUBDOMAIN_RE}){_DOMAIN_RE}/embed/[^/?#]+\.js\?(?:[^#]+&)?video='
     _ID_RE = r'[\da-f]{32}|eyJ[\w-]+\.[\w-]+\.[\w-]+'
-    _VALID_URL = rf'https?://(?:{_SUBDOMAIN_RE}(?P<domain>{_DOMAIN_RE})/|{_EMBED_RE})(?P<id>{_ID_RE})'
+    _VALID_URL = rf'https?://(?:{_SUBDOMAIN_RE}{_DOMAIN_RE}/|{_EMBED_RE})(?P<id>{_ID_RE})'
     _EMBED_REGEX = [
         rf'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//{_EMBED_RE}(?:{_ID_RE})(?:(?!\1).)*)\1',
         rf'<iframe[^>]+\bsrc=["\'](?P<url>https?://{_SUBDOMAIN_RE}{_DOMAIN_RE}/[\da-f]{{32}})',
@@ -19,7 +19,7 @@ class CloudflareStreamIE(InfoExtractor):
             'id': '31c9291ab41fac05471db4e73aa11717',
             'ext': 'mp4',
             'title': '31c9291ab41fac05471db4e73aa11717',
-            'thumbnail': 'https://cloudflarestream.com/31c9291ab41fac05471db4e73aa11717/thumbnails/thumbnail.jpg',
+            'thumbnail': 'https://videodelivery.net/31c9291ab41fac05471db4e73aa11717/thumbnails/thumbnail.jpg',
         },
         'params': {
             'skip_download': 'm3u8',
@@ -30,7 +30,7 @@ class CloudflareStreamIE(InfoExtractor):
             'id': '0e8e040aec776862e1d632a699edf59e',
             'ext': 'mp4',
             'title': '0e8e040aec776862e1d632a699edf59e',
-            'thumbnail': 'https://cloudflarestream.com/0e8e040aec776862e1d632a699edf59e/thumbnails/thumbnail.jpg',
+            'thumbnail': 'https://videodelivery.net/0e8e040aec776862e1d632a699edf59e/thumbnails/thumbnail.jpg',
         },
     }, {
         'url': 'https://watch.cloudflarestream.com/9df17203414fd1db3e3ed74abbe936c1',
@@ -54,7 +54,7 @@ class CloudflareStreamIE(InfoExtractor):
             'id': 'eaef9dea5159cf968be84241b5cedfe7',
             'ext': 'mp4',
             'title': 'eaef9dea5159cf968be84241b5cedfe7',
-            'thumbnail': 'https://cloudflarestream.com/eaef9dea5159cf968be84241b5cedfe7/thumbnails/thumbnail.jpg',
+            'thumbnail': 'https://videodelivery.net/eaef9dea5159cf968be84241b5cedfe7/thumbnails/thumbnail.jpg',
         },
         'params': {
             'skip_download': 'm3u8',
@@ -62,9 +62,8 @@ class CloudflareStreamIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        video_id, domain = self._match_valid_url(url).group('id', 'domain')
+        video_id = self._match_id(url)
-        if domain != 'bytehighway.net':
+        domain = 'bytehighway.net' if 'bytehighway.net/' in url else 'videodelivery.net'
-            domain = 'cloudflarestream.com'
         base_url = f'https://{domain}/{video_id}/'
         if '.' in video_id:
             video_id = self._parse_json(base64.urlsafe_b64decode(

yt_dlp/extractor/goplay.py

@@ -5,63 +5,56 @@ import hashlib
 import hmac
 import json
 import os
-import re
-import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
-    int_or_none,
-    js_to_json,
-    remove_end,
     traverse_obj,
+    unescapeHTML,
 )
 
 
 class GoPlayIE(InfoExtractor):
-    _VALID_URL = r'https?://(www\.)?goplay\.be/video/([^/?#]+/[^/?#]+/|)(?P<id>[^/#]+)'
+    _VALID_URL = r'https?://(www\.)?goplay\.be/video/([^/]+/[^/]+/|)(?P<display_id>[^/#]+)'
 
     _NETRC_MACHINE = 'goplay'
 
     _TESTS = [{
-        'url': 'https://www.goplay.be/video/de-slimste-mens-ter-wereld/de-slimste-mens-ter-wereld-s22/de-slimste-mens-ter-wereld-s22-aflevering-1',
+        'url': 'https://www.goplay.be/video/de-container-cup/de-container-cup-s3/de-container-cup-s3-aflevering-2#autoplay',
         'info_dict': {
-            'id': '2baa4560-87a0-421b-bffc-359914e3c387',
+            'id': '9c4214b8-e55d-4e4b-a446-f015f6c6f811',
             'ext': 'mp4',
-            'title': 'S22 - Aflevering 1',
+            'title': 'S3 - Aflevering 2',
-            'description': r're:In aflevering 1 nemen Daan Alferink, Tess Elst en Xander De Rycke .{66}',
+            'series': 'De Container Cup',
-            'series': 'De Slimste Mens ter Wereld',
+            'season': 'Season 3',
-            'episode': 'Episode 1',
+            'season_number': 3,
-            'season_number': 22,
+            'episode': 'Episode 2',
-            'episode_number': 1,
+            'episode_number': 2,
-            'season': 'Season 22',
         },
-        'params': {'skip_download': True},
         'skip': 'This video is only available for registered users',
     }, {
-        'url': 'https://www.goplay.be/video/1917',
+        'url': 'https://www.goplay.be/video/a-family-for-thr-holidays-s1-aflevering-1#autoplay',
         'info_dict': {
-            'id': '40cac41d-8d29-4ef5-aa11-75047b9f0907',
+            'id': '74e3ed07-748c-49e4-85a0-393a93337dbf',
             'ext': 'mp4',
-            'title': '1917',
+            'title': 'A Family for the Holidays',
-            'description': r're:Op het hoogtepunt van de Eerste Wereldoorlog krijgen twee jonge .{94}',
         },
-        'params': {'skip_download': True},
         'skip': 'This video is only available for registered users',
     }, {
         'url': 'https://www.goplay.be/video/de-mol/de-mol-s11/de-mol-s11-aflevering-1#autoplay',
         'info_dict': {
-            'id': 'ecb79672-92b9-4cd9-a0d7-e2f0250681ee',
+            'id': '03eb8f2f-153e-41cb-9805-0d3a29dab656',
             'ext': 'mp4',
             'title': 'S11 - Aflevering 1',
-            'description': r're:Tien kandidaten beginnen aan hun verovering van Amerika en ontmoeten .{102}',
             'episode': 'Episode 1',
             'series': 'De Mol',
             'season_number': 11,
             'episode_number': 1,
             'season': 'Season 11',
         },
-        'params': {'skip_download': True},
+        'params': {
+            'skip_download': True,
+        },
         'skip': 'This video is only available for registered users',
     }]
 
@@ -76,42 +69,27 @@ class GoPlayIE(InfoExtractor):
         if not self._id_token:
             raise self.raise_login_required(method='password')
 
-    def _find_json(self, s):
-        return self._search_json(
-            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
-
     def _real_extract(self, url):
-        display_id = self._match_id(url)
+        url, display_id = self._match_valid_url(url).group(0, 'display_id')
         webpage = self._download_webpage(url, display_id)
+        video_data_json = self._html_search_regex(r'<div\s+data-hero="([^"]+)"', webpage, 'video_data')
+        video_data = self._parse_json(unescapeHTML(video_data_json), display_id).get('data')
 
-        nextjs_data = traverse_obj(
+        movie = video_data.get('movie')
-            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
+        if movie:
-            (..., {js_to_json}, {json.loads}, ..., {self._find_json}, ...))
+            video_id = movie['videoUuid']
-        meta = traverse_obj(nextjs_data, (
+            info_dict = {
-            ..., lambda _, v: v['meta']['path'] == urllib.parse.urlparse(url).path, 'meta', any))
+                'title': movie.get('title'),
-
+            }
-        video_id = meta['uuid']
+        else:
-        info_dict = traverse_obj(meta, {
+            episode = traverse_obj(video_data, ('playlists', ..., 'episodes', lambda _, v: v['pageInfo']['url'] == url), get_all=False)
-            'title': ('title', {str}),
+            video_id = episode['videoUuid']
-            'description': ('description', {str.strip}),
+            info_dict = {
-        })
+                'title': episode.get('episodeTitle'),
-
+                'series': traverse_obj(episode, ('program', 'title')),
-        if traverse_obj(meta, ('program', 'subtype')) != 'movie':
+                'season_number': episode.get('seasonNumber'),
-            for season_data in traverse_obj(nextjs_data, (..., 'children', ..., 'playlists', ...)):
+                'episode_number': episode.get('episodeNumber'),
-                episode_data = traverse_obj(
+            }
-                    season_data, ('videos', lambda _, v: v['videoId'] == video_id, any))
-                if not episode_data:
-                    continue
-
-                episode_title = traverse_obj(
-                    episode_data, 'contextualTitle', 'episodeTitle', expected_type=str)
-                info_dict.update({
-                    'title': episode_title or info_dict.get('title'),
-                    'series': remove_end(info_dict.get('title'), f' - {episode_title}'),
-                    'season_number': traverse_obj(season_data, ('season', {int_or_none})),
-                    'episode_number': traverse_obj(episode_data, ('episodeNumber', {int_or_none})),
-                })
-                break
 
         api = self._download_json(
             f'https://api.goplay.be/web/v1/videos/long-form/{video_id}',

yt_dlp/extractor/mixch.py

@@ -12,7 +12,7 @@ from ..utils.traversal import traverse_obj
 
 class MixchIE(InfoExtractor):
     IE_NAME = 'mixch'
-    _VALID_URL = r'https?://mixch\.tv/u/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?mixch\.tv/u/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'https://mixch.tv/u/16943797/live',
@@ -74,7 +74,7 @@ class MixchIE(InfoExtractor):
 
 class MixchArchiveIE(InfoExtractor):
     IE_NAME = 'mixch:archive'
-    _VALID_URL = r'https?://mixch\.tv/archive/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?mixch\.tv/archive/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'https://mixch.tv/archive/421',
@@ -116,56 +116,3 @@ class MixchArchiveIE(InfoExtractor):
             'formats': self._extract_m3u8_formats(info_json['archiveURL'], video_id),
             'thumbnail': traverse_obj(info_json, ('thumbnailURL', {url_or_none})),
         }
-
-
-class MixchMovieIE(InfoExtractor):
-    IE_NAME = 'mixch:movie'
-    _VALID_URL = r'https?://mixch\.tv/m/(?P<id>\w+)'
-
-    _TESTS = [{
-        'url': 'https://mixch.tv/m/Ve8KNkJ5',
-        'info_dict': {
-            'id': 'Ve8KNkJ5',
-            'title': '夏☀️\nムービーへのポイントは本イベントに加算されないので配信にてお願い致します🙇🏻\u200d♀️\n#TGCCAMPUS #ミス東大 #ミス東大2024 ',
-            'ext': 'mp4',
-            'uploader': 'ミス東大No.5 松藤百香🍑💫',
-            'uploader_id': '12299174',
-            'channel_follower_count': int,
-            'view_count': int,
-            'like_count': int,
-            'comment_count': int,
-            'timestamp': 1724070828,
-            'uploader_url': 'https://mixch.tv/u/12299174',
-            'live_status': 'not_live',
-            'upload_date': '20240819',
-        },
-    }, {
-        'url': 'https://mixch.tv/m/61DzpIKE',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        data = self._download_json(
-            f'https://mixch.tv/api-web/movies/{video_id}', video_id)
-        return {
-            'id': video_id,
-            'formats': [{
-                'format_id': 'mp4',
-                'url': data['movie']['file'],
-                'ext': 'mp4',
-            }],
-            **traverse_obj(data, {
-                'title': ('movie', 'title', {str}),
-                'thumbnail': ('movie', 'thumbnailURL', {url_or_none}),
-                'uploader': ('ownerInfo', 'name', {str}),
-                'uploader_id': ('ownerInfo', 'id', {int}, {str_or_none}),
-                'channel_follower_count': ('ownerInfo', 'fan', {int_or_none}),
-                'view_count': ('ownerInfo', 'view', {int_or_none}),
-                'like_count': ('movie', 'favCount', {int_or_none}),
-                'comment_count': ('movie', 'commentCount', {int_or_none}),
-                'timestamp': ('movie', 'published', {int_or_none}),
-                'uploader_url': ('ownerInfo', 'id', {lambda x: x and f'https://mixch.tv/u/{x}'}, filter),
-            }),
-            'live_status': 'not_live',
-        }

yt_dlp/extractor/spreaker.py

@@ -2,7 +2,6 @@ import itertools
 
 from .common import InfoExtractor
 from ..utils import (
-    filter_dict,
     float_or_none,
     int_or_none,
     parse_qs,
@@ -120,46 +119,29 @@ class SpreakerIE(InfoExtractor):
     def _real_extract(self, url):
         episode_id = self._match_id(url)
         data = self._download_json(
-            f'https://api.spreaker.com/v2/episodes/{episode_id}', episode_id,
+            f'https://api.spreaker.com/v2/episodes/{episode_id}',
-            query=traverse_obj(parse_qs(url), {'key': ('key', 0)}))['response']['episode']
+            episode_id, query=traverse_obj(parse_qs(url), {'key': ('key', 0)}))['response']['episode']
         return _extract_episode(data, episode_id)
 
 
 class SpreakerShowIE(InfoExtractor):
-    _VALID_URL = [
+    _VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
-        r'https?://api\.spreaker\.com/show/(?P<id>\d+)',
-        r'https?://(?:www\.)?spreaker\.com/podcast/[\w-]+--(?P<id>[\d]+)',
-        r'https?://(?:www\.)?spreaker\.com/show/(?P<id>\d+)/episodes/feed',
-    ]
     _TESTS = [{
         'url': 'https://api.spreaker.com/show/4652058',
         'info_dict': {
             'id': '4652058',
         },
         'playlist_mincount': 118,
-    }, {
-        'url': 'https://www.spreaker.com/podcast/health-wealth--5918323',
-        'info_dict': {
-            'id': '5918323',
-        },
-        'playlist_mincount': 60,
-    }, {
-        'url': 'https://www.spreaker.com/show/5887186/episodes/feed',
-        'info_dict': {
-            'id': '5887186',
-        },
-        'playlist_mincount': 290,
     }]
 
-    def _entries(self, show_id, key=None):
+    def _entries(self, show_id):
         for page_num in itertools.count(1):
             episodes = self._download_json(
                 f'https://api.spreaker.com/show/{show_id}/episodes',
-                show_id, note=f'Downloading JSON page {page_num}', query=filter_dict({
+                show_id, note=f'Downloading JSON page {page_num}', query={
                     'page': page_num,
                     'max_per_page': 100,
-                    'key': key,
+                })
-                }))
             pager = try_get(episodes, lambda x: x['response']['pager'], dict)
             if not pager:
                 break
@@ -175,5 +157,21 @@ class SpreakerShowIE(InfoExtractor):
 
     def _real_extract(self, url):
         show_id = self._match_id(url)
-        key = traverse_obj(parse_qs(url), ('key', 0))
+        return self.playlist_result(self._entries(show_id), playlist_id=show_id)
-        return self.playlist_result(self._entries(show_id, key), playlist_id=show_id)
+
+
+class SpreakerShowPageIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?spreaker\.com/show/(?P<id>[^/?#&]+)'
+    _TESTS = [{
+        'url': 'https://www.spreaker.com/show/success-with-music',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        show_id = self._search_regex(
+            r'show_id\s*:\s*(?P<id>\d+)', webpage, 'show id')
+        return self.url_result(
+            f'https://api.spreaker.com/show/{show_id}',
+            ie=SpreakerShowIE.ie_key(), video_id=show_id)