X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgorillavid.py;h=65b1534174c08e137cb08dec56777d5bcf1737ed;hb=5f6a1245ffa9276c1af59b0835afeef67e2fb5b1;hp=bdf6e30c2725ff0e3420f7394592cfeca5e2234b;hpb=617c0b2239f565d512a175d7fce4b5a6b3835b4c;p=youtube-dl diff --git a/youtube_dl/extractor/gorillavid.py b/youtube_dl/extractor/gorillavid.py index bdf6e30c2..65b153417 100644 --- a/youtube_dl/extractor/gorillavid.py +++ b/youtube_dl/extractor/gorillavid.py @@ -1,38 +1,97 @@ -# coding: utf-8 +# -*- coding: utf-8 -*- from __future__ import unicode_literals import re from .common import InfoExtractor +from ..utils import ( + ExtractorError, + determine_ext, + compat_urllib_parse, + compat_urllib_request, +) + class GorillaVidIE(InfoExtractor): - _VALID_URL = r'https?://(?:www.)?gorillavid.in/(?:embed-)?(?P\w+)(?:\-\d+x\d+)?.html' - _TEST = { - 'url': "http://gorillavid.in/kdk7i5r1p5ye.html", - 'md5': '5a01b05ed3da82a10c6659e954b80108', + IE_DESC = 'GorillaVid.in, daclips.in and movpod.in' + _VALID_URL = r'''(?x) + https?://(?P(?:www\.)? + (?:daclips\.in|gorillavid\.in|movpod\.in))/ + (?:embed-)?(?P[0-9a-zA-Z]+)(?:-[0-9]+x[0-9]+\.html)? + ''' + + _FILE_NOT_FOUND_REGEX = r'>(?:404 - )?File Not Found<' + + _TESTS = [{ + 'url': 'http://gorillavid.in/06y9juieqpmi', + 'md5': '5ae4a3580620380619678ee4875893ba', 'info_dict': { - 'id': 'kdk7i5r1p5ye', + 'id': '06y9juieqpmi', 'ext': 'flv', - 'title': 'Full House 1x16 - But Seriously, Folks.avi', + 'title': 'Rebecca Black My Moment Official Music Video Reaction-6GK87Rc8bzQ', + 'thumbnail': 're:http://.*\.jpg', + }, + }, { + 'url': 'http://gorillavid.in/embed-z08zf8le23c6-960x480.html', + 'md5': 'c9e293ca74d46cad638e199c3f3fe604', + 'info_dict': { + 'id': 'z08zf8le23c6', + 'ext': 'mp4', + 'title': 'Say something nice', + 'thumbnail': 're:http://.*\.jpg', + }, + }, { + 'url': 'http://daclips.in/3rso4kdn6f9m', + 'md5': '1ad8fd39bb976eeb66004d3a4895f106', + 'info_dict': { + 'id': '3rso4kdn6f9m', + 'ext': 'mp4', + 'title': 'Micro Pig piglets ready on 16th July 2009-bG0PdrCdxUc', + 'thumbnail': 're:http://.*\.jpg', } - } + }, { + 'url': 'http://movpod.in/0wguyyxi1yca', + 'only_matching': True, + }] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') - webpage = self._download_webpage(url, video_id) - title = self._html_search_regex(r"name=['\"]fname['\"]\s+value=['\"](.*?)['\"]", webpage, u"video title") + webpage = self._download_webpage('http://%s/%s' % (mobj.group('host'), video_id), video_id) + + if re.search(self._FILE_NOT_FOUND_REGEX, webpage) is not None: + raise ExtractorError('Video %s does not exist' % video_id, expected=True) - # download embed page again with cookies to get url - embed_url = "http://gorillavid.in/embed-{0}-960x480.html".format(video_id) - webpage = self._download_webpage(embed_url, video_id, note=u'Downloading webpage again (with cookie)') - url = self._html_search_regex(r'file:\s+["\'](http://.*?video.\w{3})["\']', webpage, url) + fields = dict(re.findall(r'''(?x)([^<]+)', webpage, 'title') + video_url = self._search_regex(r'file\s*:\s*\'(http[^\']+)\',', webpage, 'file url') + thumbnail = self._search_regex(r'image\s*:\s*\'(http[^\']+)\',', webpage, 'thumbnail', fatal=False) + + formats = [{ + 'format_id': 'sd', + 'url': video_url, + 'ext': determine_ext(video_url), + 'quality': 1, + }] + + return { 'id': video_id, 'title': title, - 'url': url, + 'thumbnail': thumbnail, + 'formats': formats, } - - return info_dict