Merge branch 'master' into upcoming/v4.10

This commit is contained in:
Alexander Graf 2023-07-10 07:15:36 +02:00
commit 4c6a184390
2 changed files with 2 additions and 1 deletions

View File

@ -124,6 +124,7 @@ Supporters
.. current-sponsors-start .. current-sponsors-start
| Instaloader is proudly sponsored by | Instaloader is proudly sponsored by
| `@rocketapi-io <https://github.com/rocketapi-io>`__
| `@socialmethod <https://github.com/socialmethod>`__ | `@socialmethod <https://github.com/socialmethod>`__
See `Alex' GitHub Sponsors <https://github.com/sponsors/aandergr>`__ page for See `Alex' GitHub Sponsors <https://github.com/sponsors/aandergr>`__ page for

View File

@ -289,7 +289,7 @@ def resumable_iteration(context: InstaloaderContext,
is_resuming = True is_resuming = True
start_index = iterator.total_index start_index = iterator.total_index
context.log("Resuming from {}.".format(resume_file_path)) context.log("Resuming from {}.".format(resume_file_path))
except (InvalidArgumentException, LZMAError, json.decoder.JSONDecodeError) as exc: except (InvalidArgumentException, LZMAError, json.decoder.JSONDecodeError, EOFError) as exc:
context.error("Warning: Not resuming from {}: {}".format(resume_file_path, exc)) context.error("Warning: Not resuming from {}: {}".format(resume_file_path, exc))
try: try:
yield is_resuming, start_index yield is_resuming, start_index