Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ask for password before adding entry instead of after #951

Merged
merged 4 commits into from
May 16, 2020
Merged

Ask for password before adding entry instead of after #951

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c34a123
ask for password before adding entry (#799)
ollybritton May 12, 2020
991c59b
ask for password before adding entry (#799)
ollybritton May 12, 2020
e9313ca
fix typo in 'finally'
ollybritton May 16, 2020
204ede1
Merge branch 'develop' of https://github.com/ollybritton/jrnl into de…
ollybritton May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions jrnl/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,13 @@ def run(manual_args=None):
else:
_exit_multiline_code = "press Ctrl+D"

# This is where we finally open the journal!
try:
journal = open_journal(journal_name, config)
except KeyboardInterrupt:
print("[Interrupted while opening journal]", file=sys.stderr)
sys.exit(1)

if mode_compose and not args.text:
if not sys.stdin.isatty():
# Piping data into jrnl
Expand Down Expand Up @@ -376,13 +383,6 @@ def run(manual_args=None):
else:
sys.exit()

# This is where we finally open the journal!
try:
journal = open_journal(journal_name, config)
except KeyboardInterrupt:
print("[Interrupted while opening journal]", file=sys.stderr)
sys.exit(1)

# Import mode
if mode_import:
plugins.get_importer(args.import_).import_(journal, args.input)
Expand Down