fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 21:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add display format option to config file.

Browse source
This commit is contained in:
Joaquin 2020-10-05 23:50:24 -05:00 • committed by Jonathan Wren
parent 758d913376
commit 7d0b4b6b19
No known key found for this signature in database
GPG key ID: 43D5FF8722E7F68A
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/advanced.md
View file

@ -38,6 +38,9 @@ and can be edited with a plain text editor.
controls the width of the output. Set to `false` if you don't want to wrap long lines. controls the width of the output. Set to `false` if you don't want to wrap long lines.
- `colors` - `colors`
dictionary that controls the colors used to display journal entries. It has four subkeys, which are: `body`, `date`, `tags`, and `title`. Current valid values are: `BLACK`, `RED`, `GREEN`, `YELLOW`, `BLUE`, `MAGENTA`, `CYAN`, `WHITE`, and `NONE`. `colorama.Fore` is used for colorization, and you can find the [docs here](https://github.com/tartley/colorama#colored-output). To disable colored output, set the value to `NONE`. If you set the value of any color subkey to an invalid color, no color will be used. dictionary that controls the colors used to display journal entries. It has four subkeys, which are: `body`, `date`, `tags`, and `title`. Current valid values are: `BLACK`, `RED`, `GREEN`, `YELLOW`, `BLUE`, `MAGENTA`, `CYAN`, `WHITE`, and `NONE`. `colorama.Fore` is used for colorization, and you can find the [docs here](https://github.com/tartley/colorama#colored-output). To disable colored output, set the value to `NONE`. If you set the value of any color subkey to an invalid color, no color will be used.
- `display_format`
specifies formatter to use, formatters available are:
`boxed`, `fancy`, `json`, `markdown`, `md`, `tags`, `text`, `txt`, `xml`, or `yaml`.
!!! note !!! note
Although it seems intuitive to use the `#` Although it seems intuitive to use the `#`

1
jrnl/Journal.py
View file

@ -35,6 +35,7 @@ class Journal:
"highlight": True, "highlight": True,
"linewrap": 80, "linewrap": 80,
"indent_character": "|", "indent_character": "|",
"display_format": "text",
} }
self.config.update(kwargs) self.config.update(kwargs)
# Set up date parser # Set up date parser

1
jrnl/install.py
View file

@ -49,6 +49,7 @@ default_config = {
"linewrap": 79, "linewrap": 79,
"indent_character": "|", "indent_character": "|",
"colors": {"date": "none", "title": "none", "body": "none", "tags": "none",}, "colors": {"date": "none", "title": "none", "body": "none", "tags": "none",},
"display_format": "text",
} }

9
jrnl/jrnl.py
View file

@ -290,7 +290,7 @@ def _delete_search_results(journal, old_entries, **kwargs):
journal.write() journal.write()
def _display_search_results(args, journal, **kwargs): def _display_search_results(args, journal, config, **kwargs):
if args.short: if args.short:
print(journal.pprint(short=True)) print(journal.pprint(short=True))
@ -300,7 +300,8 @@ def _display_search_results(args, journal, **kwargs):
elif args.export: elif args.export:
exporter = plugins.get_exporter(args.export) exporter = plugins.get_exporter(args.export)
print(exporter.export(journal, args.filename)) print(exporter.export(journal, args.filename))
else: else:
# Default display mode # Display according display_format config option
print(journal.pprint()) config_selected = config.get("display_format", journal.config["display_format"])
exporter = plugins.get_exporter(config_selected)
print(exporter.export(journal, args.filename))