about summary refs log tree commit diff
path: root/youtube_dl/extractor/instagram.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-07-13 20:40:04 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-07-13 20:40:04 +0200
commit73b57f0ccbae1506304237ef836e70763c23d38f (patch)
treeb27ef43a625f124e5ad29102cd829b5c464cfaa1 /youtube_dl/extractor/instagram.py
parent3c4e6d833792c38a28f1dc78ad22fca99edad1fb (diff)
downloadyoutube-dl-73b57f0ccbae1506304237ef836e70763c23d38f.tar.gz
youtube-dl-73b57f0ccbae1506304237ef836e70763c23d38f.tar.xz
youtube-dl-73b57f0ccbae1506304237ef836e70763c23d38f.zip
[instagram] fix uploader_id detection (Fixes #1038)
Diffstat (limited to 'youtube_dl/extractor/instagram.py')
-rw-r--r--youtube_dl/extractor/instagram.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py
index 1ffadf67f..49d770665 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dl/extractor/instagram.py
@@ -5,7 +5,7 @@ from .common import InfoExtractor
 class InstagramIE(InfoExtractor):
     _VALID_URL = r'(?:http://)?instagram.com/p/(.*?)/'
     _TEST = {
-        u'url': u'http://instagram.com/p/aye83DjauH/#',
+        u'url': u'http://instagram.com/p/aye83DjauH/?foo=bar#abc',
         u'file': u'aye83DjauH.mp4',
         u'md5': u'0d2da106a9d2631273e192b372806516',
         u'info_dict': {
@@ -22,7 +22,7 @@ class InstagramIE(InfoExtractor):
             r'<title>(.+?)</title>',
             webpage, u'title', flags=re.DOTALL)
         title = re.sub(u'(?: *\(Videos?\))? \u2022 Instagram$', '', html_title).strip()
-        uploader_id = self._html_search_regex(r'content="(.*?)\'s video on Instagram',
+        uploader_id = self._html_search_regex(r'<div class="media-user" id="media_user"><h2><a href="[^"]*">([^<]*)</a></h2>',
             webpage, u'uploader name', fatal=False)
         ext = 'mp4'