lopar/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-10 19:37:25 +00:00
Code Releases Activity

[thisav] Add support for html5 media (closes #11771)

Browse Source
This commit is contained in:
Sergey M․ 2017-02-18 20:21:37 +07:00
parent f75caf059e
commit a2e3286676
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/thisav.py
View File

@ -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)