mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki 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
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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': {
@@ -47,6 +49,10 @@ class ThisAVIE(InfoExtractor):
'url': video_url, 'url': video_url,
}], }],
} }
else:
entries = self._parse_html5_media_entries(url, webpage, video_id)
if entries:
info_dict = entries[0]
else: else:
info_dict = self._extract_jwplayer_data( info_dict = self._extract_jwplayer_data(
webpage, video_id, require_title=False) webpage, video_id, require_title=False)