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

Some improvements for the new json export #1313

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Some improvements for the new json export #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e73ec3a
update json doc formatting
geier Oct 30, 2023
3b4e024
simplying json code path
geier Oct 30, 2023
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
9 changes: 3 additions & 6 deletions doc/source/usage.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,7 @@ Several options are common to almost all of :program:`khal`'s commands
Works similar to :option:`--format`, but instead of defining a format string a JSON
object is created for each specified field. The matching events are collected into
a JSON array. This option accepts the following subset of :option:`--format`
template options

::
template options::

title, description, uid, start, start-long, start-date,
start-date-long, start-time, end, end-long, end-date,
Expand All @@ -233,7 +231,7 @@ Several options are common to almost all of :program:`khal`'s commands
Below is an example command which prints a JSON list of objects containing the title and
description of all events today.

::
.. code-block:: console

khal list --json title --json description

Expand Down Expand Up @@ -275,8 +273,7 @@ Commands
list
****
shows all events scheduled for a given date (or datetime) range, with custom
formatting:
::
formatting::

khal list [-a CALENDAR ... | -d CALENDAR ...]
[--format FORMAT] [--json FIELD ...] [--day-format DAYFORMAT]
Expand Down
5 changes: 2 additions & 3 deletions khal/controllers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,7 @@ def khal_list(
if agenda_format is None:
agenda_format = conf['view']['agenda_event_format']

json_mode = json is not None and len(json) > 0
if json_mode:
if json:
formatter = json_formatter(json)
colors = False
else:
Expand Down Expand Up @@ -313,7 +312,7 @@ def khal_list(
seen=once,
colors=colors,
)
if day_format and (conf['default']['show_all_days'] or current_events) and not json_mode:
if day_format and (conf['default']['show_all_days'] or current_events) and not json:
if len(event_column) != 0 and conf['view']['blank_line_before_day']:
event_column.append('')
event_column.append(format_day(start.date(), day_format, conf['locale']))
Expand Down