X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/0cf0312991a54458a07e903da2e47e9f3c8855ae..0433503f78928c1f0c76a8d66ef236dc35ff23df:/youtube_dl/extractor/worldstarhiphop.py diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py index d5c26a0..82587b4 100644 --- a/youtube_dl/extractor/worldstarhiphop.py +++ b/youtube_dl/extractor/worldstarhiphop.py @@ -1,53 +1,40 @@ from __future__ import unicode_literals -import re - from .common import InfoExtractor class WorldStarHipHopIE(InfoExtractor): - _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P.*)' - _TEST = { - "url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO", - "md5": "9d04de741161603bf7071bbf4e883186", - "info_dict": { - "id": "wshh6a7q1ny0G34ZwuIO", - "ext": "mp4", - "title": "KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!" + _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/(?:videos|android)/video\.php\?.*?\bv=(?P[^&]+)' + _TESTS = [{ + 'url': 'http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO', + 'md5': '9d04de741161603bf7071bbf4e883186', + 'info_dict': { + 'id': 'wshh6a7q1ny0G34ZwuIO', + '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', + 'only_matching': True, + }] def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - m_vevo_id = re.search(r'videoId=(.*?)&?', webpage) - 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( - r'so\.addVariable\("file","(.*?)"\)', webpage, 'video URL') + entries = self._parse_html5_media_entries(url, webpage, video_id) - if 'youtube' in video_url: - return self.url_result(video_url, ie='Youtube') + if not entries: + return self.url_result(url, 'Generic') - video_title = self._html_search_regex( - r'(?s)
\s*

(.*?)

', + title = self._html_search_regex( + [r'(?s)
\s*

(.*?)

', + r']+class="tc-sp-pinned-title">(.*)'], 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) - if not thumbnail: - _title = r'candytitles.*>(.*)' - mobj = re.search(_title, webpage) - if mobj is not None: - video_title = mobj.group(1) - - return { + info = entries[0] + info.update({ 'id': video_id, - 'url': video_url, - 'title': video_title, - 'thumbnail': thumbnail, - } + 'title': title, + }) + return info