Fix KeyError when generating NodeUnavailable error

Fixes #32.
This commit is contained in:
Alexander Graf 2017-08-13 12:51:39 +02:00
parent a894c2d206
commit adeb588471

View File

@ -868,7 +868,7 @@ class Instaloader:
download_comments=download_comments) download_comments=download_comments)
except NodeUnavailableException: except NodeUnavailableException:
print("Unable to download node \"https://www.instagram.com/p/{}/\" of user {} from feed." print("Unable to download node \"https://www.instagram.com/p/{}/\" of user {} from feed."
.format(node['shortcode'], name), file=sys.stderr) .format(node['shortcode'] if 'shortcode' in node else node['code'], name), file=sys.stderr)
continue continue
if fast_update and not downloaded: if fast_update and not downloaded:
return return
@ -917,7 +917,8 @@ class Instaloader:
download_comments=download_comments) download_comments=download_comments)
except NodeUnavailableException: except NodeUnavailableException:
print("Unable to download node \"https://www.instagram.com/p/{}/\" " print("Unable to download node \"https://www.instagram.com/p/{}/\" "
"while downloading hashtag \"{}\".".format(node['shortcode'], hashtag), file=sys.stderr) "while downloading hashtag \"{}\"."
.format(node['shortcode'] if 'shortcode' in node else node['code'], hashtag), file=sys.stderr)
continue continue
if fast_update and not downloaded: if fast_update and not downloaded:
return return
@ -1034,7 +1035,7 @@ class Instaloader:
download_comments=download_comments) download_comments=download_comments)
except NodeUnavailableException: except NodeUnavailableException:
print("Unable to download node \"https://www.instagram.com/p/{}/\" of user {}." print("Unable to download node \"https://www.instagram.com/p/{}/\" of user {}."
.format(node['shortcode'], name), file=sys.stderr) .format(node['shortcode'] if 'shortcode' in node else node['code'], name), file=sys.stderr)
continue continue
if fast_update and not downloaded: if fast_update and not downloaded:
return return