Fix #744 #746
Merged
Fix #744 #746
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Inside `menu_fanbox_download_by_post_id`, move `post = __br__.fanboxGetPostById(post_id)` to inside the following `try... except...`, for which added logic for `KeyboardInterrupt`
2. Inside `processFanboxArtistById`
- `set_console_title` is called before `artist = __br__.fanboxGetArtistById(id)`, which is now wrapped with `try... except...` in case of error.
- changed `print(pex)` to `PixivHelper.print_and_log("error", "Error getting FANBOX posts of artist: {0} ==> {1}".format(artist, pex.message))`
- in loop for each post, `processFanboxPost(post, artist)` is now wrapped with `try... except...`, which will catch and process `KeyboardInterrupt`
- a=a+b is changed to a+=b
3. Inside `processFanboxPost`, in case `KeyboardInterrupt` is triggered during `download_image`, added logic to check the return result, and raise `KeyboardInterrupt` if it is equivalent to `PixivConstant.PIXIVUTIL_ABORTED`
|
I think I should be using the |
|
refactor out the process fanbox in commit da02c18 |
|
Wow. That was fast. Thank you for your work. |
ghost
mentioned this pull request
byjtje
pushed a commit
to byjtje/PixivUtil2
that referenced
this pull request
Oct 30, 2020
1. Inside `menu_fanbox_download_by_post_id`, move `post = __br__.fanboxGetPostById(post_id)` to inside the following `try... except...`, for which added logic for `KeyboardInterrupt`
2. Inside `processFanboxArtistById`
- `set_console_title` is called before `artist = __br__.fanboxGetArtistById(id)`, which is now wrapped with `try... except...` in case of error.
- changed `print(pex)` to `PixivHelper.print_and_log("error", "Error getting FANBOX posts of artist: {0} ==> {1}".format(artist, pex.message))`
- in loop for each post, `processFanboxPost(post, artist)` is now wrapped with `try... except...`, which will catch and process `KeyboardInterrupt`
- a=a+b is changed to a+=b
3. Inside `processFanboxPost`, in case `KeyboardInterrupt` is triggered during `download_image`, added logic to check the return result, and raise `KeyboardInterrupt` if it is equivalent to `PixivConstant.PIXIVUTIL_ABORTED`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ideally this would do.
menu_fanbox_download_by_post_id, movepost = __br__.fanboxGetPostById(post_id)to inside the followingtry... except..., for which added logic forKeyboardInterrupt(?)processFanboxArtistByIdset_console_titleis called beforeartist = __br__.fanboxGetArtistById(id), which is now wrapped withtry... except...in case of error.print(pex)toPixivHelper.print_and_log("error", "Error getting FANBOX posts of artist: {0} ==> {1}".format(artist, pex.message))processFanboxPost(post, artist)is now wrapped withtry... except..., which will catch and processKeyboardInterruptprocessFanboxPost, in caseKeyboardInterruptis triggered duringdownload_image, added logic to check the return result, and raiseKeyboardInterruptif it is equivalent toPixivConstant.PIXIVUTIL_ABORTED