jcgruenhage/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4626 from gauravb7090/ellentube

Browse source 
Added support for EllenTube along with EllenTV
This commit is contained in:
Sergey M. 2015-01-03 21:40:39 +06:00
commit 7d02fae85b
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
youtube_dl/extractor/ellentv.py
View file

@ -12,8 +12,8 @@ from ..utils import (
class EllenTVIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?ellentv\.com/videos/(?P<id>[a-z0-9_-]+)'
_TEST = {
_VALID_URL = r'https?://(?:www\.)?(ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
_TESTS = [{
'url': 'http://www.ellentv.com/videos/0-7jqrsr18/',
'md5': 'e4af06f3bf0d5f471921a18db5764642',
'info_dict': {
@ -23,7 +23,18 @@ class EllenTVIE(InfoExtractor):
'timestamp': 1406876400,
'upload_date': '20140801',
}
}
},
{
'url': 'http://ellentube.com/videos/0-dvzmabd5/',
'md5': '98238118eaa2bbdf6ad7f708e3e4f4eb',
'info_dict': {
'id': '0-dvzmabd5',
'ext': 'mp4',
'title': '1 year old twin sister makes her brother laugh',
'timestamp': 1419542075,
'upload_date': '20141225',
}
}]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@ -33,6 +44,9 @@ class EllenTVIE(InfoExtractor):
timestamp = parse_iso8601(self._search_regex(
r'<span class="publish-date"><time datetime="([^"]+)">',
webpage, 'timestamp'))
print "\n"
print timestamp
print "\n"
return {
'id': video_id,