mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-24 18:30:43 +01:00
[thisav] Add support for html5 media (closes #11771)
This commit is contained in:
parent
f75caf059e
commit
a2e3286676
@ -10,6 +10,7 @@ from ..utils import remove_end
|
|||||||
class ThisAVIE(InfoExtractor):
|
class ThisAVIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?thisav\.com/video/(?P<id>[0-9]+)/.*'
|
_VALID_URL = r'https?://(?:www\.)?thisav\.com/video/(?P<id>[0-9]+)/.*'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
|
# jwplayer
|
||||||
'url': 'http://www.thisav.com/video/47734/%98%26sup1%3B%83%9E%83%82---just-fit.html',
|
'url': 'http://www.thisav.com/video/47734/%98%26sup1%3B%83%9E%83%82---just-fit.html',
|
||||||
'md5': '0480f1ef3932d901f0e0e719f188f19b',
|
'md5': '0480f1ef3932d901f0e0e719f188f19b',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -20,6 +21,7 @@ class ThisAVIE(InfoExtractor):
|
|||||||
'uploader_id': 'dj7970'
|
'uploader_id': 'dj7970'
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
|
# html5 media
|
||||||
'url': 'http://www.thisav.com/video/242352/nerdy-18yo-big-ass-tattoos-and-glasses.html',
|
'url': 'http://www.thisav.com/video/242352/nerdy-18yo-big-ass-tattoos-and-glasses.html',
|
||||||
'md5': 'ba90c076bd0f80203679e5b60bf523ee',
|
'md5': 'ba90c076bd0f80203679e5b60bf523ee',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -48,8 +50,12 @@ class ThisAVIE(InfoExtractor):
|
|||||||
}],
|
}],
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
info_dict = self._extract_jwplayer_data(
|
entries = self._parse_html5_media_entries(url, webpage, video_id)
|
||||||
webpage, video_id, require_title=False)
|
if entries:
|
||||||
|
info_dict = entries[0]
|
||||||
|
else:
|
||||||
|
info_dict = self._extract_jwplayer_data(
|
||||||
|
webpage, video_id, require_title=False)
|
||||||
uploader = self._html_search_regex(
|
uploader = self._html_search_regex(
|
||||||
r': <a href="http://www.thisav.com/user/[0-9]+/(?:[^"]+)">([^<]+)</a>',
|
r': <a href="http://www.thisav.com/user/[0-9]+/(?:[^"]+)">([^<]+)</a>',
|
||||||
webpage, 'uploader name', fatal=False)
|
webpage, 'uploader name', fatal=False)
|
||||||
|
Loading…
Reference in New Issue
Block a user