From: Sergey M․ Date: Sat, 3 Jan 2015 15:54:18 +0000 (+0600) Subject: [ellentv] Improve extraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=baa3c3f0f64b1aba523f56c9af351b6fb3378fc6;p=youtube-dl [ellentv] Improve extraction --- diff --git a/youtube_dl/extractor/ellentv.py b/youtube_dl/extractor/ellentv.py index 89fa9f7e4..fc92ff825 100644 --- a/youtube_dl/extractor/ellentv.py +++ b/youtube_dl/extractor/ellentv.py @@ -19,6 +19,7 @@ class EllenTVIE(InfoExtractor): 'id': '0-7jqrsr18', 'ext': 'mp4', 'title': 'What\'s Wrong with These Photos? A Whole Lot', + 'description': 'md5:35f152dc66b587cf13e6d2cf4fa467f6', 'timestamp': 1406876400, 'upload_date': '20140801', } @@ -29,6 +30,7 @@ class EllenTVIE(InfoExtractor): 'id': '0-dvzmabd5', 'ext': 'mp4', 'title': '1 year old twin sister makes her brother laugh', + 'description': '1 year old twin sister makes her brother laugh', 'timestamp': 1419542075, 'upload_date': '20141225', } @@ -38,14 +40,20 @@ class EllenTVIE(InfoExtractor): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) + video_url = self._html_search_meta('VideoURL', webpage, 'url') + title = self._og_search_title(webpage, default=None) or self._search_regex( + r'pageName\s*=\s*"([^"]+)"', webpage, 'title') + description = self._html_search_meta( + 'description', webpage, 'description') or self._og_search_description(webpage) timestamp = parse_iso8601(self._search_regex( r'