From: Jaime Marquínez Ferrándiz Date: Wed, 24 Jul 2013 08:50:37 +0000 (+0200) Subject: Merge pull request #1114 from alexvh/traileraddict_hd X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=a052c1d785fb2d194bfb9352b16091b841064c1b;p=youtube-dl Merge pull request #1114 from alexvh/traileraddict_hd [traileraddict] Obtain hd quality stream if available Updated md5 checksum of the test video. --- a052c1d785fb2d194bfb9352b16091b841064c1b diff --cc youtube_dl/extractor/traileraddict.py index 3f597737b,ff8e173bc..35f89e9ee --- a/youtube_dl/extractor/traileraddict.py +++ b/youtube_dl/extractor/traileraddict.py @@@ -8,7 -8,7 +8,7 @@@ class TrailerAddictIE(InfoExtractor) _TEST = { u'url': u'http://www.traileraddict.com/trailer/prince-avalanche/trailer', u'file': u'76184.mp4', -- u'md5': u'41365557f3c8c397d091da510e73ceb4', ++ u'md5': u'57e39dbcf4142ceb8e1f242ff423fd71', u'info_dict': { u"title": u"Prince Avalanche Trailer", u"description": u"Trailer for Prince Avalanche.Two highway road workers spend the summer of 1988 away from their city lives. The isolated landscape becomes a place of misadventure as the men find themselves at odds with each other and the women they left behind." @@@ -17,9 -17,9 +17,9 @@@ 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','') view_count = self._search_regex(r'Views: (.+?)
',