Fix fast_update in case of no download
If Instaloader was called with --fast-update and encountered a post where nothing has been downloaded because of flags that disable download of certain types of media, the download was aborted. This behavior is now fixed. Closes #183.
This commit is contained in:
parent
b7ea0d5953
commit
41e734e1b8
@ -358,18 +358,18 @@ class Instaloader:
|
|||||||
os.makedirs(os.path.dirname(filename), exist_ok=True)
|
os.makedirs(os.path.dirname(filename), exist_ok=True)
|
||||||
|
|
||||||
# Download the image(s) / video thumbnail and videos within sidecars if desired
|
# Download the image(s) / video thumbnail and videos within sidecars if desired
|
||||||
downloaded = False
|
downloaded = True
|
||||||
if self.download_pictures:
|
if self.download_pictures:
|
||||||
if post.typename == 'GraphSidecar':
|
if post.typename == 'GraphSidecar':
|
||||||
edge_number = 1
|
edge_number = 1
|
||||||
for sidecar_node in post.get_sidecar_nodes():
|
for sidecar_node in post.get_sidecar_nodes():
|
||||||
# Download picture or video thumbnail
|
# Download picture or video thumbnail
|
||||||
if not sidecar_node.is_video or self.download_video_thumbnails is True:
|
if not sidecar_node.is_video or self.download_video_thumbnails is True:
|
||||||
downloaded |= self.download_pic(filename=filename, url=sidecar_node.display_url,
|
downloaded &= self.download_pic(filename=filename, url=sidecar_node.display_url,
|
||||||
mtime=post.date_local, filename_suffix=str(edge_number))
|
mtime=post.date_local, filename_suffix=str(edge_number))
|
||||||
# Additionally download video if available and desired
|
# Additionally download video if available and desired
|
||||||
if sidecar_node.is_video and self.download_videos is True:
|
if sidecar_node.is_video and self.download_videos is True:
|
||||||
downloaded |= self.download_pic(filename=filename, url=sidecar_node.video_url,
|
downloaded &= self.download_pic(filename=filename, url=sidecar_node.video_url,
|
||||||
mtime=post.date_local, filename_suffix=str(edge_number))
|
mtime=post.date_local, filename_suffix=str(edge_number))
|
||||||
edge_number += 1
|
edge_number += 1
|
||||||
elif post.typename == 'GraphImage':
|
elif post.typename == 'GraphImage':
|
||||||
@ -387,7 +387,7 @@ class Instaloader:
|
|||||||
|
|
||||||
# Download video if desired
|
# Download video if desired
|
||||||
if post.is_video and self.download_videos is True:
|
if post.is_video and self.download_videos is True:
|
||||||
downloaded |= self.download_pic(filename=filename, url=post.video_url, mtime=post.date_local)
|
downloaded &= self.download_pic(filename=filename, url=post.video_url, mtime=post.date_local)
|
||||||
|
|
||||||
# Download geotags if desired
|
# Download geotags if desired
|
||||||
if self.download_geotags and post.location:
|
if self.download_geotags and post.location:
|
||||||
|
@ -63,6 +63,12 @@ class TestInstaloaderAnonymously(unittest.TestCase):
|
|||||||
def test_hashtag_download(self):
|
def test_hashtag_download(self):
|
||||||
self.L.download_hashtag(HASHTAG, NORMAL_MAX_COUNT)
|
self.L.download_hashtag(HASHTAG, NORMAL_MAX_COUNT)
|
||||||
|
|
||||||
|
def test_hashtag_paging(self):
|
||||||
|
for count, post in enumerate(self.L.get_hashtag_posts(HASHTAG)):
|
||||||
|
print(post)
|
||||||
|
if count == PAGING_MAX_COUNT:
|
||||||
|
break
|
||||||
|
|
||||||
def test_get_id_by_username(self):
|
def test_get_id_by_username(self):
|
||||||
self.assertEqual(PUBLIC_PROFILE_ID,
|
self.assertEqual(PUBLIC_PROFILE_ID,
|
||||||
instaloader.Profile.from_username(self.L.context, PUBLIC_PROFILE).userid)
|
instaloader.Profile.from_username(self.L.context, PUBLIC_PROFILE).userid)
|
||||||
|
Loading…
Reference in New Issue
Block a user