about summary refs log tree commit diff
path: root/youtube_dl/extractor/instagram.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-12 19:00:19 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-12 22:12:04 +0200
commit46720279c28afb646b6ac19bcb11e85bb4bea726 (patch)
treec38b786e0176511bfbe5295a8a73582b121018fc /youtube_dl/extractor/instagram.py
parentd8269e1dfbe06d4b373211e54476bcd326f69abe (diff)
downloadyoutube-dl-46720279c28afb646b6ac19bcb11e85bb4bea726.tar.gz
youtube-dl-46720279c28afb646b6ac19bcb11e85bb4bea726.tar.xz
youtube-dl-46720279c28afb646b6ac19bcb11e85bb4bea726.zip
InfoExtractor: add some helper methods to extract OpenGraph info
Diffstat (limited to 'youtube_dl/extractor/instagram.py')
-rw-r--r--youtube_dl/extractor/instagram.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py
index 6ae704efd..1ffadf67f 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dl/extractor/instagram.py
@@ -18,12 +18,6 @@ class InstagramIE(InfoExtractor):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group(1)
         webpage = self._download_webpage(url, video_id)
-        video_url = self._html_search_regex(
-            r'<meta property="og:video" content="(.+?)"',
-            webpage, u'video URL')
-        thumbnail_url = self._html_search_regex(
-            r'<meta property="og:image" content="(.+?)" />',
-            webpage, u'thumbnail URL', fatal=False)
         html_title = self._html_search_regex(
             r'<title>(.+?)</title>',
             webpage, u'title', flags=re.DOTALL)
@@ -34,9 +28,9 @@ class InstagramIE(InfoExtractor):
 
         return [{
             'id':        video_id,
-            'url':       video_url,
+            'url':       self._og_search_video_url(webpage),
             'ext':       ext,
             'title':     title,
-            'thumbnail': thumbnail_url,
+            'thumbnail': self._og_search_thumbnail(webpage),
             'uploader_id' : uploader_id
         }]