aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-11-25 09:16:40 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-11-25 09:16:40 +0100
commitc553fe5d293dd88bffa8b04a1f83244bb30f44b1 (patch)
treeeb539a73ba5b3cd915216cf3ad702b0138844c8d
parentf0c3d729d7acb3af64f21b6042d20127ce7149ae (diff)
downloadyoutube-dl-c553fe5d293dd88bffa8b04a1f83244bb30f44b1.tar.xz
[tmz] Simplify (#4304)
-rw-r--r--youtube_dl/extractor/tmz.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/youtube_dl/extractor/tmz.py b/youtube_dl/extractor/tmz.py
index b82dc8233..827aa08a4 100644
--- a/youtube_dl/extractor/tmz.py
+++ b/youtube_dl/extractor/tmz.py
@@ -21,19 +21,12 @@ class TMZIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
-
webpage = self._download_webpage(url, video_id)
- url = self._html_search_regex(r'<meta name="VideoURL" content="(.+)"', webpage, 'url')
- title = self._html_search_regex(r'<meta property="og:title" content="(.+)"', webpage, 'title')
- description = self._html_search_regex(r'<meta property="og:description" content="(.+)"', webpage, 'description')
- thumbnail_url = self._html_search_regex(r'<meta name="ThumbURL" content="(.+)"', webpage, 'thumbnail url')
-
return {
'id': video_id,
- 'url': url,
- 'ext': 'mp4',
- 'title': title,
- 'description': description,
- 'thumbnail': thumbnail_url,
+ 'url': self._html_search_meta('VideoURL', webpage, fatal=True),
+ 'title': self._og_search_title(webpage),
+ 'description': self._og_search_description(webpage),
+ 'thumbnail': self._html_search_meta('ThumbURL', webpage),
}