mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-12 02:11:26 +01:00
Compare commits
2 Commits
9929037adb
...
23cee710df
Author | SHA1 | Date | |
---|---|---|---|
|
23cee710df | ||
|
0932a527e9 |
|
@ -8,9 +8,9 @@ from ..utils.traversal import traverse_obj
|
||||||
|
|
||||||
|
|
||||||
class VidlyIE(InfoExtractor):
|
class VidlyIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:vid\.ly/|(?:s\.)?vid\.ly/embeded.html\?(?:[^#/]+&)?link=)(?P<id>\w+)'
|
_VALID_URL = r'https?://(?:vid\.ly/|(?:s\.)?vid\.ly/embeded\.html\?(?:[^#]+&)?link=)(?P<id>\w+)'
|
||||||
_EMBED_REGEX = [r'<script[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//vid\.ly/\w+/embed[^\'"]+)',
|
_EMBED_REGEX = [r'<script[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//vid\.ly/\w+/embed[^\'"]+)',
|
||||||
r'<iframe[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//(?:s\.)?vid\.ly/embeded.html\?(?:[^#/]+&)?link=\w+[^\'"]+)']
|
r'<iframe[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//(?:s\.)?vid\.ly/embeded\.html\?(?:[^#\'"]+&)?link=\w+[^\'"]+)']
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
# JWPlayer 7, Embeds forbidden
|
# JWPlayer 7, Embeds forbidden
|
||||||
'url': 'https://vid.ly/2i3o9j/embed',
|
'url': 'https://vid.ly/2i3o9j/embed',
|
||||||
|
@ -55,31 +55,29 @@ class VidlyIE(InfoExtractor):
|
||||||
f'https://vid.ly/{video_id}/embed', video_id, headers={'Referer': 'https://vid.ly/'})
|
f'https://vid.ly/{video_id}/embed', video_id, headers={'Referer': 'https://vid.ly/'})
|
||||||
player = self._search_json(r'initCallback\(', embed_script, 'player', video_id)
|
player = self._search_json(r'initCallback\(', embed_script, 'player', video_id)
|
||||||
|
|
||||||
if player['player'].startswith('jwplayer'):
|
player_type = player.get('player') or ''
|
||||||
|
if player_type.startswith('jwplayer'):
|
||||||
return self._parse_jwplayer_data(player['config'], video_id)
|
return self._parse_jwplayer_data(player['config'], video_id)
|
||||||
elif player['player'] == 'vidlyplayer':
|
elif not player_type.startswith('vidly'):
|
||||||
|
raise ExtractorError(f'Unknown player type {player_type!r}')
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
ext = mimetype2ext(traverse_obj(player, ('config', 'type')))
|
ext = mimetype2ext(traverse_obj(player, ('config', 'type')))
|
||||||
if traverse_obj(player, ('config', 'source', {url_or_none})):
|
for source, fid in [('source', 'sd'), ('source_hd', 'hd')]:
|
||||||
|
if traverse_obj(player, ('config', source, {url_or_none})):
|
||||||
formats.append({
|
formats.append({
|
||||||
'url': player['config']['source'],
|
'url': player['config'][source],
|
||||||
'format_id': 'http-sd',
|
'format_id': f'http-{fid}',
|
||||||
'ext': ext,
|
|
||||||
})
|
|
||||||
if traverse_obj(player, ('config', 'source_hd', {url_or_none})):
|
|
||||||
formats.append({
|
|
||||||
'url': player['config']['source_hd'],
|
|
||||||
'format_id': 'http-hd',
|
|
||||||
'ext': ext,
|
'ext': ext,
|
||||||
})
|
})
|
||||||
# Has higher quality formats
|
# Has higher quality formats
|
||||||
formats.extend(self._extract_m3u8_formats(
|
formats.extend(self._extract_m3u8_formats(
|
||||||
f'https://d3fenhwk93s16g.cloudfront.net/{video_id}/hls.m3u8', video_id,
|
f'https://d3fenhwk93s16g.cloudfront.net/{video_id}/hls.m3u8', video_id,
|
||||||
fatal=False, note='Trying to guess m3u8 URL') or [])
|
fatal=False, note='Requesting higher quality m3u8 formats',
|
||||||
|
errnote='No higher quality m3u8 formats found') or [])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': video_id,
|
'title': video_id,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
}
|
}
|
||||||
else:
|
|
||||||
raise ExtractorError('Unknown player type')
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user