mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-05-19 11:39:28 +00:00
Merge d5de6295cf into e0727e4ab6
This commit is contained in:
shouldsee
GitHub
commit
cf2f7ff6e8
|
|
@ -1,13 +1,9 @@
|
||||||
# coding: utf-8
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
determine_ext,
|
determine_ext,
|
||||||
ExtractorError,
|
|
||||||
float_or_none,
|
float_or_none,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
parse_iso8601,
|
parse_iso8601,
|
||||||
|
|
@ -16,219 +12,292 @@ from ..utils import (
|
||||||
|
|
||||||
|
|
||||||
class ToggleIE(InfoExtractor):
|
class ToggleIE(InfoExtractor):
|
||||||
IE_NAME = 'toggle'
|
IE_NAME = "toggle"
|
||||||
_VALID_URL = r'(?:https?://(?:(?:www\.)?mewatch|video\.toggle)\.sg/(?:en|zh)/(?:[^/]+/){2,}|toggle:)(?P<id>[0-9]+)'
|
_VALID_URL = r"(?:https?://(?:(?:www\.)?mewatch|video\.toggle)\.sg/(?:[^/]+/){1,}|toggle:)[^/]+-(?P<id>[0-9]+)"
|
||||||
_TESTS = [{
|
_TESTS = [
|
||||||
'url': 'http://www.mewatch.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115',
|
{
|
||||||
'info_dict': {
|
### to be updated
|
||||||
'id': '343115',
|
### deprecated
|
||||||
'ext': 'mp4',
|
# 'url': 'http://www.mewatch.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115',
|
||||||
'title': 'Lion Moms Premiere',
|
"info_dict": {
|
||||||
'description': 'md5:aea1149404bff4d7f7b6da11fafd8e6b',
|
"id": "343115",
|
||||||
'upload_date': '20150910',
|
"ext": "mp4",
|
||||||
'timestamp': 1441858274,
|
"title": "Lion Moms Premiere",
|
||||||
|
"description": "md5:aea1149404bff4d7f7b6da11fafd8e6b",
|
||||||
|
"upload_date": "20150910",
|
||||||
|
"timestamp": 1441858274,
|
||||||
|
},
|
||||||
|
"params": {
|
||||||
|
"skip_download": "m3u8 download",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'params': {
|
{
|
||||||
'skip_download': 'm3u8 download',
|
"note": "DRM-protected video",
|
||||||
}
|
### url deprecated
|
||||||
}, {
|
# 'url': 'http://www.mewatch.sg/en/movies/dug-s-special-mission/341413',
|
||||||
'note': 'DRM-protected video',
|
"info_dict": {
|
||||||
'url': 'http://www.mewatch.sg/en/movies/dug-s-special-mission/341413',
|
"id": "341413",
|
||||||
'info_dict': {
|
"ext": "wvm",
|
||||||
'id': '341413',
|
"title": "Dug's Special Mission",
|
||||||
'ext': 'wvm',
|
"description": "md5:e86c6f4458214905c1772398fabc93e0",
|
||||||
'title': 'Dug\'s Special Mission',
|
"upload_date": "20150827",
|
||||||
'description': 'md5:e86c6f4458214905c1772398fabc93e0',
|
"timestamp": 1440644006,
|
||||||
'upload_date': '20150827',
|
},
|
||||||
'timestamp': 1440644006,
|
"params": {
|
||||||
|
"skip_download": "DRM-protected wvm download",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'params': {
|
{
|
||||||
'skip_download': 'DRM-protected wvm download',
|
# this also tests correct video id extraction
|
||||||
}
|
"note": "m3u8 links are geo-restricted, but Android/mp4 is okay",
|
||||||
}, {
|
### url deprecated
|
||||||
# this also tests correct video id extraction
|
# 'url': 'http://www.mewatch.sg/en/series/28th-sea-games-5-show/28th-sea-games-5-show-ep11/332861',
|
||||||
'note': 'm3u8 links are geo-restricted, but Android/mp4 is okay',
|
"info_dict": {
|
||||||
'url': 'http://www.mewatch.sg/en/series/28th-sea-games-5-show/28th-sea-games-5-show-ep11/332861',
|
"id": "332861",
|
||||||
'info_dict': {
|
"ext": "mp4",
|
||||||
'id': '332861',
|
"title": "28th SEA Games (5 Show) - Episode 11",
|
||||||
'ext': 'mp4',
|
"description": "md5:3cd4f5f56c7c3b1340c50a863f896faa",
|
||||||
'title': '28th SEA Games (5 Show) - Episode 11',
|
"upload_date": "20150605",
|
||||||
'description': 'md5:3cd4f5f56c7c3b1340c50a863f896faa',
|
"timestamp": 1433480166,
|
||||||
'upload_date': '20150605',
|
},
|
||||||
'timestamp': 1433480166,
|
"params": {
|
||||||
|
"skip_download": "DRM-protected wvm download",
|
||||||
|
},
|
||||||
|
"skip": "m3u8 links are geo-restricted",
|
||||||
},
|
},
|
||||||
'params': {
|
{
|
||||||
'skip_download': 'DRM-protected wvm download',
|
### video.toggle.sg seems deprecated
|
||||||
|
# 'url': 'http://video.toggle.sg/en/clips/seraph-sun-aloysius-will-suddenly-sing-some-old-songs-in-high-pitch-on-set/343331',
|
||||||
|
"only_matching": True,
|
||||||
},
|
},
|
||||||
'skip': 'm3u8 links are geo-restricted'
|
{
|
||||||
}, {
|
"url": "https://www.mewatch.sg/clips/Seraph-Sun-Aloysius-will-suddenly-sing-some-old-songs-in-high-pitch-on-set-84901",
|
||||||
'url': 'http://video.toggle.sg/en/clips/seraph-sun-aloysius-will-suddenly-sing-some-old-songs-in-high-pitch-on-set/343331',
|
"only_matching": True,
|
||||||
'only_matching': True,
|
},
|
||||||
}, {
|
{
|
||||||
'url': 'http://www.mewatch.sg/en/clips/seraph-sun-aloysius-will-suddenly-sing-some-old-songs-in-high-pitch-on-set/343331',
|
"url": "https://www.mewatch.sg/episode/Zero-Calling-S2-E13-The-End-of-The-Beginning-55137",
|
||||||
'only_matching': True,
|
"only_matching": True,
|
||||||
}, {
|
},
|
||||||
'url': 'http://www.mewatch.sg/zh/series/zero-calling-s2-hd/ep13/336367',
|
{
|
||||||
'only_matching': True,
|
### webisodes no longer used
|
||||||
}, {
|
"url": "https://www.mewatch.sg/clips/Jeeva-is-an-orphan-Vetri-S2-Webisode-7-84944",
|
||||||
'url': 'http://www.mewatch.sg/en/series/vetri-s2/webisodes/jeeva-is-an-orphan-vetri-s2-webisode-7/342302',
|
# 'url': 'http://www.mewatch.sg/en/series/vetri-s2/webisodes/jeeva-is-an-orphan-vetri-s2-webisode-7/342302',
|
||||||
'only_matching': True,
|
"only_matching": True,
|
||||||
}, {
|
},
|
||||||
'url': 'http://www.mewatch.sg/en/movies/seven-days/321936',
|
{
|
||||||
'only_matching': True,
|
### only available in Singapore 403 forbidden
|
||||||
}, {
|
"url": "https://www.mewatch.sg/movie/Seven-Days-79641",
|
||||||
'url': 'https://www.mewatch.sg/en/tv-show/news/may-2017-cna-singapore-tonight/fri-19-may-2017/512456',
|
"only_matching": True,
|
||||||
'only_matching': True,
|
},
|
||||||
}, {
|
{
|
||||||
'url': 'http://www.mewatch.sg/en/channels/eleven-plus/401585',
|
### not working for this list, but not a big issue since old path deprecated
|
||||||
'only_matching': True,
|
"url": "https://www.mewatch.sg/list/CNA-Singapore-Tonight-154904",
|
||||||
}]
|
# 'url': 'https://www.mewatch.sg/en/tv-show/news/may-2017-cna-singapore-tonight/fri-19-may-2017/512456',
|
||||||
|
"only_matching": True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
### not working. seems deprecated
|
||||||
|
# 'url': 'http://www.mewatch.sg/en/channels/eleven-plus/401585',
|
||||||
|
"only_matching": True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
### [20230507:shouldsee] working
|
||||||
|
"url": "https://www.mewatch.sg/watch/Seraph-Sun-Aloysius-will-suddenly-sing-some-old-songs-in-high-pitch-on-set-84901",
|
||||||
|
"only_matching": True,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
_API_USER = 'tvpapi_147'
|
_API_USER = "tvpapi_147"
|
||||||
_API_PASS = '11111'
|
_API_PASS = "11111"
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
|
|
||||||
|
lang = "en"
|
||||||
params = {
|
params = {
|
||||||
'initObj': {
|
"delivery": "stream,progressive",
|
||||||
'Locale': {
|
"resolution": "External",
|
||||||
'LocaleLanguage': '',
|
"segments": "all",
|
||||||
'LocaleCountry': '',
|
"lang": lang,
|
||||||
'LocaleDevice': '',
|
"ff": "idp,ldp,rpt,cd",
|
||||||
'LocaleUserState': 0
|
|
||||||
},
|
|
||||||
'Platform': 0,
|
|
||||||
'SiteGuid': 0,
|
|
||||||
'DomainID': '0',
|
|
||||||
'UDID': '',
|
|
||||||
'ApiUser': self._API_USER,
|
|
||||||
'ApiPass': self._API_PASS
|
|
||||||
},
|
|
||||||
'MediaID': video_id,
|
|
||||||
'mediaType': 0,
|
|
||||||
}
|
}
|
||||||
|
video_info = self._download_json(
|
||||||
|
"https://cdn.mewatch.sg/api/items/" + video_id + "/videos",
|
||||||
|
video_id,
|
||||||
|
"Downloading video info json",
|
||||||
|
query=params,
|
||||||
|
)
|
||||||
|
|
||||||
info = self._download_json(
|
params = {
|
||||||
'http://tvpapi.as.tvinci.com/v2_9/gateways/jsonpostgw.aspx?m=GetMediaInfo',
|
# 'delivery':'stream,progressive',
|
||||||
video_id, 'Downloading video info json', data=json.dumps(params).encode('utf-8'))
|
# 'resolution':'External',
|
||||||
|
"segments": "all",
|
||||||
|
"lang": lang,
|
||||||
|
"ff": "idp,ldp,rpt,cd",
|
||||||
|
}
|
||||||
|
meta_info = self._download_json(
|
||||||
|
"https://cdn.mewatch.sg/api/items/" + video_id,
|
||||||
|
video_id,
|
||||||
|
"Downloading video info json",
|
||||||
|
query=params,
|
||||||
|
)
|
||||||
|
|
||||||
title = info['MediaName']
|
# urls = info
|
||||||
|
info = {"Files": video_info}
|
||||||
|
info.update(meta_info)
|
||||||
|
|
||||||
|
title = info["path"].rsplit("/", 1)[-1]
|
||||||
formats = []
|
formats = []
|
||||||
for video_file in info.get('Files', []):
|
|
||||||
video_url, vid_format = video_file.get('URL'), video_file.get('Format')
|
for video_file in info.get("Files", []):
|
||||||
if not video_url or video_url == 'NA' or not vid_format:
|
video_url, vid_format = video_file.get("url"), video_file.get("format")
|
||||||
|
if not video_url or video_url == "NA" or not vid_format:
|
||||||
continue
|
continue
|
||||||
ext = determine_ext(video_url)
|
ext = determine_ext(video_url)
|
||||||
vid_format = vid_format.replace(' ', '')
|
vid_format = vid_format.replace(" ", "")
|
||||||
# if geo-restricted, m3u8 is inaccessible, but mp4 is okay
|
# if geo-restricted, m3u8 is inaccessible, but mp4 is okay
|
||||||
if ext == 'm3u8':
|
if ext == "m3u8":
|
||||||
m3u8_formats = self._extract_m3u8_formats(
|
m3u8_formats = self._extract_m3u8_formats(
|
||||||
video_url, video_id, ext='mp4', m3u8_id=vid_format,
|
video_url,
|
||||||
note='Downloading %s m3u8 information' % vid_format,
|
video_id,
|
||||||
errnote='Failed to download %s m3u8 information' % vid_format,
|
ext="mp4",
|
||||||
fatal=False)
|
m3u8_id=vid_format,
|
||||||
|
note="Downloading %s m3u8 information" % vid_format,
|
||||||
|
errnote="Failed to download %s m3u8 information" % vid_format,
|
||||||
|
fatal=False,
|
||||||
|
)
|
||||||
for f in m3u8_formats:
|
for f in m3u8_formats:
|
||||||
# Apple FairPlay Streaming
|
# Apple FairPlay Streaming
|
||||||
if '/fpshls/' in f['url']:
|
if "/fpshls/" in f["url"]:
|
||||||
continue
|
continue
|
||||||
formats.append(f)
|
formats.append(f)
|
||||||
elif ext == 'mpd':
|
elif ext == "mpd":
|
||||||
formats.extend(self._extract_mpd_formats(
|
formats.extend(
|
||||||
video_url, video_id, mpd_id=vid_format,
|
self._extract_mpd_formats(
|
||||||
note='Downloading %s MPD manifest' % vid_format,
|
video_url,
|
||||||
errnote='Failed to download %s MPD manifest' % vid_format,
|
video_id,
|
||||||
fatal=False))
|
mpd_id=vid_format,
|
||||||
elif ext == 'ism':
|
note="Downloading %s MPD manifest" % vid_format,
|
||||||
formats.extend(self._extract_ism_formats(
|
errnote="Failed to download %s MPD manifest" % vid_format,
|
||||||
video_url, video_id, ism_id=vid_format,
|
fatal=False,
|
||||||
note='Downloading %s ISM manifest' % vid_format,
|
)
|
||||||
errnote='Failed to download %s ISM manifest' % vid_format,
|
)
|
||||||
fatal=False))
|
elif ext == "ism":
|
||||||
elif ext == 'mp4':
|
formats.extend(
|
||||||
formats.append({
|
self._extract_ism_formats(
|
||||||
'ext': ext,
|
video_url,
|
||||||
'url': video_url,
|
video_id,
|
||||||
'format_id': vid_format,
|
ism_id=vid_format,
|
||||||
})
|
note="Downloading %s ISM manifest" % vid_format,
|
||||||
|
errnote="Failed to download %s ISM manifest" % vid_format,
|
||||||
|
fatal=False,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
elif ext == "mp4":
|
||||||
|
formats.append(
|
||||||
|
{
|
||||||
|
"ext": ext,
|
||||||
|
"url": video_url,
|
||||||
|
"format_id": vid_format,
|
||||||
|
}
|
||||||
|
)
|
||||||
if not formats:
|
if not formats:
|
||||||
for meta in (info.get('Metas') or []):
|
for meta in info.get("Metas") or []:
|
||||||
if meta.get('Key') == 'Encryption' and meta.get('Value') == '1':
|
if (
|
||||||
raise ExtractorError(
|
not self.get_param("allow_unplayable_formats")
|
||||||
'This video is DRM protected.', expected=True)
|
and meta.get("Key") == "Encryption"
|
||||||
# Most likely because geo-blocked
|
and meta.get("Value") == "1"
|
||||||
raise ExtractorError('No downloadable videos found', expected=True)
|
):
|
||||||
self._sort_formats(formats)
|
self.report_drm(video_id)
|
||||||
|
# Most likely because geo-blocked if no formats and no DRM
|
||||||
|
|
||||||
thumbnails = []
|
thumbnails = []
|
||||||
for picture in info.get('Pictures', []):
|
for picture in info.get("images", []):
|
||||||
if not isinstance(picture, dict):
|
if not isinstance(picture, dict):
|
||||||
continue
|
continue
|
||||||
pic_url = picture.get('URL')
|
pic_url = picture.get("tile")
|
||||||
if not pic_url:
|
if not pic_url:
|
||||||
continue
|
continue
|
||||||
thumbnail = {
|
thumbnail = {
|
||||||
'url': pic_url,
|
"url": pic_url,
|
||||||
}
|
}
|
||||||
pic_size = picture.get('PicSize', '')
|
pic_size = picture.get("PicSize", "")
|
||||||
m = re.search(r'(?P<width>\d+)[xX](?P<height>\d+)', pic_size)
|
m = re.search(r"(?P<width>\d+)[xX](?P<height>\d+)", pic_size)
|
||||||
if m:
|
if m:
|
||||||
thumbnail.update({
|
thumbnail.update(
|
||||||
'width': int(m.group('width')),
|
{
|
||||||
'height': int(m.group('height')),
|
"width": int(m.group("width")),
|
||||||
})
|
"height": int(m.group("height")),
|
||||||
|
}
|
||||||
|
)
|
||||||
thumbnails.append(thumbnail)
|
thumbnails.append(thumbnail)
|
||||||
|
|
||||||
def counter(prefix):
|
def counter(prefix):
|
||||||
return int_or_none(
|
return int_or_none(
|
||||||
info.get(prefix + 'Counter') or info.get(prefix.lower() + '_counter'))
|
info.get(prefix + "Counter") or info.get(prefix.lower() + "_counter")
|
||||||
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
"id": video_id,
|
||||||
'title': title,
|
"title": title,
|
||||||
'description': strip_or_none(info.get('Description')),
|
"description": strip_or_none(info.get("Description")),
|
||||||
'duration': int_or_none(info.get('Duration')),
|
"duration": int_or_none(info.get("Duration")),
|
||||||
'timestamp': parse_iso8601(info.get('CreationDate') or None),
|
"timestamp": parse_iso8601(info.get("CreationDate") or None),
|
||||||
'average_rating': float_or_none(info.get('Rating')),
|
"average_rating": float_or_none(info.get("Rating")),
|
||||||
'view_count': counter('View'),
|
"view_count": counter("View"),
|
||||||
'like_count': counter('Like'),
|
"like_count": counter("Like"),
|
||||||
'thumbnails': thumbnails,
|
"thumbnails": thumbnails,
|
||||||
'formats': formats,
|
"formats": formats,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class MeWatchIE(InfoExtractor):
|
class MeWatchIE(InfoExtractor):
|
||||||
IE_NAME = 'mewatch'
|
IE_NAME = "mewatch"
|
||||||
_VALID_URL = r'https?://(?:(?:www|live)\.)?mewatch\.sg/watch/[^/?#&]+-(?P<id>[0-9]+)'
|
_VALID_URL = (
|
||||||
_TESTS = [{
|
r"https?://(?:(?:www|live)\.)?mewatch\.sg/watch/[^/?#&]+-(?P<id>[0-9]+)"
|
||||||
'url': 'https://www.mewatch.sg/watch/Recipe-Of-Life-E1-179371',
|
)
|
||||||
'info_dict': {
|
_TESTS = [
|
||||||
'id': '1008625',
|
{
|
||||||
'ext': 'mp4',
|
"url": "https://www.mewatch.sg/watch/Recipe-Of-Life-E1-179371",
|
||||||
'title': 'Recipe Of Life 味之道',
|
"info_dict": {
|
||||||
'timestamp': 1603306526,
|
"id": "1008625",
|
||||||
'description': 'md5:6e88cde8af2068444fc8e1bc3ebf257c',
|
"ext": "mp4",
|
||||||
'upload_date': '20201021',
|
"title": "Recipe Of Life 味之道",
|
||||||
|
"timestamp": 1603306526,
|
||||||
|
"description": "md5:6e88cde8af2068444fc8e1bc3ebf257c",
|
||||||
|
"upload_date": "20201021",
|
||||||
|
},
|
||||||
|
"params": {
|
||||||
|
"skip_download": "m3u8 download",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'params': {
|
{
|
||||||
'skip_download': 'm3u8 download',
|
"url": "https://www.mewatch.sg/watch/Little-Red-Dot-Detectives-S2-搜密。打卡。小红点-S2-E1-176232",
|
||||||
|
"only_matching": True,
|
||||||
},
|
},
|
||||||
}, {
|
{
|
||||||
'url': 'https://www.mewatch.sg/watch/Little-Red-Dot-Detectives-S2-搜密。打卡。小红点-S2-E1-176232',
|
"url": "https://www.mewatch.sg/watch/Little-Red-Dot-Detectives-S2-%E6%90%9C%E5%AF%86%E3%80%82%E6%89%93%E5%8D%A1%E3%80%82%E5%B0%8F%E7%BA%A2%E7%82%B9-S2-E1-176232",
|
||||||
'only_matching': True,
|
"only_matching": True,
|
||||||
}, {
|
},
|
||||||
'url': 'https://www.mewatch.sg/watch/Little-Red-Dot-Detectives-S2-%E6%90%9C%E5%AF%86%E3%80%82%E6%89%93%E5%8D%A1%E3%80%82%E5%B0%8F%E7%BA%A2%E7%82%B9-S2-E1-176232',
|
{
|
||||||
'only_matching': True,
|
"url": "https://live.mewatch.sg/watch/Recipe-Of-Life-E41-189759",
|
||||||
}, {
|
"only_matching": True,
|
||||||
'url': 'https://live.mewatch.sg/watch/Recipe-Of-Life-E41-189759',
|
},
|
||||||
'only_matching': True,
|
]
|
||||||
}]
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
item_id = self._match_id(url)
|
item_id = self._match_id(url)
|
||||||
custom_id = self._download_json(
|
return self.url_result("toggle:" + item_id, ToggleIE.ie_key(), item_id)
|
||||||
'https://cdn.mewatch.sg/api/items/' + item_id,
|
|
||||||
item_id, query={'segments': 'all'})['customId']
|
print(f"[debug]{item_id}")
|
||||||
return self.url_result(
|
xdata = self._download_json(
|
||||||
'toggle:' + custom_id, ToggleIE.ie_key(), custom_id)
|
"https://cdn.mewatch.sg/api/items/" + item_id,
|
||||||
|
item_id,
|
||||||
|
query={"segments": "all", "lang": "en", "ff": "idp,ldp,rpt,cd"},
|
||||||
|
)
|
||||||
|
from pprint import pprint
|
||||||
|
|
||||||
|
pprint(xdata)
|
||||||
|
custom_id = xdata["customId"]
|
||||||
|
print(f"[debug]{custom_id}")
|
||||||
|
return self.url_result("toggle:" + custom_id, ToggleIE.ie_key(), custom_id)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue