projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c4e6d8
)
[instagram] fix uploader_id detection (Fixes #1038)
author
Philipp Hagemeister
<phihag@phihag.de>
Sat, 13 Jul 2013 18:40:04 +0000
(20:40 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sat, 13 Jul 2013 18:40:04 +0000
(20:40 +0200)
youtube_dl/extractor/instagram.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/instagram.py
b/youtube_dl/extractor/instagram.py
index 1ffadf67f120f60d57ec367635701fc709232a4b..49d770665333484e6918cfd6134f1bb2be7667c6 100644
(file)
--- 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 = {
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': {
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()
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'
webpage, u'uploader name', fatal=False)
ext = 'mp4'