Merge pull request #1114 from alexvh/traileraddict_hd

[traileraddict] Obtain hd quality stream if available

Updated md5 checksum of the test video.

diff --combined youtube_dl/extractor/traileraddict.py
index 3f597737b1d9ba43ca5ef62b0cf6d7d1718f4c63,ff8e173bce6e13ba4c46a3252ff19040cf437dff..35f89e9eecb0145988f8f503dcb6b18aea5d0e93
--- 1/youtube_dl/extractor/traileraddict.py
--- 2/youtube_dl/extractor/traileraddict.py
+++ b/youtube_dl/extractor/traileraddict.py
@@@ -4,11 -4,11 +4,11 @@@ from .common import InfoExtracto
  
  
  class TrailerAddictIE(InfoExtractor):
 -    _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/trailer/([^/]+)/(?:trailer|feature-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',
--        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,24 -17,30 +17,30 @@@
  
      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','')
          view_count = self._search_regex(r'Views: (.+?)<br />',
                  webpage, 'Views Count')
          video_id = self._og_search_property('video', webpage, 'Video id').split('=')[1]
  
-         info_url = "http://www.traileraddict.com/fvar.php?tid=%s" %(str(video_id))
+         # Presence of (no)watchplus function indicates HD quality is available
+         if re.search(r'function (no)?watchplus()', webpage):
+             fvar = "fvarhd"
+         else:
+             fvar = "fvar"
+ 
+         info_url = "http://www.traileraddict.com/%s.php?tid=%s" % (fvar, str(video_id))
          info_webpage = self._download_webpage(info_url, video_id , "Downloading the info webpage")
-         
+ 
          final_url = self._search_regex(r'&fileurl=(.+)',
                  info_webpage, 'Download url').replace('%3F','?')
          thumbnail_url = self._search_regex(r'&image=(.+?)&',
                  info_webpage, 'thumbnail url')
          ext = final_url.split('.')[-1].split('?')[0]
-         
+ 
          return [{
              'id'          : video_id,
              'url'         : final_url,