projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'adammw/adultswim'
[youtube-dl]
/
youtube_dl
/
extractor
/
gorillavid.py
diff --git
a/youtube_dl/extractor/gorillavid.py
b/youtube_dl/extractor/gorillavid.py
index aa15cafc3e169e41708ab2079e20ad0e8b91ce0c..ca5f7c4178e23fb6e10e644807175a65f042f296 100644
(file)
--- a/
youtube_dl/extractor/gorillavid.py
+++ b/
youtube_dl/extractor/gorillavid.py
@@
-12,7
+12,12
@@
from ..utils import (
class GorillaVidIE(InfoExtractor):
class GorillaVidIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?gorillavid\.in/(?:embed-)?(?P<id>[0-9a-zA-Z]+)(?:-[0-9]+x[0-9]+\.html)?'
+ IE_DESC = 'GorillaVid.in and daclips.in'
+ _VALID_URL = r'''(?x)
+ https?://(?P<host>(?:www\.)?
+ (?:daclips\.in|gorillavid\.in))/
+ (?:embed-)?(?P<id>[0-9a-zA-Z]+)(?:-[0-9]+x[0-9]+\.html)?
+ '''
_TESTS = [{
'url': 'http://gorillavid.in/06y9juieqpmi',
_TESTS = [{
'url': 'http://gorillavid.in/06y9juieqpmi',
@@
-32,15
+37,22
@@
class GorillaVidIE(InfoExtractor):
'title': 'Say something nice',
'thumbnail': 're:http://.*\.jpg',
},
'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',
+ 'thumbnail': 're:http://.*\.jpg',
+ },
}]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
}]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- url = 'http://gorillavid.in/%s' % video_id
-
- webpage = self._download_webpage(url, video_id)
+ webpage = self._download_webpage('http://%s/%s' % (mobj.group('host'), video_id), video_id)
fields = dict(re.findall(r'''(?x)<input\s+
type="hidden"\s+
fields = dict(re.findall(r'''(?x)<input\s+
type="hidden"\s+