Ask for password before adding entry instead of after #951
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
This fixes jrnl-org#799 because previously it would allow you to create an entry using your editor and then attempt to open the journal. This behaviour is fine for unencrypted journals but with encrypted journals it means that if you get the password wrong three times then the entry you just wrote is lost. Swapping the order around so that the entry is opened first in the code and then the editor is added means that this can't happen.
micahellison
requested changes
May 16, 2020
jrnl/cli.py
Outdated
| @@ -345,6 +345,13 @@ def run(manual_args=None): | |||
| else: | |||
| _exit_multiline_code = "press Ctrl+D" | |||
|
|
|||
| # This is where we fi±nally open the journal! | |||
There was a problem hiding this comment.
This is really minor, but could please remove the typo in "finally"?
micahellison
changed the title
|
Thanks for making my first contribution to open source a good experience! |
|
Thanks for contributing! ❤️ |
|
Thanks for picking our project for your first contribution! |
wren
pushed a commit
that referenced
this pull request
Jul 25, 2020
* ask for password before adding entry (#799) This fixes #799 because previously it would allow you to create an entry using your editor and then attempt to open the journal. This behaviour is fine for unencrypted journals but with encrypted journals it means that if you get the password wrong three times then the entry you just wrote is lost. Swapping the order around so that the entry is opened first in the code and then the editor is added means that this can't happen.
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.
This hopefully fixes #799 because prviously it would allow you to create an entry using your editor and then attempt to open the journal. This behaviour is fine for unecrypted journals but with encrypted journals it means that if you get the password wrong three times then the entry you wrote is lost.
Swapping the code around so that it attempts to open the journal before it opens an editor means that this can't happen. This should solve #270, #256 and #284 too.
It appears that this was the behaviour in earlier versions of
jrnlbut I'm assuming that this got lost after a rewrite.This is my first time contributing to open source so I apologise if I've formatted anything wrong or made a big mistake but I'm not really sure what the process is yet and would be happy to fix anything that I did incorrectly.
Checklist
poetry run behaveblack (consistent code styling). --
poetry run black --check . --verbose --diff(logically errors and unused imports). --
poetry run pyflakes jrnl featuresPull Requests for the same update/change?
us to include them?