[viki] Fix "Bad request" for manifest (#2540)

Closes #2499
Authored by: nyuszika7h
This commit is contained in:
nyuszika7h 2022-01-31 15:52:42 +01:00 committed by GitHub
parent f8580bf02f
commit 1c6f480160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,7 +19,7 @@ class VikiBaseIE(InfoExtractor):
_VALID_URL_BASE = r'https?://(?:www\.)?viki\.(?:com|net|mx|jp|fr)/' _VALID_URL_BASE = r'https?://(?:www\.)?viki\.(?:com|net|mx|jp|fr)/'
_API_URL_TEMPLATE = 'https://api.viki.io%s' _API_URL_TEMPLATE = 'https://api.viki.io%s'
_DEVICE_ID = '86085977d' # used for android api _DEVICE_ID = '112395910d'
_APP = '100005a' _APP = '100005a'
_APP_VERSION = '6.11.3' _APP_VERSION = '6.11.3'
_APP_SECRET = 'd96704b180208dbb2efa30fe44c48bd8690441af9f567ba8fd710a72badc85198f7472' _APP_SECRET = 'd96704b180208dbb2efa30fe44c48bd8690441af9f567ba8fd710a72badc85198f7472'
@ -253,7 +253,7 @@ def _real_extract(self, url):
} for thumbnail_id, thumbnail in (video.get('images') or {}).items() if thumbnail.get('url')] } for thumbnail_id, thumbnail in (video.get('images') or {}).items() if thumbnail.get('url')]
resp = self._call_api( resp = self._call_api(
'playback_streams/%s.json?drms=dt1,dt2&device_id=%s' % (video_id, self._DEVICE_ID), 'playback_streams/%s.json?drms=dt3&device_id=%s' % (video_id, self._DEVICE_ID),
video_id, 'Downloading video streams JSON')['main'][0] video_id, 'Downloading video streams JSON')['main'][0]
stream_id = try_get(resp, lambda x: x['properties']['track']['stream_id']) stream_id = try_get(resp, lambda x: x['properties']['track']['stream_id'])
@ -264,10 +264,13 @@ def _real_extract(self, url):
} for ext in ('srt', 'vtt')]) for lang in (video.get('subtitle_completions') or {}).keys()) } for ext in ('srt', 'vtt')]) for lang in (video.get('subtitle_completions') or {}).keys())
mpd_url = resp['url'] mpd_url = resp['url']
# 1080p is hidden in another mpd which can be found in the current manifest content # 720p is hidden in another MPD which can be found in the current manifest content
mpd_content = self._download_webpage(mpd_url, video_id, note='Downloading initial MPD manifest') mpd_content = self._download_webpage(mpd_url, video_id, note='Downloading initial MPD manifest')
mpd_url = self._search_regex( mpd_url = self._search_regex(
r'(?mi)<BaseURL>(http.+.mpd)', mpd_content, 'new manifest', default=mpd_url) r'(?mi)<BaseURL>(http.+.mpd)', mpd_content, 'new manifest', default=mpd_url)
if 'mpdhd_high' not in mpd_url:
# Modify the URL to get 1080p
mpd_url = mpd_url.replace('mpdhd', 'mpdhd_high')
formats = self._extract_mpd_formats(mpd_url, video_id) formats = self._extract_mpd_formats(mpd_url, video_id)
self._sort_formats(formats) self._sort_formats(formats)