diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-04-16 22:23:08 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-04-16 22:23:08 +0600 |
| commit | 0dafea02e6644053b6db6603238827176f6c6f3e (patch) | |
| tree | a0e4ea1f4a33f6bbb77b362a63646092acadf47f | |
| parent | 5d6360c3b720f74946fec6b7f0596965473d8d1d (diff) | |
[instagram] Add support for embed URLs
| -rw-r--r-- | youtube_dl/extractor/instagram.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py index 11bb58d8a..3a5dd14e6 100644 --- a/youtube_dl/extractor/instagram.py +++ b/youtube_dl/extractor/instagram.py @@ -12,7 +12,7 @@ from ..utils import ( class InstagramIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?instagram\.com/p/(?P<id>[^/?#&]+)' + _VALID_URL = r'(?P<url>https?://(?:www\.)?instagram\.com/p/(?P<id>[^/?#&]+))' _TESTS = [{ 'url': 'https://instagram.com/p/aye83DjauH/?foo=bar#abc', 'md5': '0d2da106a9d2631273e192b372806516', @@ -38,6 +38,9 @@ class InstagramIE(InfoExtractor): }, { 'url': 'https://instagram.com/p/-Cmh1cukG2/', 'only_matching': True, + }, { + 'url': 'http://instagram.com/p/9o6LshA7zy/embed/', + 'only_matching': True, }] @staticmethod @@ -53,7 +56,9 @@ class InstagramIE(InfoExtractor): return mobj.group('link') def _real_extract(self, url): - video_id = self._match_id(url) + mobj = re.match(self._VALID_URL, url) + video_id = mobj.group('id') + url = mobj.group('url') webpage = self._download_webpage(url, video_id) uploader_id = self._search_regex(r'"owner":{"username":"(.+?)"', |