Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4626 from gauravb7090/ellentube 

Added support for EllenTube along with EllenTV
pull/4554/merge
Sergey M. 2015-01-03 21:40:39 +06:00
parent c7e675940c 6e46c3f1fd
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): class EllenTVIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?ellentv\.com/videos/(?P<id>[a-z0-9_-]+)' _VALID_URL = r'https?://(?:www\.)?(ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
_TEST = { _TESTS = [{
'url': 'http://www.ellentv.com/videos/0-7jqrsr18/', 'url': 'http://www.ellentv.com/videos/0-7jqrsr18/',
'md5': 'e4af06f3bf0d5f471921a18db5764642', 'md5': 'e4af06f3bf0d5f471921a18db5764642',
'info_dict': { 'info_dict': {
@ -23,7 +23,18 @@ class EllenTVIE(InfoExtractor):
'timestamp': 1406876400, 'timestamp': 1406876400,
'upload_date': '20140801', '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): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -33,6 +44,9 @@ class EllenTVIE(InfoExtractor):
timestamp = parse_iso8601(self._search_regex( timestamp = parse_iso8601(self._search_regex(
r'<span class="publish-date"><time datetime="([^"]+)">', r'<span class="publish-date"><time datetime="([^"]+)">',
webpage, 'timestamp')) webpage, 'timestamp'))
print "\n"
print timestamp
print "\n"
return { return {
'id': video_id, 'id': video_id,