yt_dlp/extractor/_extractors.py

@@ -42,6 +42,7 @@ from .abematv import (
     AbemaTVTitleIE,
 )
 from .academicearth import AcademicEarthCourseIE
+from .academymel import AcademyMelIE
 from .acast import (
     ACastIE,
     ACastChannelIE,
@@ -680,10 +681,7 @@ from .genius import (
     GeniusIE,
     GeniusLyricsIE,
 )
-from .getcourseru import (
-    GetCourseRuPlayerIE,
-    GetCourseRuIE
-)
+from .getcourseru import GetCourseRuIE
 from .gettr import (
     GettrIE,
     GettrStreamingIE,

yt_dlp/extractor/academymel.py

@@ -0,0 +1,57 @@
+import re
+import time
+
+from .common import InfoExtractor
+from .getcourseru import GetCourseRuIE
+from ..utils import update_url_query, urlencode_postdata
+
+
+class AcademyMelIE(InfoExtractor):
+    _NETRC_MACHINE = 'academymel'
+    _VALID_URL = r'https?://academymel\.online/(?P<id>[^/?#]+)'
+    _LOGIN_URL = 'https://academymel.online/cms/system/login'
+    _TESTS = [{
+        'url': 'http://academymel.online/3video_1',
+        'info_dict': {
+            'id': '3video_1',
+            'title': 'Промоуроки Академии МЕЛ',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '4885302',
+                'ext': 'mp4',
+                'title': 'Промоуроки Академии МЕЛ',
+                'duration': 1693
+            },
+        }]
+    }]
+
+    def _perform_login(self, username, password):
+        self._request_webpage(
+            self._LOGIN_URL, None, 'Logging in', 'Failed to log in',
+            data=urlencode_postdata({
+                'action': 'processXdget',
+                'xdgetId': 'r6335_1_1',
+                'params[action]': 'login',
+                'params[url]': update_url_query(self._LOGIN_URL, {'required': 'true'}),
+                'params[object_type]': 'cms_page',
+                'params[object_id]': -1,
+                'params[email]': username,
+                'params[password]': password,
+                'requestTime': int(time.time())
+            }))
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        if not self._get_cookies(self._LOGIN_URL).get('PHPSESSID5'):
+            self.raise_login_required()
+        webpage = self._download_webpage(url, playlist_id)
+        title = self._html_extract_title(webpage)
+
+        return self.playlist_from_matches(
+            re.findall(r'data-iframe-src="(https?://[^."]+\.getcourse\.ru/sign-player/[^"]+)', webpage),
+            playlist_id, title, ie=GetCourseRuIE, video_kwargs={
+                'url_transparent': True,
+                'title': title,
+            })

yt_dlp/extractor/getcourseru.py

@@ -1,181 +1,35 @@
-import re
-import time
-import urllib.parse
-
 from .common import InfoExtractor
-from ..utils import int_or_none, url_or_none, urlencode_postdata
-from ..utils.traversal import traverse_obj
+from ..utils import int_or_none, traverse_obj, url_or_none
 
 
-class GetCourseRuPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://player02\.getcourse\.ru/sign-player/?\?(?:[^#]+&)?json=[^#&]+'
+class GetCourseRuIE(InfoExtractor):
+    _VALID_URL = r'https?://[^.]+\.getcourse\.ru/sign-player/?\?(?:[^#]+&)?json=(?P<id>[^#&]+)'
     _TESTS = [{
-        'url': 'http://player02.getcourse.ru/sign-player/?json=eyJ2aWRlb19oYXNoIjoiMTkwYmRmOTNmMWIyOTczNTMwOTg1M2E3YTE5ZTI0YjMiLCJ1c2VyX2lkIjozNTk1MjUxODMsInN1Yl9sb2dpbl91c2VyX2lkIjpudWxsLCJsZXNzb25faWQiOm51bGwsImlwIjoiNDYuMTQyLjE4Mi4yNDciLCJnY19ob3N0IjoiYWNhZGVteW1lbC5vbmxpbmUiLCJ0aW1lIjoxNzA1NDQ5NjQyLCJwYXlsb2FkIjoidV8zNTk1MjUxODMiLCJ1aV9sYW5ndWFnZSI6InJ1IiwiaXNfaGF2ZV9jdXN0b21fc3R5bGUiOnRydWV9&s=354ad2c993d95d5ac629e3133d6cefea&vh-static-feature=zigzag',
+        'url': 'http://player02.getcourse.ru/sign-player/?json=eyJ2aWRlb19oYXNoIjoiMTkwYmRmOTNmMWIyOTczNTMwOTg1M2E3YTE5ZTI0YjMiLCJ1c2VyX2lkIjozNTk1MjUxODMsInN1Yl9sb2dpbl91c2VyX2lkIjpudWxsLCJsZXNzb25faWQiOm51bGwsImlwIjoiNDYuMTQyLjE4Mi4yNDciLCJnY19ob3N0IjoiYWNhZGVteW1lbC5vbmxpbmUiLCJ0aW1lIjoxNzA1MjcwMzU0LCJwYXlsb2FkIjoidV8zNTk1MjUxODMiLCJ1aV9sYW5ndWFnZSI6InJ1IiwiaXNfaGF2ZV9jdXN0b21fc3R5bGUiOnRydWV9&s=031d44cc738c58863a436d98f1032132&vh-static-feature=zigzag',
         'info_dict': {
-            'id': '513573381',
+            'id': '4885302',
             'title': '190bdf93f1b29735309853a7a19e24b3',
             'ext': 'mp4',
-            'thumbnail': 'https://preview-htz.kinescopecdn.net/preview/190bdf93f1b29735309853a7a19e24b3/preview.jpg?version=1702370546&host=vh-80',
             'duration': 1693
         },
         'skip': 'JWT expired',
     }]
-    _EMBED_REGEX = [rf'(?x)<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL}[^\'"]*)']
 
     def _real_extract(self, url):
         webpage = self._download_webpage(url, None, 'Downloading player page')
         window_configs = self._search_json(
             r'window\.configs\s*=', webpage, 'config', None)
-        video_id = str(window_configs['gcFileId'])
+        video_id = str(window_configs['videoId'])
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(
             window_configs['masterPlaylistUrl'], video_id)
 
         return {
             **traverse_obj(window_configs, {
                 'title': ('videoHash', {str}),
-                'thumbnail': ('previewUrl', {url_or_none}),
+                'thumbnail': ('thumbnailUrl', {url_or_none}),
                 'duration': ('videoDuration', {int_or_none}),
             }),
             'id': video_id,
             'formats': formats,
             'subtitles': subtitles
         }
-
-
-class GetCourseRuIE(InfoExtractor):
-    _NETRC_MACHINE = 'getcourseru'
-    _LOGIN_URL_PATH = '/cms/system/login'
-    _TESTS = [{
-        'url': 'http://academymel.online/3video_1',
-        'info_dict': {
-            'id': '3059742',
-            'display_id': '3video_1',
-            'title': 'Промоуроки Академии МЕЛ',
-        },
-        'playlist_count': 1,
-        'playlist': [{
-            'info_dict': {
-                'id': '513573381',
-                'ext': 'mp4',
-                'title': 'Промоуроки Академии МЕЛ',
-                'thumbnail': 'https://preview-htz.kinescopecdn.net/preview/190bdf93f1b29735309853a7a19e24b3/preview.jpg?version=1702370546&host=vh-80',
-                'duration': 1693
-            },
-        }]
-    }, {
-        'url': 'https://academymel.getcourse.ru/3video_1',
-        'info_dict': {
-            'id': '3059742',
-            'display_id': '3video_1',
-            'title': 'Промоуроки Академии МЕЛ',
-        },
-        'playlist_count': 1,
-        'playlist': [{
-            'info_dict': {
-                'id': '513573381',
-                'ext': 'mp4',
-                'title': 'Промоуроки Академии МЕЛ',
-                'thumbnail': 'https://preview-htz.kinescopecdn.net/preview/190bdf93f1b29735309853a7a19e24b3/preview.jpg?version=1702370546&host=vh-80',
-                'duration': 1693
-            },
-        }]
-    }, {
-        'url': 'https://academymel.getcourse.ru/pl/teach/control/lesson/view?id=319141781&editMode=0',
-        'info_dict': {
-            'id': '319141781',
-            'title': '1. Разминка у стены',
-        },
-        'playlist_count': 1,
-        'playlist': [{
-            'info_dict': {
-                'id': '4919601',
-                'ext': 'mp4',
-                'title': '1. Разминка у стены',
-                'thumbnail': 'https://preview-htz.vhcdn.com/preview/5a521788e7dc25b4f70c3dff6512d90e/preview.jpg?version=1703223532&host=vh-81',
-                'duration': 704
-            },
-        }],
-        'skip': 'paid lesson'
-    }, {
-        'url': 'https://manibeauty.getcourse.ru/pl/teach/control/lesson/view?id=272499894',
-        'info_dict': {
-            'id': '272499894',
-            'title': 'Мотивация к тренировкам',
-        },
-        'playlist_count': 1,
-        'playlist': [{
-            'info_dict': {
-                'id': '4242723',
-                'ext': 'mp4',
-                'title': 'Мотивация к тренировкам',
-                'thumbnail': 'https://preview-htz.vhcdn.com/preview/70ed5b9f489dd03b4aff55bfdff71a26/preview.jpg?version=1685115787&host=vh-71',
-                'duration': 30
-            },
-        }],
-        'skip': 'paid lesson'
-    }, {
-        'url': 'https://gaismasmandalas.getcourse.io/ATLAUTSEVBUT',
-        'only_matching': True,
-    }]
-    _DOMAINS = [
-        'academymel.online',
-        'marafon.mani-beauty.com',
-    ]
-    _BASE_URL_RE = rf'https?://(?:(?!player02\.)[^.]+\.getcourse\.(?:ru|io)|{"|".join(map(re.escape, _DOMAINS))})'
-    _VALID_URL = [
-        rf'{_BASE_URL_RE}/(?!pl/|teach/)(?P<id>[^?#]+)',
-        rf'{_BASE_URL_RE}/(:?pl/)?teach/control/lesson/view\?(?:[^#]+&)?id=(?P<id>\d+)',
-    ]
-
-    def _login(self, url, username, password):
-        if self._get_cookies(url).get('PHPSESSID5'):
-            return
-        domain = urllib.parse.urlparse(url).netloc
-        login_url = f'https://{domain}{self._LOGIN_URL_PATH}'
-
-        webpage = self._download_webpage(login_url, None)
-        xdget_id = self._html_search_regex(
-            r'<form[^>]*class="[^"]*state-login[^"]*"[^>]*data-xdget-id="([^"]+)"',
-            webpage, 'xdgetId')
-
-        simple_sign = self._html_search_regex(
-            r'window.requestSimpleSign\s*=\s*"([\da-f]+)"',
-            webpage, 'simple sign')
-
-        self._request_webpage(
-            login_url, None, 'Logging in', 'Failed to log in',
-            data=urlencode_postdata({
-                'action': 'processXdget',
-                'xdgetId': xdget_id,
-                'params[action]': 'login',
-                'params[url]': login_url,
-                'params[object_type]': 'cms_page',
-                'params[object_id]': -1,
-                'params[email]': username,
-                'params[password]': password,
-                'requestTime': int(time.time()),
-                'requestSimpleSign': simple_sign,
-            }))
-
-    def _real_extract(self, url):
-        username, password = self._get_login_info()
-        if username:
-            self._login(url, username, password)
-
-        display_id = self._match_id(url)
-        # NB: 404 is returned due to yt-dlp not properly following redirects #9020
-        webpage, urlh = self._download_webpage_handle(url, display_id, expected_status=404)
-        if self._LOGIN_URL_PATH in urlh.url or urlh.status == 404:
-            self.raise_login_required()
-
-        playlist_id = self._search_regex(
-            r'window\.(?:lessonId|gcsObjectId)\s*=\s*(\d+)', webpage, 'playlist id', default=display_id)
-
-        title = self._html_extract_title(webpage) or self._og_search_title(webpage)
-
-        return self.playlist_from_matches(
-            re.findall(GetCourseRuPlayerIE._EMBED_REGEX[0], webpage),
-            playlist_id, title, display_id=display_id, ie=GetCourseRuPlayerIE, video_kwargs={
-                'url_transparent': True,
-                'title': title,
-            })