mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2026-01-26 06:48:05 +01:00
more fix
This commit is contained in:
parent
0ec79e981c
commit
0755d56546
1 changed files with 31 additions and 31 deletions
|
|
@ -14,28 +14,28 @@ from ..utils.traversal import (
|
|||
|
||||
class TVIPlayerIE(InfoExtractor):
|
||||
_VALID_URL = (
|
||||
r"https?://tviplayer\.iol\.pt(?:/programa/[\w-]+/[a-f0-9]+)?/\w+/(?P<id>\w+)"
|
||||
r'https?://tviplayer\.iol\.pt(?:/programa/[\w-]+/[a-f0-9]+)?/\w+/(?P<id>\w+)'
|
||||
)
|
||||
_TESTS = [
|
||||
{
|
||||
"url": "https://tviplayer.iol.pt/programa/a-protegida/67a63479d34ef72ee441fa79/episodio/t1e120",
|
||||
'url': 'https://tviplayer.iol.pt/programa/a-protegida/67a63479d34ef72ee441fa79/episodio/t1e120',
|
||||
"info_dict": {
|
||||
"id": "689683000cf20ac1d5f35341",
|
||||
"ext": "mp4",
|
||||
"duration": 1593,
|
||||
"title": "A Protegida - Clarice descobre o que une Óscar a Gonçalo e Mónica",
|
||||
"thumbnail": "https://img.iol.pt/image/id/68971037d34ef72ee44941a6/",
|
||||
"season_number": 1,
|
||||
'id': '689683000cf20ac1d5f35341',
|
||||
'ext': 'mp4',
|
||||
'duration': 1593,
|
||||
'title': 'A Protegida - Clarice descobre o que une Óscar a Gonçalo e Mónica',
|
||||
'thumbnail': 'https://img.iol.pt/image/id/68971037d34ef72ee44941a6/',
|
||||
'season_number': 1,
|
||||
},
|
||||
}
|
||||
},
|
||||
]
|
||||
|
||||
def _real_initialize(self):
|
||||
# Obtain the wmsAuthSign token (non-fatal)
|
||||
self.wms_auth_sign_token = self._download_webpage(
|
||||
"https://services.iol.pt/matrix?userId=",
|
||||
"wmsAuthSign",
|
||||
note="Downloading wmsAuthSign token",
|
||||
'https://services.iol.pt/matrix?userId=',
|
||||
'wmsAuthSign',
|
||||
note='Downloading wmsAuthSign token',
|
||||
fatal=False,
|
||||
)
|
||||
|
||||
|
|
@ -45,9 +45,9 @@ class TVIPlayerIE(InfoExtractor):
|
|||
|
||||
# Try to locate a JS "video: [ {...} ]" block
|
||||
json_data = self._search_json(
|
||||
r"(?<!-)\bvideo\s*:\s*\[",
|
||||
r'(?<!-)\bvideo\s*:\s*\[',
|
||||
webpage,
|
||||
"json_data",
|
||||
'json_data',
|
||||
video_id,
|
||||
transform_source=js_to_json,
|
||||
default={},
|
||||
|
|
@ -64,10 +64,10 @@ class TVIPlayerIE(InfoExtractor):
|
|||
return v
|
||||
return None
|
||||
|
||||
info_id = first_of("id")
|
||||
title = first_of("title") or self._og_search_title(webpage)
|
||||
thumbnail = first_of("cover", "thumbnail") or self._og_search_thumbnail(webpage)
|
||||
duration = first_of("duration")
|
||||
info_id = first_of('id')
|
||||
title = first_of('title') or self._og_search_title(webpage)
|
||||
thumbnail = first_of('cover', 'thumbnail') or self._og_search_thumbnail(webpage)
|
||||
duration = first_of('duration')
|
||||
|
||||
try:
|
||||
duration = int(duration) if duration is not None else None
|
||||
|
|
@ -77,7 +77,7 @@ class TVIPlayerIE(InfoExtractor):
|
|||
except Exception:
|
||||
duration = None
|
||||
|
||||
video_url = first_of("videoUrl", "url", "video_url")
|
||||
video_url = first_of('videoUrl', 'url', 'video_url')
|
||||
if not video_url:
|
||||
m = re.search(
|
||||
r'["\']videoUrl["\']\s*:\s*["\'](https?://[^"\']+)["\']', webpage
|
||||
|
|
@ -86,26 +86,26 @@ class TVIPlayerIE(InfoExtractor):
|
|||
video_url = m.group(1)
|
||||
|
||||
if not video_url:
|
||||
raise ExtractorError("Unable to locate video URL in webpage", expected=True)
|
||||
raise ExtractorError('Unable to locate video URL in webpage', expected=True)
|
||||
|
||||
query = (
|
||||
{"wmsAuthSign": self.wms_auth_sign_token}
|
||||
{'wmsAuthSign': self.wms_auth_sign_token}
|
||||
if self.wms_auth_sign_token
|
||||
else {}
|
||||
)
|
||||
formats, subtitles = self._extract_m3u8_formats_and_subtitles(
|
||||
video_url, video_id, ext="mp4", query=query, fatal=False
|
||||
video_url, video_id, ext='mp4', query=query, fatal=False
|
||||
)
|
||||
|
||||
season_number = traverse_obj(json_data, ("program", "seasonNum"))
|
||||
season_number = traverse_obj(json_data, ('program', 'seasonNum'))
|
||||
|
||||
return {
|
||||
"id": info_id or video_id,
|
||||
"display_id": video_id,
|
||||
"title": title,
|
||||
"thumbnail": thumbnail,
|
||||
"duration": duration,
|
||||
"formats": formats,
|
||||
"subtitles": subtitles,
|
||||
"season_number": season_number,
|
||||
'id': info_id or video_id,
|
||||
'display_id': video_id,
|
||||
'title': title,
|
||||
'thumbnail': thumbnail,
|
||||
'duration': duration,
|
||||
'formats': formats,
|
||||
'subtitles': subtitles,
|
||||
'season_number': season_number,
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue