mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-25 11:41:52 +00:00
[wshh] Extract html5 entries and delegate to generic extractor (closes #12676)
This commit is contained in:
parent
4c03973296
commit
f8f2da25ab
1 changed files with 11 additions and 35 deletions
|
@ -1,12 +1,10 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
|
||||||
|
|
||||||
class WorldStarHipHopIE(InfoExtractor):
|
class WorldStarHipHopIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/(?:videos|android)/video\.php\?v=(?P<id>.*)'
|
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/(?:videos|android)/video\.php\?.*?\bv=(?P<id>[^&]+)'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO',
|
'url': 'http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO',
|
||||||
'md5': '9d04de741161603bf7071bbf4e883186',
|
'md5': '9d04de741161603bf7071bbf4e883186',
|
||||||
|
@ -17,48 +15,26 @@ class WorldStarHipHopIE(InfoExtractor):
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://m.worldstarhiphop.com/android/video.php?v=wshh6a7q1ny0G34ZwuIO',
|
'url': 'http://m.worldstarhiphop.com/android/video.php?v=wshh6a7q1ny0G34ZwuIO',
|
||||||
'md5': 'dc1c76c83ecc4190bb1eb143899b87d3',
|
'only_matching': True,
|
||||||
'info_dict': {
|
|
||||||
'id': 'wshh6a7q1ny0G34ZwuIO',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': 'KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!'
|
|
||||||
}
|
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
m_vevo_id = re.search(r'videoId=(.*?)&?', webpage)
|
entries = self._parse_html5_media_entries(url, webpage, video_id)
|
||||||
if m_vevo_id is not None:
|
|
||||||
return self.url_result('vevo:%s' % m_vevo_id.group(1), ie='Vevo')
|
|
||||||
|
|
||||||
video_url = self._search_regex(
|
if not entries:
|
||||||
[r'so\.addVariable\("file","(.*?)"\)',
|
return self.url_result(url, 'Generic')
|
||||||
r'<div class="artlist">\s*<a[^>]+href="([^"]+)">'],
|
|
||||||
webpage, 'video URL')
|
|
||||||
|
|
||||||
if 'youtube' in video_url:
|
title = self._html_search_regex(
|
||||||
return self.url_result(video_url, ie='Youtube')
|
|
||||||
|
|
||||||
video_title = self._html_search_regex(
|
|
||||||
[r'(?s)<div class="content-heading">\s*<h1>(.*?)</h1>',
|
[r'(?s)<div class="content-heading">\s*<h1>(.*?)</h1>',
|
||||||
r'<span[^>]+class="tc-sp-pinned-title">(.*)</span>'],
|
r'<span[^>]+class="tc-sp-pinned-title">(.*)</span>'],
|
||||||
webpage, 'title')
|
webpage, 'title')
|
||||||
|
|
||||||
# Getting thumbnail and if not thumbnail sets correct title for WSHH candy video.
|
info = entries[0]
|
||||||
thumbnail = self._html_search_regex(
|
info.update({
|
||||||
r'rel="image_src" href="(.*)" />', webpage, 'thumbnail',
|
|
||||||
default=None)
|
|
||||||
if not thumbnail:
|
|
||||||
_title = r'candytitles.*>(.*)</span>'
|
|
||||||
mobj = re.search(_title, webpage)
|
|
||||||
if mobj is not None:
|
|
||||||
video_title = mobj.group(1)
|
|
||||||
|
|
||||||
return {
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'title': title,
|
||||||
'title': video_title,
|
})
|
||||||
'thumbnail': thumbnail,
|
return info
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue