From: Sergey M․ Date: Wed, 7 May 2014 14:02:57 +0000 (+0700) Subject: [funnyordie] Extract more formats X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=bebd6f9308d746a6adc1930963794ded010bee90;p=youtube-dl [funnyordie] Extract more formats --- diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index cdd3baf80..6e6b66660 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -4,13 +4,14 @@ import json import re from .common import InfoExtractor +from ..utils import ExtractorError class FunnyOrDieIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?Pembed|videos)/(?P[0-9a-f]+)(?:$|[?#/])' _TESTS = [{ 'url': 'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version', - 'md5': 'f647e9e90064b53b6e046e75d0241fbd', + 'md5': 'bcd81e0c4f26189ee09be362ad6e6ba9', 'info_dict': { 'id': '0732f586d7', 'ext': 'mp4', @@ -20,7 +21,7 @@ class FunnyOrDieIE(InfoExtractor): }, }, { 'url': 'http://www.funnyordie.com/embed/e402820827', - 'md5': '0e0c5a7bf45c52b95cd16aa7f28be0b6', + 'md5': 'ff4d83318f89776ed0250634cfaa8d36', 'info_dict': { 'id': 'e402820827', 'ext': 'mp4', @@ -36,9 +37,25 @@ class FunnyOrDieIE(InfoExtractor): video_id = mobj.group('id') webpage = self._download_webpage(url, video_id) - video_url = self._search_regex( - [r'type="video/mp4" src="(.*?)"', r'src="([^>]*?)" type=\'video/mp4\''], - webpage, 'video URL', flags=re.DOTALL) + links = re.findall(r'