diff options
author | Filippo Valsorda <[email protected]> | 2018-01-07 15:03:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2018-01-07 15:03:28 +0100 |
commit | 97bc05116e15df3cf1b7b7216c60fad7ee0acc9f (patch) | |
tree | 453059413184d22a44241d251a82196c5d2461eb /youtube_dl/extractor/worldstarhiphop.py | |
parent | 7608a91ee7b40c74a35c30b44731606382702592 (diff) | |
parent | 0a5b1295b7c1aa6395b65ee137087c540b37b32b (diff) | |
download | youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.tar.gz youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.zip |
Merge branch 'master' into totalwebcastingtotalwebcasting
Diffstat (limited to 'youtube_dl/extractor/worldstarhiphop.py')
-rw-r--r-- | youtube_dl/extractor/worldstarhiphop.py | 46 |
1 files changed, 11 insertions, 35 deletions
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py index 09415b589..82587b4ce 100644 --- a/youtube_dl/extractor/worldstarhiphop.py +++ b/youtube_dl/extractor/worldstarhiphop.py @@ -1,12 +1,10 @@ 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|android)/video\.php\?v=(?P<id>.*)' + _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/(?:videos|android)/video\.php\?.*?\bv=(?P<id>[^&]+)' _TESTS = [{ 'url': 'http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO', 'md5': '9d04de741161603bf7071bbf4e883186', @@ -17,48 +15,26 @@ class WorldStarHipHopIE(InfoExtractor): } }, { '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!' - } + '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","(.*?)"\)', - r'<div class="artlist">\s*<a[^>]+href="([^"]+)">'], - 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( + title = self._html_search_regex( [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', - 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 { + info = entries[0] + info.update({ 'id': video_id, - 'url': video_url, - 'title': video_title, - 'thumbnail': thumbnail, - } + 'title': title, + }) + return info |