aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/traileraddict.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-24 10:43:44 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-24 10:43:44 +0200
commit16484d49231c9b89bb81362794b58a8dcf6883ae (patch)
treea46ed50003992660ce98ce320619c2c13f063182 /youtube_dl/extractor/traileraddict.py
parent32a09b43820fbc27dc29c0c98f517462fabd47d6 (diff)
[traileraddict]: Support clips urls and more trailer urls
Diffstat (limited to 'youtube_dl/extractor/traileraddict.py')
-rw-r--r--youtube_dl/extractor/traileraddict.py6
1 files changed, 3 insertions, 3 deletions
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<movie>.+?)/(?P<trailer_name>.+)'
_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'<title>(.+?)</title>',
webpage, 'video title').replace(' - Trailer Addict','')