Skip to content

Commit

Permalink
Fixed error related to display_format in config file
Browse files Browse the repository at this point in the history
Now _display_search_results tries to source the export arg from the
config file before dispaying search results.
  • Loading branch information
apainintheneck committed Jun 4, 2022
1 parent 19d579f commit 369142d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
14 changes: 7 additions & 7 deletions jrnl/jrnl.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,20 +373,20 @@ def _change_time_search_results(args, journal, old_entries, no_prompt=False, **k


def _display_search_results(args, journal, **kwargs):
if args.short or args.export == "short":
# Get export format from config file if not provided at the command line
args.export = args.export or kwargs["config"].get("display_format")

if args.tags:
print(plugins.get_exporter("tags").export(journal))

elif args.short or args.export == "short":
print(journal.pprint(short=True))

elif args.export == "pretty":
print(journal.pprint())

elif args.tags:
print(plugins.get_exporter("tags").export(journal))

elif args.export:
exporter = plugins.get_exporter(args.export)
print(exporter.export(journal, args.filename))
elif kwargs["config"].get("display_format"):
exporter = plugins.get_exporter(kwargs["config"]["display_format"])
print(exporter.export(journal, args.filename))
else:
print(journal.pprint())
1 change: 1 addition & 0 deletions tests/unit/test_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def test_export_format(mock_args, export_format):

test_journal = jrnl.Journal.Journal
mock_args.export = export_format
mock_args.tags = None
#fmt: off
# see: https://github.com/psf/black/issues/664
with mock.patch("builtins.print") as mock_spy_print, \
Expand Down

0 comments on commit 369142d

Please sign in to comment.