erjemin/instaloader
1
0
Fork 0
Code Issues Wiki Activity

Merge branch 'master' into upcoming/v4.7

Browse Source
This commit is contained in:
Alexander Graf
2021-02-24 16:10:27 +01:00
parent a2d756b177 0f11ef1bdd
commit 8f594a3a30
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
instaloader/__init__.py
View File

@@ -1,7 +1,7 @@
"""Download pictures (or videos) along with their captions and other metadata from Instagram."""
__version__ = '4.6.1'
__version__ = '4.6.2'
try:

8
instaloader/instaloader.py
View File

@@ -599,15 +599,15 @@ class Instaloader:
suffix = None
if self.download_pictures and (not sidecar_node.is_video or self.download_video_thumbnails):
# 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:
# 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)
else:
downloaded = False

4
instaloader/structures.py
View File

@@ -296,7 +296,7 @@ class Post:
end = len(edges)-1
if start < 0:
start = len(edges)-1
if any(self.get_is_videos()[start:(end+1)]):
if any(edge['node']['is_video'] and 'video_url' not in edge['node'] for edge in edges):
# video_url is only present in full metadata, issue #558.
edges = self._full_metadata['edge_sidecar_to_children']['edges']
for idx, edge in enumerate(edges):
@@ -854,7 +854,7 @@ class Profile:
self._obtain_metadata()
return NodeIterator(
self._context,
'472f257a40c653c64c666ce877d59d2b',
'003056d32c2554def87228bc3fd9668a',
lambda d: d['data']['user']['edge_owner_to_timeline_media'],
lambda n: Post(self._context, n, self),
{'id': self.userid},