github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[instagram] provide 'date' for 'carousel_media' files (#2660)

Browse Source
This commit is contained in:
Mike Fährmann
2022-06-06 18:17:45 +02:00
parent 2064f20e11
commit 47a92c8c7e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gallery_dl/extractor/instagram.py
View File

@@ -288,35 +288,35 @@ class InstagramExtractor(Extractor):
def _parse_post_api(self, post): def _parse_post_api(self, post):
if "media" in post: if "media" in post:
media = post["media"] post = post["media"]
owner = media["user"]
data = { data = {
"post_id" : media["pk"], "post_id" : post["pk"],
"post_shortcode": shortcode_from_id(media["pk"]), "post_shortcode": shortcode_from_id(post["pk"]),
} }
if "carousel_media" in media: if "carousel_media" in post:
post["items"] = media["carousel_media"] items = post["carousel_media"]
data["sidecar_media_id"] = data["post_id"] data["sidecar_media_id"] = data["post_id"]
data["sidecar_shortcode"] = data["post_shortcode"] data["sidecar_shortcode"] = data["post_shortcode"]
else: else:
post["items"] = (media,) items = (post,)
else: else:
items = post["items"]
reel_id = str(post["id"]).rpartition(":")[2] reel_id = str(post["id"]).rpartition(":")[2]
owner = post["user"]
data = { data = {
"expires" : text.parse_timestamp(post.get("expiring_at")), "expires" : text.parse_timestamp(post.get("expiring_at")),
"post_id" : reel_id, "post_id" : reel_id,
"post_shortcode": shortcode_from_id(reel_id), "post_shortcode": shortcode_from_id(reel_id),
} }
owner = post["user"]
data["owner_id"] = owner["pk"] data["owner_id"] = owner["pk"]
data["username"] = owner.get("username") data["username"] = owner.get("username")
data["fullname"] = owner.get("full_name") data["fullname"] = owner.get("full_name")
data["_files"] = files = [] data["_files"] = files = []
for num, item in enumerate(post["items"], 1): for num, item in enumerate(items, 1):
image = item["image_versions2"]["candidates"][0] image = item["image_versions2"]["candidates"][0]
@@ -333,7 +333,8 @@ class InstagramExtractor(Extractor):
media = { media = {
"num" : num, "num" : num,
"date" : text.parse_timestamp(item.get("taken_at") or "date" : text.parse_timestamp(item.get("taken_at") or
media.get("taken_at")), media.get("taken_at") or
post.get("taken_at")),
"media_id" : item["pk"], "media_id" : item["pk"],
"shortcode" : (item.get("code") or "shortcode" : (item.get("code") or
shortcode_from_id(item["pk"])), shortcode_from_id(item["pk"])),