Merge d73bce4928 into be3579aaf0

Authored by: stratus-ss, bashonly

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>

yt_dlp/extractor/_extractors.py

@@ -708,6 +708,7 @@ from .gab import (
     GabTVIE,
 )
 from .gaia import GaiaIE
+from .gamedevtv import GameDevTVDashboardIE
 from .gamejolt import (
     GameJoltCommunityIE,
     GameJoltGameIE,
@@ -1893,6 +1894,10 @@ from .sonyliv import (
     SonyLIVIE,
     SonyLIVSeriesIE,
 )
+from .soopglobal import (
+    SoopGlobalLiveIE,
+    SoopGlobalVodIE,
+)
 from .soundcloud import (
     SoundcloudEmbedIE,
     SoundcloudIE,

yt_dlp/extractor/adobepass.py

@@ -1362,7 +1362,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
 
     def _download_webpage_handle(self, *args, **kwargs):
         headers = self.geo_verification_headers()
-        headers.update(kwargs.get('headers', {}))
+        headers.update(kwargs.get('headers') or {})
         kwargs['headers'] = headers
         return super()._download_webpage_handle(
             *args, **kwargs)

yt_dlp/extractor/gamedevtv.py

@@ -0,0 +1,141 @@
+import json
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    int_or_none,
+    join_nonempty,
+    parse_iso8601,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class GameDevTVDashboardIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?gamedev\.tv/dashboard/courses/(?P<course_id>\d+)(?:/(?P<lecture_id>\d+))?'
+    _NETRC_MACHINE = 'gamedevtv'
+    _TESTS = [{
+        'url': 'https://www.gamedev.tv/dashboard/courses/25',
+        'info_dict': {
+            'id': '25',
+            'title': 'Complete Blender Creator 3: Learn 3D Modelling for Beginners',
+            'tags': ['blender', 'course', 'all', 'box modelling', 'sculpting'],
+            'categories': ['Blender', '3D Art'],
+            'thumbnail': 'https://gamedev-files.b-cdn.net/courses/qisc9pmu1jdc.jpg',
+            'upload_date': '20220516',
+            'timestamp': 1652694420,
+            'modified_date': '20241027',
+            'modified_timestamp': 1730049658,
+        },
+        'playlist_count': 100,
+    }, {
+        'url': 'https://www.gamedev.tv/dashboard/courses/63/2279',
+        'info_dict': {
+            'id': 'df04f4d8-68a4-4756-a71b-9ca9446c3a01',
+            'ext': 'mp4',
+            'modified_timestamp': 1701695752,
+            'upload_date': '20230504',
+            'episode': 'MagicaVoxel Community Course Introduction',
+            'series_id': '63',
+            'title': 'MagicaVoxel Community Course Introduction',
+            'timestamp': 1683195397,
+            'modified_date': '20231204',
+            'categories': ['3D Art', 'MagicaVoxel'],
+            'season': 'MagicaVoxel Community Course',
+            'tags': ['MagicaVoxel', 'all', 'course'],
+            'series': 'MagicaVoxel 3D Art Mini Course',
+            'duration': 1405,
+            'episode_number': 1,
+            'season_number': 1,
+            'season_id': '219',
+            'description': 'md5:a378738c5bbec1c785d76c067652d650',
+            'display_id': '63-219-2279',
+            'alt_title': '1_CC_MVX MagicaVoxel Community Course Introduction.mp4',
+            'thumbnail': 'https://vz-23691c65-6fa.b-cdn.net/df04f4d8-68a4-4756-a71b-9ca9446c3a01/thumbnail.jpg',
+        },
+    }]
+    _API_HEADERS = {}
+
+    def _perform_login(self, username, password):
+        try:
+            response = self._download_json(
+                'https://api.gamedev.tv/api/students/login', None, 'Logging in',
+                headers={'Content-Type': 'application/json'},
+                data=json.dumps({
+                    'email': username,
+                    'password': password,
+                    'cart_items': [],
+                }).encode())
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                raise ExtractorError('Invalid username/password', expected=True)
+            raise
+
+        self._API_HEADERS['Authorization'] = f'{response["token_type"]} {response["access_token"]}'
+
+    def _real_initialize(self):
+        if not self._API_HEADERS.get('Authorization'):
+            self.raise_login_required(
+                'This content is only available with purchase', method='password')
+
+    def _entries(self, data, course_id, course_info, selected_lecture):
+        for section in traverse_obj(data, ('sections', ..., {dict})):
+            section_info = traverse_obj(section, {
+                'season_id': ('id', {str_or_none}),
+                'season': ('title', {str}),
+                'season_number': ('order', {int_or_none}),
+            })
+            for lecture in traverse_obj(section, ('lectures', lambda _, v: url_or_none(v['video']['playListUrl']))):
+                if selected_lecture and str(lecture.get('id')) != selected_lecture:
+                    continue
+                display_id = join_nonempty(course_id, section_info.get('season_id'), lecture.get('id'))
+                formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                    lecture['video']['playListUrl'], display_id, 'mp4', m3u8_id='hls')
+                yield {
+                    **course_info,
+                    **section_info,
+                    'id': display_id,  # fallback
+                    'display_id': display_id,
+                    'formats': formats,
+                    'subtitles': subtitles,
+                    'series': course_info.get('title'),
+                    'series_id': course_id,
+                    **traverse_obj(lecture, {
+                        'id': ('video', 'guid', {str}),
+                        'title': ('title', {str}),
+                        'alt_title': ('video', 'title', {str}),
+                        'description': ('description', {clean_html}),
+                        'episode': ('title', {str}),
+                        'episode_number': ('order', {int_or_none}),
+                        'duration': ('video', 'duration_in_sec', {int_or_none}),
+                        'timestamp': ('video', 'created_at', {parse_iso8601}),
+                        'modified_timestamp': ('video', 'updated_at', {parse_iso8601}),
+                        'thumbnail': ('video', 'thumbnailUrl', {url_or_none}),
+                    }),
+                }
+
+    def _real_extract(self, url):
+        course_id, lecture_id = self._match_valid_url(url).group('course_id', 'lecture_id')
+        data = self._download_json(
+            f'https://api.gamedev.tv/api/courses/my/{course_id}', course_id,
+            headers=self._API_HEADERS)['data']
+
+        course_info = traverse_obj(data, {
+            'title': ('title', {str}),
+            'tags': ('tags', ..., 'name', {str}),
+            'categories': ('categories', ..., 'title', {str}),
+            'timestamp': ('created_at', {parse_iso8601}),
+            'modified_timestamp': ('updated_at', {parse_iso8601}),
+            'thumbnail': ('image', {url_or_none}),
+        })
+
+        entries = self._entries(data, course_id, course_info, lecture_id)
+        if lecture_id:
+            lecture = next(entries, None)
+            if not lecture:
+                raise ExtractorError('Lecture not found')
+            return lecture
+        return self.playlist_result(entries, course_id, **course_info)

yt_dlp/extractor/soopglobal.py

@@ -0,0 +1,125 @@
+import uuid
+
+from yt_dlp import int_or_none, traverse_obj
+from yt_dlp.compat import functools
+from yt_dlp.extractor.common import InfoExtractor
+from yt_dlp.utils import UserNotLive, bool_or_none, parse_iso8601
+
+
+class SoopGlobalLiveIE(InfoExtractor):
+    IE_NAME = 'soopglobal:live'
+    _VALID_URL = r'https?://www\.sooplive\.com/(?P<id>[\w]+$)'
+    _TESTS = [{
+        'url': 'https://www.sooplive.com/soopbowl',
+        'info_dict': {
+            'id': 'soopbowl',
+            'ext': 'mp4',
+            'title': str,
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'channel': 'SoopBowl',
+            'channel_id': 'soopbowl',
+            'concurrent_view_count': int,
+            'channel_follower_count': int,
+            'timestamp': 1717852526,
+            'upload_date': '20240608',
+            'live_status': 'is_live',
+            'view_count': int,
+            'age_limit': False,
+        },
+    }]
+
+    def _real_extract(self, url):
+        channel_id = self._match_id(url)
+        client_id = str(uuid.uuid4())
+        live_detail = self._download_json(
+            f'https://api.sooplive.com/stream/info/{channel_id}', channel_id,
+            headers={'client-id': client_id},
+            note='Downloading live info', errnote='Unable to download live info')
+        if not live_detail.get('isStream'):
+            raise UserNotLive(video_id=channel_id)
+
+        age_limit = 0
+        if traverse_obj(live_detail, ('data', 'isAdult', {bool_or_none})):
+            age_limit = 19
+
+        live_statistic = self._download_json(
+            f'https://api.sooplive.com/stream/info/{channel_id}/live', channel_id,
+            headers={'client-id': client_id},
+            note='Downloading live statistics', errnote='Unable to download live statistics')
+
+        channel_info = self._download_json(
+            f'https://api.sooplive.com/channel/info/{channel_id}', channel_id,
+            headers={'client-id': client_id},
+            note='Downloading channel information', errnote='Unable to download channel information')
+
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            f'https://api.sooplive.com/media/live/{channel_id}/master.m3u8', channel_id,
+            headers={'client-id': client_id},
+            note='Downloading live stream', errnote='Unable to download live stream')
+
+        return {
+            'id': channel_id,
+            'channel_id': channel_id,
+            'is_live': True,
+            'formats': formats,
+            'subtitles': subtitles,
+            'view_count': live_statistic.get('viewer'),
+            'age_limit': age_limit,
+            **traverse_obj(channel_info.get('streamerChannelInfo'), {
+                'channel': ('nickname', {str}),
+                'channel_id': ('channelId', {str}),
+                'channel_follower_count': ('totalFollowerCount', {int_or_none}),
+            }),
+            **traverse_obj(live_detail.get('data'), {
+                'title': ('title', {str}),
+                'timestamp': ('streamStartDate', {functools.partial(parse_iso8601)}),
+                'concurrent_view_count': ('totalStreamCumulativeViewer', {int_or_none}),
+                'thumbnail': ('thumbnailUrl', {str}),
+            }),
+        }
+
+
+class SoopGlobalVodIE(InfoExtractor):
+    IE_NAME = 'soopglobal:vod'
+    _VALID_URL = r'https?://www\.sooplive\.com/video/(?P<id>[\d]+)'
+    _TESTS = [{
+        'url': 'https://www.sooplive.com/video/607',
+        'info_dict': {
+            'id': '607',
+            'ext': 'mp4',
+            'title': str,
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'channel': '샤미요',
+            'channel_id': 'shamiyo',
+            'timestamp': 1717051284,
+            'upload_date': '20240530',
+            'view_count': int,
+            'age_limit': False,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        client_id = str(uuid.uuid4())
+        video_info = self._download_json(
+            f'https://api.sooplive.com/vod/info/{video_id}', video_id,
+            headers={'client-id': client_id},
+            note='Downloading video info', errnote='Unable to download video info')
+        channel_id = video_info.get('channelId')
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            f'https://api.sooplive.com/media/vod/{channel_id}/{video_id}/master.m3u8', video_id,
+            headers={'client-id': client_id},
+            note='Downloading video stream', errnote='Unable to download video stream')
+        return {
+            'id': video_id,
+            'channel': video_info.get('nickName'),
+            'channel_id': channel_id,
+            'title': video_info.get('titleName'),
+            'thumbnail': video_info.get('thumb'),
+            'timestamp': parse_iso8601(video_info.get('createDate')),
+            'view_count': video_info.get('readCnt'),
+            'age_limit': 0 if not video_info.get('isAdult') else 19,
+            'formats': formats,
+            'subtitles': subtitles,
+        }