aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/tmz.py28
1 files changed, 12 insertions, 16 deletions
diff --git a/youtube_dl/extractor/tmz.py b/youtube_dl/extractor/tmz.py
index 7dbe68b5c..979856e9a 100644
--- a/youtube_dl/extractor/tmz.py
+++ b/youtube_dl/extractor/tmz.py
@@ -5,31 +5,27 @@ from .common import InfoExtractor
class TMZIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?tmz\.com/videos/(?P<id>[^/]+)/?'
- _TEST = {
+ _VALID_URL = r'https?://(?:www\.)?tmz\.com/videos/(?P<id>[^/?#]+)'
+ _TESTS = [{
'url': 'http://www.tmz.com/videos/0_okj015ty/',
- 'md5': '791204e3bf790b1426cb2db0706184c0',
+ 'md5': '4d22a51ef205b6c06395d8394f72d560',
'info_dict': {
'id': '0_okj015ty',
- 'url': 'http://tmz.vo.llnwd.net/o28/2014-03/13/0_okj015ty_0_rt8ro3si_2.mp4',
'ext': 'mp4',
'title': 'Kim Kardashian\'s Boobs Unlock a Mystery!',
'description': 'Did Kim Kardasain try to one-up Khloe by one-upping Kylie??? Or is she just showing off her amazing boobs?',
- 'thumbnail': r're:http://cdnbakmi\.kaltura\.com/.*thumbnail.*',
+ 'timestamp': 1394747163,
+ 'uploader_id': 'batchUser',
+ 'upload_date': '20140313',
}
- }
+ }, {
+ 'url': 'http://www.tmz.com/videos/0-cegprt2p/',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
- video_id = self._match_id(url)
- webpage = self._download_webpage(url, video_id)
-
- return {
- 'id': video_id,
- '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),
- }
+ video_id = self._match_id(url).replace('-', '_')
+ return self.url_result('kaltura:591531:%s' % video_id, 'Kaltura', video_id)
class TMZArticleIE(InfoExtractor):