Cool_Tools/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-20 13:57:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

vod fix

Browse Source
This commit is contained in:
c-basalt 2024-08-08 17:14:42 -04:00
parent 7c97ead1b0
commit ee838b418c
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
yt_dlp/extractor/rplaylive.py
View File

@ -110,28 +110,29 @@ class RPlayVideoIE(RPlayBaseIE):
'release_timestamp': 1720846360, 'release_timestamp': 1720846360,
'release_date': '20240713', 'release_date': '20240713',
'duration': 5349.0, 'duration': 5349.0,
'thumbnail': r're:https://[\w\d]+.cloudfront.net/.*', 'thumbnail': 'https://pb.rplay.live/thumbnail/669203d25223214e67579dc3',
'uploader': '杏都める', 'uploader': '杏都める',
'uploader_id': '667adc9e9aa7f739a2158ff3', 'uploader_id': '667adc9e9aa7f739a2158ff3',
'tags': ['杏都める', 'めいどるーちぇ', '無料', '耳舐め', 'ASMR'], 'tags': ['杏都める', 'めいどるーちぇ', '無料', '耳舐め', 'ASMR'],
}, },
}, { }, {
'url': 'https://rplay.live/play/660bee4fd3c1d09d69db6870/', 'url': 'https://rplay.live/play/66783c65dcd1c768a8a69f24/',
'info_dict': { 'info_dict': {
'id': '660bee4fd3c1d09d69db6870', 'id': '66783c65dcd1c768a8a69f24',
'ext': 'mp4', 'ext': 'mp4',
'title': 'md5:7de162a0f1c2266ec428234620a124fc', 'title': 'md5:9be2febe48cee1b7536e3e9d4d5f8e56',
'description': 'md5:c6d12cc8110b748d5588d5f00787cd35', 'description': 'md5:a71374d3dcd1db0f852b96a69b41b699',
'timestamp': 1712057935, 'timestamp': 1719155813,
'upload_date': '20240402', 'upload_date': '20240623',
'release_timestamp': 1712061900, 'release_timestamp': 1719155813,
'release_date': '20240402', 'release_date': '20240623',
'duration': 6791.0, 'duration': 4237.0,
'thumbnail': r're:https://[\w\d]+.cloudfront.net/.*', 'thumbnail': 'https://pb.rplay.live/thumbnail/66783c65dcd1c768a8a69f24',
'uploader': '狐月れんげ', 'uploader': '狐月れんげ',
'uploader_id': '65eeb4b237043dc0b5654f86', 'uploader_id': '65eeb4b237043dc0b5654f86',
'tags': 'count:10', 'tags': 'count:4',
'age_limit': 18, 'age_limit': 18,
'live_status': 'was_live',
}, },
}] }]
@ -173,6 +174,7 @@ def _real_extract(self, url):
'uploader_id': ('creatorOid', {str}), 'uploader_id': ('creatorOid', {str}),
'tags': ('hashtags', lambda _, v: v[0] != '_'), 'tags': ('hashtags', lambda _, v: v[0] != '_'),
'age_limit': (('hideContent', 'isAdultContent'), {lambda x: 18 if x else None}, any), 'age_limit': (('hideContent', 'isAdultContent'), {lambda x: 18 if x else None}, any),
'live_status': ('isReplayContent', {lambda x: 'was_live' if x else None}),
}) })
m3u8_url = traverse_obj(video_info, ('canView', 'url', {url_or_none})) m3u8_url = traverse_obj(video_info, ('canView', 'url', {url_or_none}))
@ -185,17 +187,6 @@ def _real_extract(self, url):
msg += f'. {self._login_hint(method="password")}' msg += f'. {self._login_hint(method="password")}'
raise ExtractorError(msg, expected=True) raise ExtractorError(msg, expected=True)
thumbnail_key = traverse_obj(video_info, (
'streamables', lambda _, v: v['type'].startswith('image/'), 's3key', any))
if thumbnail_key:
metainfo['thumbnail'] = url_or_none(self._download_webpage(
'https://api.rplay.live/upload/privateasset', video_id, 'getting cover url', query={
'key': thumbnail_key,
'contentOid': video_id,
'creatorOid': metainfo.get('uploader_id'),
**self.requestor_query,
}, fatal=False))
formats = self._extract_m3u8_formats(m3u8_url, video_id, headers={ formats = self._extract_m3u8_formats(m3u8_url, video_id, headers={
'Referer': 'https://rplay.live/', 'Butter': self.get_butter_token()}) 'Referer': 'https://rplay.live/', 'Butter': self.get_butter_token()})
for fmt in formats: for fmt in formats:
@ -215,6 +206,7 @@ def _real_extract(self, url):
'id': video_id, 'id': video_id,
'formats': formats, 'formats': formats,
**metainfo, **metainfo,
'thumbnail': f'https://pb.rplay.live/thumbnail/{video_id}',
'http_headers': {'Referer': 'https://rplay.live/'}, 'http_headers': {'Referer': 'https://rplay.live/'},
} }