Merge pull request #1114 from alexvh/traileraddict_hd
[traileraddict] Obtain hd quality stream if available Updated md5 checksum of the test video.
This commit is contained in:
		@@ -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."
 | 
			
		||||
@@ -26,7 +26,13 @@ class TrailerAddictIE(InfoExtractor):
 | 
			
		||||
                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=(.+)',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user