X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fworldstarhiphop.py;h=5b9779c05853ab815aa56d710476356c56c8449b;hb=9afb1afcc6e3b4fbd6c46e2b6d2d37b5c1c9109f;hp=54a77b69699439a3409280cdab7cbbac5b743069;hpb=250f5578728d6601adab9fcebf200ee553ed77d2;p=youtube-dl diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py index 54a77b696..5b9779c05 100644 --- a/youtube_dl/extractor/worldstarhiphop.py +++ b/youtube_dl/extractor/worldstarhiphop.py @@ -5,7 +5,15 @@ from .common import InfoExtractor class WorldStarHipHopIE(InfoExtractor): _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P.*)' - IE_NAME = u'WorldStarHipHop' + _TEST = { + "url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO", + "file": "wshh6a7q1ny0G34ZwuIO.mp4", + "md5": "9d04de741161603bf7071bbf4e883186", + "info_dict": { + "title": "Video: KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!" + } + } + def _real_extract(self, url): m = re.match(self._VALID_URL, url) @@ -16,6 +24,10 @@ class WorldStarHipHopIE(InfoExtractor): video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)', webpage_src, u'video URL') + if 'youtube' in video_url: + self.to_screen(u'Youtube video detected:') + return self.url_result(video_url, ie='Youtube') + if 'mp4' in video_url: ext = 'mp4' else: