Cool_Tools/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-24 15:50:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149 from RobinD42/fix-subtitle-fallback

Browse Source 
fall-back to the old way to fetch subtitles, if needed
This commit is contained in:
Tom-Oliver Heidel 2020-11-11 00:08:18 +01:00 committed by GitHub
commit 7ee5015a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
youtube_dlc/extractor/viki.py
View File

@ -308,17 +308,26 @@ def _real_extract(self, url):
'url': thumbnail.get('url'), 'url': thumbnail.get('url'),
}) })
new_video = self._download_json(
'https://www.viki.com/api/videos/%s' % video_id, video_id,
'Downloading new video JSON to get subtitles', headers={'x-viki-app-ver': '2.2.5.1428709186'}, expected_status=[200, 400, 404])
subtitles = {} subtitles = {}
for sub in new_video.get('streamSubtitles').get('dash'): try:
subtitles[sub.get('srclang')] = [{ # New way to fetch subtitles
'ext': 'vtt', new_video = self._download_json(
'url': sub.get('src'), 'https://www.viki.com/api/videos/%s' % video_id, video_id,
'completion': sub.get('percentage'), 'Downloading new video JSON to get subtitles', headers={'x-viki-app-ver': '2.2.5.1428709186'}, expected_status=[200, 400, 404])
}] for sub in new_video.get('streamSubtitles').get('dash'):
subtitles[sub.get('srclang')] = [{
'ext': 'vtt',
'url': sub.get('src'),
'completion': sub.get('percentage'),
}]
except AttributeError:
# fall-back to the old way if there isn't a streamSubtitles attribute
for subtitle_lang, _ in video.get('subtitle_completions', {}).items():
subtitles[subtitle_lang] = [{
'ext': subtitles_format,
'url': self._prepare_call(
'videos/%s/subtitles/%s.%s' % (video_id, subtitle_lang, subtitles_format)),
} for subtitles_format in ('srt', 'vtt')]
result = { result = {
'id': video_id, 'id': video_id,