Merge remote-tracking branch 'yasoob/master'

Conflicts:
	youtube_dl/extractor/__init__.py

2 files changed, 50 insertions, 0 deletions

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 98733e394..ba0e86713 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -48,6 +48,7 @@ from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE
 from .tf1 import TF1IE
+from .traileraddict import TrailerAddictIE
 from .tudou import TudouIE
 from .tumblr import TumblrIE
 from .tutv import TutvIE
diff --git a/youtube_dl/extractor/traileraddict.py b/youtube_dl/extractor/traileraddict.py
new file mode 100644
index 000000000..9dd26c163
--- /dev/null
+++ b/youtube_dl/extractor/traileraddict.py
@@ -0,0 +1,49 @@
+import re
+
+from .common import InfoExtractor
+
+
+class TrailerAddictIE(InfoExtractor):
+    _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/trailer/([^/]+)/(?:trailer|feature-trailer)'
+    _TEST = {
+        u'url': u'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
+        u'file': u'76184.mp4',
+        u'md5': u'41365557f3c8c397d091da510e73ceb4',
+        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."
+        }
+    }
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group(1)
+        webpage = self._download_webpage(url, video_id)
+        
+        title = self._search_regex(r'<title>(.+?)</title>',
+                webpage, 'video title').replace(' - Trailer Addict','')
+        view_count = self._search_regex(r'Views: (.+?)<br />',
+                webpage, 'Views Count')
+        description = self._search_regex(r'<meta property="og:description" content="(.+?)" />',
+                webpage, 'video description')
+        video_id = self._search_regex(r'<meta property="og:video" content="(.+?)" />',
+                webpage, 'Video id').split('=')[1]
+        
+        info_url = "http://www.traileraddict.com/fvar.php?tid=%s" %(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,
+            'ext'         : ext,
+            'title'       : title,
+            'thumbnail'   : thumbnail_url,
+            'description' : description,
+            'view_count'  : view_count,
+        }]