diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-01-03 21:40:39 +0600 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-01-03 21:40:39 +0600 |
| commit | 7d02fae85b7466e66019598025ea0bca1ad1a8c9 (patch) | |
| tree | 0294e23d77e70666811167d793404246c7827c1e /youtube_dl | |
| parent | c7e675940ca06a74f068164b25d3afb9b657ff24 (diff) | |
| parent | 6e46c3f1fddc954596d429d15d7c035d12a625a9 (diff) | |
Merge pull request #4626 from gauravb7090/ellentube
Added support for EllenTube along with EllenTV
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/ellentv.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/youtube_dl/extractor/ellentv.py b/youtube_dl/extractor/ellentv.py index 3e7923648..097317842 100644 --- a/youtube_dl/extractor/ellentv.py +++ b/youtube_dl/extractor/ellentv.py @@ -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, |