1
0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-08-15 00:48:28 +00:00

Apply suggestions from code review

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
This commit is contained in:
CasperMcFadden95 2025-08-02 11:54:42 +00:00 committed by GitHub
parent 25bd4b4260
commit 599459fdd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5,26 +5,21 @@
from ..utils import js_to_json, url_or_none from ..utils import js_to_json, url_or_none
from ..utils.traversal import traverse_obj from ..utils.traversal import traverse_obj
_DOMAINS = ( class FaulioBaseIE(InfoExtractor):
_DOMAINS = (
'aloula.sba.sa', 'aloula.sba.sa',
'bahry.com', 'bahry.com',
'maraya.sba.net.ae', 'maraya.sba.net.ae',
'sat7plus.org', 'sat7plus.org',
) )
_LANGUAGES = ('ar', 'en', 'fa')
_BASE_URL_RE = fr'https?://(?:{"|".join(map(re.escape, _DOMAINS))})/(?:(?:{"|".join(_LANGUAGES)})/)?'
_LANGUAGES = (
'ar',
'en',
'fa',
)
class FaulioBase(InfoExtractor):
def _get_headers(self, url): def _get_headers(self, url):
origin = f'{urllib.parse.urlparse(url).scheme}://{urllib.parse.urlparse(url).netloc}' parsed_url = urllib.parse.urlparse(url)
return { return {
'Referer': origin, 'Referer': url,
'Origin': origin, 'Origin': f'{parsed_url.scheme}://{parsed_url.hostname}'
} }
def _get_api_base(self, url, video_id): def _get_api_base(self, url, video_id):
@ -34,10 +29,9 @@ def _get_api_base(self, url, video_id):
return config_data['public']['TRANSLATIONS_API_URL'] return config_data['public']['TRANSLATIONS_API_URL']
class FaulioIE(FaulioBase): class FaulioIE(FaulioBaseIE):
_VALID_URL = fr'https?://(?:{"|".join(map(re.escape, _DOMAINS))})/(?:(?:{"|".join(map(re.escape, _LANGUAGES))})/)?(?:episode|media)/(?P<id>[a-zA-Z0-9-]+)' _VALID_URL = fr'{FaulioBaseIE._BASE_URL_RE}(?:episode|media)/(?P<id>[a-zA-Z0-9-]+)'
_TESTS = [ _TESTS = [{
{
'url': 'https://bahry.com/en/media/1191', 'url': 'https://bahry.com/en/media/1191',
'info_dict': { 'info_dict': {
'id': 'bahry.faulio.com_1191', 'id': 'bahry.faulio.com_1191',
@ -54,8 +48,7 @@ class FaulioIE(FaulioBase):
'duration': 1653, 'duration': 1653,
'age_limit': 0, 'age_limit': 0,
}, },
}, }, {
{
'url': 'https://maraya.sba.net.ae/en/episode/127735', 'url': 'https://maraya.sba.net.ae/en/episode/127735',
'info_dict': { 'info_dict': {
'id': 'maraya.faulio.com_127735', 'id': 'maraya.faulio.com_127735',
@ -72,15 +65,14 @@ class FaulioIE(FaulioBase):
'duration': 1316, 'duration': 1316,
'age_limit': 0, 'age_limit': 0,
}, },
}, }]
]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
api_base = self._get_api_base(url, video_id) api_base = self._get_api_base(url, video_id)
video_info = self._download_json(f'{api_base}/video/{video_id}', video_id) video_info = self._download_json(f'{api_base}/video/{video_id}', video_id, fatal=False)
player_info = self._download_json(f'{api_base}/video/{video_id}/player', video_id) player_info = self._download_json(f'{api_base}/video/{video_id}/player', video_id)
headers = self._get_headers(url) headers = self._get_headers(url)
@ -104,25 +96,24 @@ def _real_extract(self, url):
return { return {
'id': f'{urllib.parse.urlparse(api_base).hostname}_{video_id}', 'id': f'{urllib.parse.urlparse(api_base).hostname}_{video_id}',
**traverse_obj(traverse_obj(video_info, ('blocks', 0)), { **traverse_obj(traverse_obj(video_info, ('blocks', 0)), {
'display_id': ('slug',), 'display_id': ('slug', {str}),
'title': ('title',), 'title': ('title', {str}),
'episode': ('title',), 'episode': ('title', {str}),
'description': ('description',), 'description': ('description', {str}),
'series': ('program_title',), 'series': ('program_title', {str}),
'season_number': ('season_number',), 'season_number': ('season_number', {int_or_none}),
'episode_number': ('episode',), 'episode_number': ('episode', {int_or_none}),
'thumbnail': ('image',), 'thumbnail': ('image', {url_or_none}),
'duration': ('duration', 'total'), 'duration': ('duration', 'total', {int_or_none}),
'age_limit': ('age_rating',), 'age_limit': ('age_rating', {int_or_none}),
}), }),
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,
'is_live': False,
} }
class FaulioLiveIE(FaulioBase): class FaulioLiveIE(FaulioBaseIE):
_VALID_URL = fr'https?://(?:{"|".join(map(re.escape, _DOMAINS))})/(?:(?:{"|".join(map(re.escape, _LANGUAGES))})/)?live/(?P<id>[a-zA-Z0-9-]+)' _VALID_URL = fr'{FaulioBaseIE._BASE_URL_RE}live/(?P<id>[a-zA-Z0-9-]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://aloula.sba.sa/live/saudiatv', 'url': 'https://aloula.sba.sa/live/saudiatv',
'info_dict': { 'info_dict': {