github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[vvvvid] skip unplayable episodes and extract akamai formats(closes #27599)

Browse source
This commit is contained in:
Remita Amine 2020-12-31 12:04:35 +01:00
parent 2f56caf083
commit c35bc82606
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/extractor/vvvvid.py
View file

@ -152,7 +152,6 @@ class VVVVIDIE(InfoExtractor):
embed_code = ds(embed_code) embed_code = ds(embed_code)
video_type = video_data.get('video_type') video_type = video_data.get('video_type')
if video_type in ('video/rcs', 'video/kenc'): if video_type in ('video/rcs', 'video/kenc'):
embed_code = re.sub(r'https?://([^/]+)/z/', r'https://\1/i/', embed_code).replace('/manifest.f4m', '/master.m3u8')
if video_type == 'video/kenc': if video_type == 'video/kenc':
kenc = self._download_json( kenc = self._download_json(
'https://www.vvvvid.it/kenc', video_id, query={ 'https://www.vvvvid.it/kenc', video_id, query={
@ -163,9 +162,7 @@ class VVVVIDIE(InfoExtractor):
kenc_message = kenc.get('message') kenc_message = kenc.get('message')
if kenc_message: if kenc_message:
embed_code += '?' + ds(kenc_message) embed_code += '?' + ds(kenc_message)
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_akamai_formats(embed_code, video_id))
embed_code, video_id, 'mp4',
m3u8_id='hls', fatal=False))
else: else:
formats.extend(self._extract_wowza_formats( formats.extend(self._extract_wowza_formats(
'http://sb.top-ix.org/videomg/_definst_/mp4:%s/playlist.m3u8' % embed_code, video_id)) 'http://sb.top-ix.org/videomg/_definst_/mp4:%s/playlist.m3u8' % embed_code, video_id))
@ -217,6 +214,8 @@ class VVVVIDShowIE(VVVVIDIE):
season_number = int_or_none(season.get('number')) season_number = int_or_none(season.get('number'))
episodes = season.get('episodes') or [] episodes = season.get('episodes') or []
for episode in episodes: for episode in episodes:
if episode.get('playable') is False:
continue
season_id = str_or_none(episode.get('season_id')) season_id = str_or_none(episode.get('season_id'))
video_id = str_or_none(episode.get('video_id')) video_id = str_or_none(episode.get('video_id'))
if not (season_id and video_id): if not (season_id and video_id):