Merge remote-tracking branch 'yasoob/master'

diff --git a/test/tests.json b/test/tests.json
index 3e0db297db59e9676879e40ec2033c77342a92b8..c2c6421fd7a12145053737de1258c49556383bb1 100644 (file)
--- a/test/tests.json
+++ b/test/tests.json
@@ -630,5 +630,15 @@
         "title": "E3 2013: Debut Trailer"
     },
     "skip": "Requires rtmpdump"
+  },
+  {
+    "name": "Statigr",
+    "url": "http://statigr.am/p/484091715184808010_284179915",
+    "file": "484091715184808010_284179915.mp4",
+    "md5": "deda4ff333abe2e118740321e992605b",
+    "info_dict": {
+        "uploader": "videoseconds",
+        "title": "Instagram photo by @videoseconds (Videos)"
+    }
   }
 ]

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index cd91c13f520d36104c4f4d9aaaa2d4e7746e7917..4aec8c6879e79ccc13cf5e9bcfbf9abc17c4d1d1 100755 (executable)
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -4552,6 +4552,29 @@ class GametrailersIE(InfoExtractor):
                 'description': video_description,
                 }
 
+class StatigrIE(InfoExtractor):
+    _VALID_URL = r'(?:http://)?(?:www\.)?statigr\.am/p/([^/]+)'
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        if mobj is None:
+            raise ExtractorError(u'Invalid URL: %s' % url)
+        video_id = mobj.group(1)
+        webpage = self._download_webpage(url, video_id)
+        video_url = re.search(r'<meta property="og:video:secure_url" content="(.+?)">',webpage).group(1)
+        thumbnail_url = re.search(r'<meta property="og:image" content="(.+?)" />',webpage).group(1)
+        title = (re.search(r'<title>(.+?)</title>',webpage).group(1)).strip("| Statigram")
+        uploader = re.search(r'@(.+) \(Videos\)',title).group(1)
+        ext = "mp4"
+        return [{
+            'id':        video_id,
+            'url':       video_url,
+            'ext':       ext,
+            'title':     title,
+            'thumbnail': thumbnail_url,
+            'uploader' : uploader
+        }]
+
 def gen_extractors():
     """ Return a list of an instance of every supported extractor.
     The order does matter; the first extractor matched is the one handling the URL.
@@ -4618,6 +4641,7 @@ def gen_extractors():
         HypemIE(),
         Vbox7IE(),
         GametrailersIE(),
+        StatigrIE(),
         GenericIE()
     ]