From 9fb112faa8bcb3dd1b1f9d4fd8e610c02044e8ba Mon Sep 17 00:00:00 2001 From: Thomas <71355143+thomas694@users.noreply.github.com> Date: Sat, 20 Feb 2021 10:17:57 +0100 Subject: [PATCH] Fix issue 892 Save content using original filenames (PR 893) (#1025) - When a post contained sidecars, the filename for caption, json etc. was changed. It was no longer the original filename like before. - If the post contains sidecars, a local variable is used to build the filenames for the sidecar media. --- instaloader/instaloader.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/instaloader/instaloader.py b/instaloader/instaloader.py index 90ff125..dcada87 100644 --- a/instaloader/instaloader.py +++ b/instaloader/instaloader.py @@ -563,23 +563,20 @@ class Instaloader: post.get_sidecar_nodes(self.slide_start, self.slide_end), start=post.mediacount if self.slide_start < 0 else self.slide_start + 1 ): + suffix = str(edge_number) # type: Optional[str] + if '{filename}' in self.filename_pattern: + suffix = None if self.download_pictures and (not sidecar_node.is_video or self.download_video_thumbnails): - suffix = str(edge_number) - if '{filename}' in self.filename_pattern: - suffix = '' # pylint:disable=cell-var-from-loop - filename = self.__prepare_filename(filename_template, lambda: sidecar_node.display_url) + sidecar_filename = self.__prepare_filename(filename_template, lambda: sidecar_node.display_url) # Download sidecar picture or video thumbnail (--no-pictures implies --no-video-thumbnails) - downloaded &= self.download_pic(filename=filename, url=sidecar_node.display_url, + downloaded &= self.download_pic(filename=sidecar_filename, url=sidecar_node.display_url, mtime=post.date_local, filename_suffix=suffix) if sidecar_node.is_video and self.download_videos: - suffix = str(edge_number) - if '{filename}' in self.filename_pattern: - suffix = '' # pylint:disable=cell-var-from-loop - filename = self.__prepare_filename(filename_template, lambda: sidecar_node.video_url) + sidecar_filename = self.__prepare_filename(filename_template, lambda: sidecar_node.video_url) # Download sidecar video if desired - downloaded &= self.download_pic(filename=filename, url=sidecar_node.video_url, + downloaded &= self.download_pic(filename=sidecar_filename, url=sidecar_node.video_url, mtime=post.date_local, filename_suffix=suffix) elif post.typename == 'GraphImage': # Download picture