dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[worldstarhiphop] Support Android URLs (fixes #5629)

This commit is contained in:
Yen Chi Hsuan 2015-05-14 18:00:57 +08:00
parent 82245a6de7
commit fa6a16996e
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
youtube_dl/extractor/worldstarhiphop.py
View File

@ -6,8 +6,8 @@ from .common import InfoExtractor
class WorldStarHipHopIE(InfoExtractor): class WorldStarHipHopIE(InfoExtractor):
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)' _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/(?:videos|android)/video\.php\?v=(?P<id>.*)'
_TEST = { _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",
"info_dict": { "info_dict": {
@ -15,7 +15,15 @@ class WorldStarHipHopIE(InfoExtractor):
"ext": "mp4", "ext": "mp4",
"title": "KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!" "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): def _real_extract(self, url):
video_id = self._match_id(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') return self.url_result('vevo:%s' % m_vevo_id.group(1), ie='Vevo')
video_url = self._search_regex( 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: if 'youtube' in video_url:
return self.url_result(video_url, ie='Youtube') return self.url_result(video_url, ie='Youtube')
video_title = self._html_search_regex( 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') webpage, 'title')
# Getting thumbnail and if not thumbnail sets correct title for WSHH candy video. # Getting thumbnail and if not thumbnail sets correct title for WSHH candy video.
thumbnail = self._html_search_regex( thumbnail = self._html_search_regex(
r'rel="image_src" href="(.*)" />', webpage, 'thumbnail', r'rel="image_src" href="(.*)" />', webpage, 'thumbnail',
fatal=False) default=None)
if not thumbnail: if not thumbnail:
_title = r'candytitles.*>(.*)</span>' _title = r'candytitles.*>(.*)</span>'
mobj = re.search(_title, webpage) mobj = re.search(_title, webpage)