From: Jaime Marquínez Ferrándiz Date: Wed, 24 Jul 2013 08:43:44 +0000 (+0200) Subject: [traileraddict]: Support clips urls and more trailer urls X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=16484d49231c9b89bb81362794b58a8dcf6883ae;p=youtube-dl [traileraddict]: Support clips urls and more trailer urls --- diff --git a/youtube_dl/extractor/traileraddict.py b/youtube_dl/extractor/traileraddict.py index 6f2fc2394..3f597737b 100644 --- a/youtube_dl/extractor/traileraddict.py +++ b/youtube_dl/extractor/traileraddict.py @@ -4,7 +4,7 @@ from .common import InfoExtractor class TrailerAddictIE(InfoExtractor): - _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/trailer/([^/]+)/(?:[^/]*trailer[^/]*)' + _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P.+?)/(?P.+)' _TEST = { u'url': u'http://www.traileraddict.com/trailer/prince-avalanche/trailer', u'file': u'76184.mp4', @@ -17,8 +17,8 @@ class TrailerAddictIE(InfoExtractor): def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - video_id = mobj.group(1) - webpage = self._download_webpage(url, video_id) + name = mobj.group('movie') + '/' + mobj.group('trailer_name') + webpage = self._download_webpage(url, name) title = self._search_regex(r'(.+?)', webpage, 'video title').replace(' - Trailer Addict','')