This commit is contained in:
Elan Ruusamäe 2024-11-20 15:24:39 +00:00 committed by GitHub
commit c2261912b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -8,12 +8,14 @@
str_or_none, str_or_none,
try_call, try_call,
unified_timestamp, unified_timestamp,
update_url_query,
) )
from ..utils.traversal import traverse_obj from ..utils.traversal import traverse_obj
class DuoplayIE(InfoExtractor): class DuoplayIE(InfoExtractor):
_VALID_URL = r'https?://duoplay\.ee/(?P<id>\d+)/[\w-]+/?(?:\?(?:[^#]+&)?ep=(?P<ep>\d+))?' # https://duoplay.ee/9644?ep=185
_VALID_URL = r'https?://duoplay\.ee/(?P<id>\d+)(?:/[\w-]+/?(?:\?(?:[^#]+&))?ep=(?P<ep>\d+))?'
_TESTS = [{ _TESTS = [{
'note': 'Siberi võmm S02E12', 'note': 'Siberi võmm S02E12',
'url': 'https://duoplay.ee/4312/siberi-vomm?ep=24', 'url': 'https://duoplay.ee/4312/siberi-vomm?ep=24',
@ -79,11 +81,20 @@ def _real_extract(self, url):
if not video_player or not video_player.get('manifest-url'): if not video_player or not video_player.get('manifest-url'):
raise ExtractorError('No video found', expected=True) raise ExtractorError('No video found', expected=True)
manifest_url = video_player['manifest-url']
session_token = self._download_json(
'https://sts.postimees.ee/session/register', video_id, 'Registering session',
'Unable to register session', headers={
'Accept': 'application/json',
'X-Original-URI': manifest_url,
})['session']
manifest_url = update_url_query(manifest_url, {'s': session_token})
episode_attr = self._parse_json(video_player.get(':episode') or '', video_id, fatal=False) or {} episode_attr = self._parse_json(video_player.get(':episode') or '', video_id, fatal=False) or {}
return { return {
'id': video_id, 'id': video_id,
'formats': self._extract_m3u8_formats(video_player['manifest-url'], video_id, 'mp4'), 'formats': self._extract_m3u8_formats(manifest_url, video_id, 'mp4'),
**traverse_obj(episode_attr, { **traverse_obj(episode_attr, {
'title': 'title', 'title': 'title',
'description': 'synopsis', 'description': 'synopsis',