From 8e0d60145ac746832621b37807fef1a84859f275 Mon Sep 17 00:00:00 2001
From: David Heller <david@ehellers.com>
Date: Mon, 30 Mar 2020 16:19:03 -0700
Subject: [PATCH 1/2] Adding support for extracting instagram image URLs

---
 youtube_dl/extractor/instagram.py | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py
index b061850a1..d08e1cba1 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dl/extractor/instagram.py
@@ -122,7 +122,7 @@ class InstagramIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
 
-        (video_url, description, thumbnail, timestamp, uploader,
+        (media_url, description, thumbnail, timestamp, uploader,
          uploader_id, like_count, comment_count, comments, height,
          width) = [None] * 11
 
@@ -131,16 +131,27 @@ class InstagramIE(InfoExtractor):
                 r'window\._sharedData\s*=\s*({.+?});',
                 webpage, 'shared data', default='{}'),
             video_id, fatal=False)
+
         if shared_data:
             media = try_get(
                 shared_data,
                 (lambda x: x['entry_data']['PostPage'][0]['graphql']['shortcode_media'],
                  lambda x: x['entry_data']['PostPage'][0]['media']),
                 dict)
+
             if media:
-                video_url = media.get('video_url')
-                height = int_or_none(media.get('dimensions', {}).get('height'))
-                width = int_or_none(media.get('dimensions', {}).get('width'))
+                media_url = media.get('video_url')
+
+                if media_url:
+                    height = int_or_none(media.get('dimensions', {}).get('height'))
+                    width = int_or_none(media.get('dimensions', {}).get('width'))
+
+                elif media.get('display_resources'):
+                    display_resource = media['display_resources'][-1]  # choosing highest resolution
+                    media_url = display_resource.get('src')
+                    height = int_or_none(display_resource.get('config_height'))
+                    width = int_or_none(display_resource.get('config_width'))
+
                 description = try_get(
                     media, lambda x: x['edge_media_to_caption']['edges'][0]['node']['text'],
                     compat_str) or media.get('caption')
@@ -164,7 +175,7 @@ class InstagramIE(InfoExtractor):
                     'timestamp': int_or_none(comment.get('created_at')),
                 } for comment in media.get(
                     'comments', {}).get('nodes', []) if comment.get('text')]
-                if not video_url:
+                if not media_url:
                     edges = try_get(
                         media, lambda x: x['edge_sidecar_to_children']['edges'],
                         list) or []
@@ -191,11 +202,11 @@ class InstagramIE(InfoExtractor):
                             'Post by %s' % uploader_id if uploader_id else None,
                             description)
 
-        if not video_url:
-            video_url = self._og_search_video_url(webpage, secure=False)
+        if not media_url:
+            media_url = self._og_search_video_url(webpage, secure=False)
 
         formats = [{
-            'url': video_url,
+            'url': media_url,
             'width': width,
             'height': height,
         }]

From 92ecd66a20881d59bb83d08e746e6a75ac0b460d Mon Sep 17 00:00:00 2001
From: David Heller <david@ehellers.com>
Date: Mon, 30 Mar 2020 17:24:30 -0700
Subject: [PATCH 2/2] Correcting title & ext

---
 youtube_dl/extractor/instagram.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/instagram.py b/youtube_dl/extractor/instagram.py
index d08e1cba1..76ebecc92 100644
--- a/youtube_dl/extractor/instagram.py
+++ b/youtube_dl/extractor/instagram.py
@@ -126,6 +126,9 @@ class InstagramIE(InfoExtractor):
          uploader_id, like_count, comment_count, comments, height,
          width) = [None] * 11
 
+        ext = 'mp4'
+        media_type = 'Video'
+
         shared_data = self._parse_json(
             self._search_regex(
                 r'window\._sharedData\s*=\s*({.+?});',
@@ -148,10 +151,15 @@ class InstagramIE(InfoExtractor):
 
                 elif media.get('display_resources'):
                     display_resource = media['display_resources'][-1]  # choosing highest resolution
+
                     media_url = display_resource.get('src')
                     height = int_or_none(display_resource.get('config_height'))
                     width = int_or_none(display_resource.get('config_width'))
 
+                    if media_url:
+                        ext = media_url.split('?', 1)[0].rsplit('.', 1)[-1]
+                        media_type = 'Image'
+
                 description = try_get(
                     media, lambda x: x['edge_media_to_caption']['edges'][0]['node']['text'],
                     compat_str) or media.get('caption')
@@ -228,8 +236,8 @@ class InstagramIE(InfoExtractor):
         return {
             'id': video_id,
             'formats': formats,
-            'ext': 'mp4',
-            'title': 'Video by %s' % uploader_id,
+            'ext': ext,
+            'title': '%s by %s' % (media_type, uploader_id),
             'description': description,
             'thumbnail': thumbnail,
             'timestamp': timestamp,