mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-10-20 04:19:41 +02:00
Merge d9e0e023b8 into 4a9bc8c363
This commit is contained in:
Subrat Lima
GitHub
commit
5b49ea5e8a
@ -75,6 +75,12 @@
|
|||||||
HistoryTopicIE,
|
HistoryTopicIE,
|
||||||
)
|
)
|
||||||
from .aeonco import AeonCoIE
|
from .aeonco import AeonCoIE
|
||||||
|
from .afl import (
|
||||||
|
AFCVideoIE,
|
||||||
|
AFLPodcastIE,
|
||||||
|
AFLVideoIE,
|
||||||
|
CarltonFCVideoIE,
|
||||||
|
)
|
||||||
from .afreecatv import (
|
from .afreecatv import (
|
||||||
AfreecaTVCatchStoryIE,
|
AfreecaTVCatchStoryIE,
|
||||||
AfreecaTVIE,
|
AfreecaTVIE,
|
||||||
@ -1427,6 +1433,7 @@
|
|||||||
)
|
)
|
||||||
from .oktoberfesttv import OktoberfestTVIE
|
from .oktoberfesttv import OktoberfestTVIE
|
||||||
from .olympics import OlympicsReplayIE
|
from .olympics import OlympicsReplayIE
|
||||||
|
from .omnyfm import OmnyFMShowIE
|
||||||
from .on24 import On24IE
|
from .on24 import On24IE
|
||||||
from .ondemandkorea import (
|
from .ondemandkorea import (
|
||||||
OnDemandKoreaIE,
|
OnDemandKoreaIE,
|
||||||
|
|||||||
204
yt_dlp/extractor/afl.py
Normal file
204
yt_dlp/extractor/afl.py
Normal file
@ -0,0 +1,204 @@
|
|||||||
|
from .brightcove import BrightcoveNewIE
|
||||||
|
from .common import InfoExtractor
|
||||||
|
from .omnyfm import OmnyFMShowIE
|
||||||
|
from ..utils import (
|
||||||
|
extract_attributes,
|
||||||
|
get_element_by_class,
|
||||||
|
get_element_html_by_attribute,
|
||||||
|
get_element_html_by_id,
|
||||||
|
smuggle_url,
|
||||||
|
str_or_none,
|
||||||
|
traverse_obj,
|
||||||
|
url_or_none,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class AFLVideoIE(InfoExtractor):
|
||||||
|
IE_NAME = 'afl:video'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?(?:afl|lions)\.com.au/(?:aflw/)?video/(?P<id>\d+)'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.afl.com.au/aflw/video/1217670/the-w-show-aflws-line-in-the-sand-moment-bonnies-bold-bid',
|
||||||
|
'md5': '7000431c2bd3f96eddb5f63273aea83e',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '6361825702112',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'description': 'md5:d1fee2ae8e3ecf486c1f0f7aa19e724b',
|
||||||
|
'upload_date': '20240911',
|
||||||
|
'duration': 1523.28,
|
||||||
|
'tags': 'count:0',
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
'title': "The W Show: AFLW's 'line in the sand' moment, Bonnie's bold bid",
|
||||||
|
'uploader_id': '6057984922001',
|
||||||
|
'timestamp': 1726038522,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.lions.com.au/video/1655451/team-song-brisbane?videoId=1655451&modal=true&type=video&publishFrom=1726318577001',
|
||||||
|
'md5': '47e8c67e317b48a69787c8bc39c3c591',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '6361958949112',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'description': 'md5:c0fb37fcad9ec0f49ac54eb8d76641bd',
|
||||||
|
'upload_date': '20240914',
|
||||||
|
'duration': 41.0,
|
||||||
|
'tags': 'count:0',
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
'title': 'Team Song: Brisbane',
|
||||||
|
'uploader_id': '6057984922001',
|
||||||
|
'timestamp': 1726318788,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.afl.com.au/video/1217264/bulldogs-season-review-gold-plated-list-going-to-waste-duos-frightening-future?videoId=1217264&modal=true&type=video&publishFrom=1725998400001',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.afl.com.au/video/1210885/wafl-showreel-ef-hamish-davis-highlights?videoId=1210885&modal=true&type=video&publishFrom=1725171238001',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.lions.com.au/video/1657551/svarc-weve-built-up-really-well?videoId=1657551&modal=true&type=video&publishFrom=1726545600001',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
display_id = self._match_id(url)
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
element = get_element_by_class('inline-player__player-container', webpage)
|
||||||
|
attrs = traverse_obj(extract_attributes(element), {
|
||||||
|
'account_id': ('data-account', {str_or_none}),
|
||||||
|
'player_id': ('data-player', {lambda x: f'{x}_default'}, {str_or_none}),
|
||||||
|
'video_id': ('data-video-id', {str_or_none}),
|
||||||
|
})
|
||||||
|
account_id = attrs.get('account_id')
|
||||||
|
player_id = attrs.get('player_id')
|
||||||
|
video_id = attrs.get('video_id')
|
||||||
|
|
||||||
|
video_url = f'https://players.brightcove.net/{account_id}/{player_id}/index.html?videoId={video_id}'
|
||||||
|
video_url = smuggle_url(video_url, {'referrer': url})
|
||||||
|
return self.url_result(video_url, BrightcoveNewIE)
|
||||||
|
|
||||||
|
|
||||||
|
class AFLPodcastIE(InfoExtractor):
|
||||||
|
IE_NAME = 'afl:podcast'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?(?:afl|carltonfc)\.com.au/(?:aflw/)?podcasts/(?P<id>[\w-]+)'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.afl.com.au/podcasts/between-us',
|
||||||
|
'md5': '7000431c2bd3f96eddb5f63273aea83e',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'e0ab8454-f818-483f-bed1-b156002c021f',
|
||||||
|
'title': 'Between Us',
|
||||||
|
},
|
||||||
|
'playlist_mincount': 7,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.carltonfc.com.au/podcasts/walk-a-mile',
|
||||||
|
'md5': '',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '6dbb9b23-7f00-49d4-b44e-aec2017651dc',
|
||||||
|
'title': 'Walk a Mile in Their Shoes',
|
||||||
|
},
|
||||||
|
'playlist_mincount': 3,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.afl.com.au/podcasts/afl-daily',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.carltonfc.com.au/podcasts/summer-sessions',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
display_id = self._match_id(url)
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
element = get_element_by_class('omny-embed', webpage)
|
||||||
|
podcast_url = traverse_obj(extract_attributes(element), ('src', {url_or_none}))
|
||||||
|
return self.url_result(podcast_url, OmnyFMShowIE)
|
||||||
|
|
||||||
|
|
||||||
|
class AFCVideoIE(InfoExtractor):
|
||||||
|
IE_NAME = 'afc:video'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?afc\.com.au/video/(?P<id>\d+)'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.afc.com.au/video/1657583/girls-academies-be-a-pro?videoId=1657583&modal=true&type=video&publishFrom=1726548621001',
|
||||||
|
'md5': 'd0f4ec78b5a693d95c975ae3aeed8b2d',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '6362048189112',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'description': 'md5:5c43f1affe1a0cd8e2192358a49de9cc',
|
||||||
|
'upload_date': '20240917',
|
||||||
|
'duration': 50.48,
|
||||||
|
'tags': 'count:0',
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
'title': 'Girls Academies – ‘Be a Pro’',
|
||||||
|
'uploader_id': '6057984922001',
|
||||||
|
'timestamp': 1726548942,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.afc.com.au/video/1586280/se10ep16-the-crows-show?videoId=1586280&modal=true&type=video&publishFrom=1719639000001&tagNames=crowsshowepisode',
|
||||||
|
'md5': 'bd9984d62f87b4c2299bb62ffc869189',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '6355746458112',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'description': 'md5:4470d107af6e749a8225fd558b98b50b',
|
||||||
|
'upload_date': '20240627',
|
||||||
|
'duration': 1193.64,
|
||||||
|
'tags': 'count:0',
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
'title': 'SE10EP16 - The Crows Show',
|
||||||
|
'uploader_id': '6057984922001',
|
||||||
|
'timestamp': 1719466601,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.afc.com.au/video/1634706/jones-radiology-injury-update-r24?videoId=1634706&modal=true&type=video&publishFrom=1724126172001',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
display_id = self._match_id(url)
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
video_attrs = extract_attributes(get_element_html_by_id('VideoModal', webpage))
|
||||||
|
player_id = video_attrs['data-player-id'] + '_default'
|
||||||
|
account_id = video_attrs['data-account-id']
|
||||||
|
|
||||||
|
video_element_html = get_element_html_by_attribute('data-id', display_id, webpage)
|
||||||
|
if video_element_html is None:
|
||||||
|
data = self._download_json(f'https://aflapi.afc.com.au/content/aflc-adel/video/en/{display_id}', display_id)
|
||||||
|
video_id = traverse_obj(data, ('mediaId', {str_or_none}))
|
||||||
|
else:
|
||||||
|
video_id = self._search_regex(r'"mediaId"\s*:\s*"(\d+)"', video_element_html, 'video-id', fatal=False)
|
||||||
|
|
||||||
|
video_url = f'https://players.brightcove.net/{account_id}/{player_id}/index.html?videoId={video_id}'
|
||||||
|
video_url = smuggle_url(video_url, {'referrer': url})
|
||||||
|
return self.url_result(video_url, BrightcoveNewIE)
|
||||||
|
|
||||||
|
|
||||||
|
class CarltonFCVideoIE(InfoExtractor):
|
||||||
|
IE_NAME = 'carltonfc:video'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?carltonfc\.com.au/video/(?P<id>\d+)'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.carltonfc.com.au/video/1657596/cripps-on-taking-carlton-to-the-next-level?videoId=1657596&modal=true&type=video&publishFrom=1726555500001',
|
||||||
|
'md5': '67916ea9dd28376365184bb3869a1548',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '6362046715112',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'description': 'md5:02eeff6576fcd7c33e18e34b1b0ebf56',
|
||||||
|
'upload_date': '20240917',
|
||||||
|
'duration': 90.44,
|
||||||
|
'tags': 'count:0',
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
'title': 'Cripps on taking Carlton to the next level',
|
||||||
|
'uploader_id': '6057984922001',
|
||||||
|
'timestamp': 1726550622,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.carltonfc.com.au/video/1658173/the-rundown-impact-of-fans?videoId=1658173&modal=true&type=video&publishFrom=1726630922001',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
display_id = self._match_id(url)
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
video_tag = get_element_html_by_attribute('data-id', display_id, webpage)
|
||||||
|
video_id = self._search_regex(r'"mediaId"\s*:\s*"(\d+)"', video_tag, 'video-id')
|
||||||
|
video_attrs = extract_attributes(get_element_html_by_id('VideoModal', webpage))
|
||||||
|
player_id = video_attrs['data-player-id'] + '_default'
|
||||||
|
account_id = video_attrs['data-account-id']
|
||||||
|
|
||||||
|
video_url = f'https://players.brightcove.net/{account_id}/{player_id}/index.html?videoId={video_id}'
|
||||||
|
video_url = smuggle_url(video_url, {'referrer': url})
|
||||||
|
return self.url_result(video_url, BrightcoveNewIE)
|
||||||
64
yt_dlp/extractor/omnyfm.py
Normal file
64
yt_dlp/extractor/omnyfm.py
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
import functools
|
||||||
|
|
||||||
|
from .common import InfoExtractor
|
||||||
|
from ..utils import (
|
||||||
|
OnDemandPagedList,
|
||||||
|
clean_html,
|
||||||
|
float_or_none,
|
||||||
|
int_or_none,
|
||||||
|
str_or_none,
|
||||||
|
traverse_obj,
|
||||||
|
unified_strdate,
|
||||||
|
url_or_none,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class OmnyFMShowIE(InfoExtractor):
|
||||||
|
IE_NAME = 'omnyfm:show'
|
||||||
|
_VALID_URL = r'https?://omny\.fm/shows/(?P<id>[\w-]+)'
|
||||||
|
_EMBED_REGEX = [r'<iframe[^>]+?src=(?:["\'])(?P<url>https?://omny\.fm/shows/.+?)\1']
|
||||||
|
_PAGE_SIZE = 10
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://omny.fm/shows/league-leaders',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'bbe146d4-9bee-4763-b785-ad830009a23f',
|
||||||
|
'title': 'League Leaders with Nicole Livingstone',
|
||||||
|
},
|
||||||
|
'playlist_mincount': 15,
|
||||||
|
}, {
|
||||||
|
'url': 'https://omny.fm/shows/afl-daily',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _fetch_page(self, org_id, playlist_id, page):
|
||||||
|
return self._download_json(f'https://api.omny.fm/orgs/{org_id}/programs/{playlist_id}/clips?cursor={page}&pageSize={self._PAGE_SIZE}', f'{playlist_id}_{page}')
|
||||||
|
|
||||||
|
def _entries(self, org_id, playlist_id, first_page_data, page):
|
||||||
|
data = first_page_data if not page else self._fetch_page(org_id, playlist_id, page + 1)
|
||||||
|
for clip in data.get('Clips', {}):
|
||||||
|
yield traverse_obj(clip, {
|
||||||
|
'id': ('Id', {str_or_none}),
|
||||||
|
'title': ('Title', {str_or_none}),
|
||||||
|
'description': ('Description', {clean_html}),
|
||||||
|
'thumbnail': (('ImageUrl', 'ArtworkUrl'), {url_or_none}, any),
|
||||||
|
'duration': ('DurationSeconds', {float_or_none}),
|
||||||
|
'url': ('AudioUrl', {url_or_none}),
|
||||||
|
'season_number': ('Season', {int_or_none}),
|
||||||
|
'episode_number': ('Episode', {int_or_none}),
|
||||||
|
'timestamp': ('PublishedUtc', {unified_strdate}, {int_or_none}),
|
||||||
|
'filesize': ('PublishedAudioSizeInBytes', {int}),
|
||||||
|
})
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
display_id = self._match_id(url)
|
||||||
|
page_url = 'https://omny.fm/shows/' + display_id
|
||||||
|
webpage = self._download_webpage(page_url, display_id)
|
||||||
|
|
||||||
|
data = self._search_nextjs_data(webpage, display_id)
|
||||||
|
org_id = traverse_obj(data, ('props', 'pageProps', 'program', 'OrganizationId', {str_or_none}))
|
||||||
|
playlist_id = traverse_obj(data, ('props', 'pageProps', 'program', 'Id', {str_or_none}))
|
||||||
|
title = traverse_obj(data, ('props', 'pageProps', 'program', 'Name', {str_or_none}))
|
||||||
|
first_page_data = traverse_obj(data, ('props', 'pageProps', 'clips', {dict}))
|
||||||
|
|
||||||
|
entries = OnDemandPagedList(functools.partial(self._entries, org_id, playlist_id, first_page_data), self._PAGE_SIZE)
|
||||||
|
return self.playlist_result(entries, playlist_id, title)
|
||||||
Loading…
Reference in New Issue
Block a user