projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ruutu' of https://github.com/hlintala/youtube-dl into hlintala-ruutu
[youtube-dl]
/
youtube_dl
/
extractor
/
instagram.py
diff --git
a/youtube_dl/extractor/instagram.py
b/youtube_dl/extractor/instagram.py
index 5109f26ce860edc0675eaba6350e0ab820e7fe27..b107557880345157fcf66cb7e6e1b4a92b25af2e 100644
(file)
--- a/
youtube_dl/extractor/instagram.py
+++ b/
youtube_dl/extractor/instagram.py
@@
-3,15
+3,13
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import (
- int_or_none,
-)
+from ..utils import int_or_none
class InstagramIE(InfoExtractor):
class InstagramIE(InfoExtractor):
- _VALID_URL = r'http
://instagram\.com/p/(?P<id>.*?)/
'
+ _VALID_URL = r'http
s://instagram\.com/p/(?P<id>[\da-zA-Z]+)
'
_TEST = {
_TEST = {
- 'url': 'http://instagram.com/p/aye83DjauH/?foo=bar#abc',
+ 'url': 'http
s
://instagram.com/p/aye83DjauH/?foo=bar#abc',
'md5': '0d2da106a9d2631273e192b372806516',
'info_dict': {
'id': 'aye83DjauH',
'md5': '0d2da106a9d2631273e192b372806516',
'info_dict': {
'id': 'aye83DjauH',
@@
-23,13
+21,13
@@
class InstagramIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
-
mobj = re.match(self._VALID_URL,
url)
- video_id = mobj.group('id')
+
video_id = self._match_id(
url)
+
webpage = self._download_webpage(url, video_id)
uploader_id = self._search_regex(r'"owner":{"username":"(.+?)"',
webpage = self._download_webpage(url, video_id)
uploader_id = self._search_regex(r'"owner":{"username":"(.+?)"',
- webpage, 'uploader id', fatal=False)
+
webpage, 'uploader id', fatal=False)
desc = self._search_regex(r'"caption":"(.*?)"', webpage, 'description',
desc = self._search_regex(r'"caption":"(.*?)"', webpage, 'description',
- fatal=False)
+
fatal=False)
return {
'id': video_id,
return {
'id': video_id,
@@
-43,11
+41,11
@@
class InstagramIE(InfoExtractor):
class InstagramUserIE(InfoExtractor):
class InstagramUserIE(InfoExtractor):
- _VALID_URL = r'http://instagram\.com/(?P<username>[^/]{2,})/?(?:$|[?#])'
+ _VALID_URL = r'http
s
://instagram\.com/(?P<username>[^/]{2,})/?(?:$|[?#])'
IE_DESC = 'Instagram user profile'
IE_NAME = 'instagram:user'
_TEST = {
IE_DESC = 'Instagram user profile'
IE_NAME = 'instagram:user'
_TEST = {
- 'url': 'http://instagram.com/porsche',
+ 'url': 'http
s
://instagram.com/porsche',
'info_dict': {
'id': 'porsche',
'title': 'porsche',
'info_dict': {
'id': 'porsche',
'title': 'porsche',