xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-02-17 09:48:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored based on feedback

Browse Source
This commit is contained in:
Kieran Eglin 2024-05-09 10:55:22 -07:00
parent 6d23661542
commit 620d721779
No known key found for this signature in database
GPG Key ID: 193984967FCF432D
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yt_dlp/extractor/thirtydaysinger.py
View File

@ -1,13 +1,17 @@
from .wistia import WistiaIE import re
from .wistia import WistiaBaseIE
from ..utils import ( from ..utils import (
clean_html, clean_html,
get_elements_html_by_class get_elements_html_by_class
) )
class ThirtyDaySingerBase(WistiaIE): class ThirtyDaySingerBase(WistiaBaseIE):
_INDEX_EXTRACTION_RE = r'/tutorial/[\w-]+/(?P<index>[\w-]+)'
def _extract_for_url(self, url): def _extract_for_url(self, url):
lesson_index = self._match_id(url) lesson_index = re.search(self._INDEX_EXTRACTION_RE, url).group('index')
webpage = self._download_webpage(url, lesson_index) webpage = self._download_webpage(url, lesson_index)
match = next(self._extract_wistia_async_embed(webpage)) match = next(self._extract_wistia_async_embed(webpage))
embed_config = self._download_embed_config('medias', match.group('id'), url) embed_config = self._download_embed_config('medias', match.group('id'), url)
@ -44,7 +48,7 @@ def _format_html_list(self, html):
class ThirtyDaySingerIE(ThirtyDaySingerBase): class ThirtyDaySingerIE(ThirtyDaySingerBase):
_VALID_URL = r'(https?://)?www.30daysinger.com/tutorial/[\w-]+/(?P<id>[\w-]+)' _VALID_URL = r'(https?://)?www.30daysinger.com/tutorial/[\w-]+/[\w-]+'
_TESTS = [{ _TESTS = [{
'url': 'https://www.30daysinger.com/tutorial/30-day-beginner-course-with-jonathan-estabrooks/1', 'url': 'https://www.30daysinger.com/tutorial/30-day-beginner-course-with-jonathan-estabrooks/1',
@ -67,7 +71,7 @@ def _real_extract(self, url):
class ThirtyDaySingerPlaylistIE(ThirtyDaySingerBase): class ThirtyDaySingerPlaylistIE(ThirtyDaySingerBase):
_URI_BASE = 'https://www.30daysinger.com' _URI_BASE = 'https://www.30daysinger.com'
_VALID_URL = r'(https?://)?www.30daysinger.com/tutorial/(?P<id>[\w-]+)/?(?:$|[#?])' _VALID_URL = r'(https?://)?www.30daysinger.com/tutorial/(?P<playlist_id>[\w-]+)/?(?:$|[#?])'
_TESTS = [{ _TESTS = [{
'url': 'https://www.30daysinger.com/tutorial/30-day-beginner-course-with-jonathan-estabrooks', 'url': 'https://www.30daysinger.com/tutorial/30-day-beginner-course-with-jonathan-estabrooks',
@ -81,7 +85,7 @@ class ThirtyDaySingerPlaylistIE(ThirtyDaySingerBase):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) playlist_id = self._match_valid_url(url).group('playlist_id')
webpage = self._download_webpage(url, playlist_id) webpage = self._download_webpage(url, playlist_id)
playlist_attrs = self._extract_webpage_data(webpage) playlist_attrs = self._extract_webpage_data(webpage)