mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-22 16:57:40 +00:00
[worldstarhiphop] Support Android URLs (fixes #5629)
This commit is contained in:
parent
82245a6de7
commit
fa6a16996e
1 changed files with 17 additions and 6 deletions
|
@ -6,8 +6,8 @@ from .common import InfoExtractor
|
|||
|
||||
|
||||
class WorldStarHipHopIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)'
|
||||
_TEST = {
|
||||
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/(?:videos|android)/video\.php\?v=(?P<id>.*)'
|
||||
_TESTS = [{
|
||||
"url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO",
|
||||
"md5": "9d04de741161603bf7071bbf4e883186",
|
||||
"info_dict": {
|
||||
|
@ -15,7 +15,15 @@ class WorldStarHipHopIE(InfoExtractor):
|
|||
"ext": "mp4",
|
||||
"title": "KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!"
|
||||
}
|
||||
}
|
||||
}, {
|
||||
'url': 'http://m.worldstarhiphop.com/android/video.php?v=wshh6a7q1ny0G34ZwuIO',
|
||||
'md5': 'dc1c76c83ecc4190bb1eb143899b87d3',
|
||||
'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):
|
||||
video_id = self._match_id(url)
|
||||
|
@ -26,19 +34,22 @@ class WorldStarHipHopIE(InfoExtractor):
|
|||
return self.url_result('vevo:%s' % m_vevo_id.group(1), ie='Vevo')
|
||||
|
||||
video_url = self._search_regex(
|
||||
r'so\.addVariable\("file","(.*?)"\)', webpage, 'video URL')
|
||||
[r'so\.addVariable\("file","(.*?)"\)',
|
||||
r'<div class="artlist">\s*<a[^>]+href="([^"]+)">'],
|
||||
webpage, 'video URL')
|
||||
|
||||
if 'youtube' in video_url:
|
||||
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>'],
|
||||
webpage, 'title')
|
||||
|
||||
# Getting thumbnail and if not thumbnail sets correct title for WSHH candy video.
|
||||
thumbnail = self._html_search_regex(
|
||||
r'rel="image_src" href="(.*)" />', webpage, 'thumbnail',
|
||||
fatal=False)
|
||||
default=None)
|
||||
if not thumbnail:
|
||||
_title = r'candytitles.*>(.*)</span>'
|
||||
mobj = re.search(_title, webpage)
|
||||
|
|
Loading…
Reference in a new issue