From 369142d641394b2204ab1d2558b7f5df7b96ee39 Mon Sep 17 00:00:00 2001 From: apainintheneck Date: Sat, 4 Jun 2022 10:52:49 -0700 Subject: [PATCH] Fixed error related to display_format in config file Now _display_search_results tries to source the export arg from the config file before dispaying search results. --- jrnl/jrnl.py | 14 +++++++------- tests/unit/test_display.py | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py index 1c536a37..efdf0689 100644 --- a/jrnl/jrnl.py +++ b/jrnl/jrnl.py @@ -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()) diff --git a/tests/unit/test_display.py b/tests/unit/test_display.py index 921d1631..58f4c9c0 100644 --- a/tests/unit/test_display.py +++ b/tests/unit/test_display.py @@ -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, \