mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 08:38:32 +02:00
Add --config-override feature
* add test and argument handler for runtime override of configurations.
* identify location to apply override in "main"
* update gitignore
* remove unneeded import
* add jrnl interface test for overriden configurations
* trivial whitespace change
* implement runtime override
* make format
* refactor override unittest
* clean up unused import
* start writing integration test
* add linewrap override scenario
* implement editor override step
* add dev dependencies on pytest -mock and -cov
* make format
* remove unused imports
* make format
* rename --override to --config-override
* move override implementation into own module
* begin TDD of dot notated overrides
* rewrite behavior scenario
* implement recursive config overrides
* clean up unittests
* iterate on behave step
* make format
* cleanup
* move override behave tests out of core
* refactor recursive code
* make format
* code cleanup
* remove unused import
* update test config
* rewrite test for better mock call expect
* make format
* binary search misbehaving windows test
* unittest multiple overrides
* uncomment dot notation unittest
* add multiple override scenario spec
* make format
* make format
* update unittests for new syntax
* update integ tests for new syntax
* update gitignore
* guard override application
* deserialize function as return type
* make format
* organize deserialization unittests
* better, more specific behave tests
* test different editor launch commands
* formatting
* handle datatypes in deserialization and update helptext
* stick to config convention in testbed
* update tests ith better verifications
* make format
* space
* review feedbac
* make format
* skip on win
* update deps
* update tests with better verifications
make format
space
review feedbac
* skip on win
* update deps
* refactor deserialization
organize test_parse_args
make format
* skip on win
* refactor deserialization
organize test_parse_args
make format
* update tests ith better verifications
* make format
* space
* make format
* document apply_overrides
* update gitignore
* document config-override enhancement
* Simplify config override syntax (#5)
* update tests and expected behavior
* clean up arg parsing tests
* update deserialization
* update deserialization
* config argparse action
* update override application logic
* update tests; delete unused imports
* override param must be list
* update docstring
* update test input to SUT
* update remaining override unittests
* make format
* forgot to update CLI syntax
* update documentation to sphinx style
* variable renames
* Lockfile merge (#7)
* Add brew and gitter badges to README
* Update changelog [ci skip]
* Make journal selection behavior more consistent when there's a colon with no date (#1164)
* Simplify config override syntax (#8)
* update tests and expected behavior
* clean up arg parsing tests
* update deserialization
* update deserialization
* config argparse action
* update override application logic
* update tests; delete unused imports
* override param must be list
* update docstring
* update test input to SUT
* update remaining override unittests
* make format
* forgot to update CLI syntax
* formatting
* Update pyproject.toml
* update lockfile to remove pytest-cov and pytest-mock deps
* update docs
* reuse existing mock; delete unneeded code
* move overrides earlier in the execution
use existing configs instead of custom
make format
clean up imports
* update for passworded access
context.parser -> parsed_args
* test that no editor is launched
* remove unnecessary mocks
* rename variable for intent
* reinstate getpass deletion
* update gitignore
* capture failure mode
* remove unneeded imports
* renamed variable
* delete redundant step
* comment on step
* clean up step behavior description
* [WIP] lock down journal access behavior
* skip -> wip
* correct command for overriding journal via dot keys
* update wip test for updating a "temp" journal and then reading baack its entries
* remove "mock" from poetry file
* make CI happy
* complex behavior sequence for default journal override
* separate out smaller pieces of logic
test that apply_overrides acts on base configuration and not the copy
* defer modification of loaded configuration to update_config
remove unused fixtures
delete complicated UT since behavior is covered in overrides.feature integ test
delete redundant UT
* Update .gitignore
* remove skip_win
* forward override unpacking to yaml library
* merge config override step with existing config_var step in core
delete config_override step
unify step description syntax
* delete unused and redundant code
* rebases are hard
* remove wip tag from test
* remove skipped tests for windows
* Address code review
yield -> return
remove needless copy
adjust spacing
re-inline args return
reset packaging info to e6c0a16342
revert package version for this PR
* consolidate imports
* Defer config_override unpacking to dict *after* base config is loaded
store cli overrides without unpacking just yet
move deserialize_config_args to config module
delete custom Action class for config operations
apply [k,v] -> {k, v} for each override
update test data
update import
* rename deserialize_config_args to better express intent
make format
344 lines
10 KiB
Python
344 lines
10 KiB
Python
# Copyright (C) 2012-2021 jrnl contributors
|
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
import argparse
|
|
import re
|
|
import textwrap
|
|
|
|
from .commands import postconfig_decrypt
|
|
from .commands import postconfig_encrypt
|
|
from .commands import postconfig_import
|
|
from .commands import postconfig_list
|
|
from .commands import preconfig_diagnostic
|
|
from .commands import preconfig_version
|
|
from .output import deprecated_cmd
|
|
from .plugins import EXPORT_FORMATS
|
|
from .plugins import IMPORT_FORMATS
|
|
from .plugins import util
|
|
|
|
|
|
class WrappingFormatter(argparse.RawTextHelpFormatter):
|
|
"""Used in help screen"""
|
|
|
|
def _split_lines(self, text, width):
|
|
text = text.split("\n\n")
|
|
text = map(lambda t: self._whitespace_matcher.sub(" ", t).strip(), text)
|
|
text = map(lambda t: textwrap.wrap(t, width=56), text)
|
|
text = [item for sublist in text for item in sublist]
|
|
return text
|
|
|
|
|
|
def parse_args(args=[]):
|
|
"""
|
|
Argument parsing that is doable before the config is available.
|
|
Everything else goes into "text" for later parsing.
|
|
"""
|
|
parser = argparse.ArgumentParser(
|
|
formatter_class=WrappingFormatter,
|
|
add_help=False,
|
|
description="Collect your thoughts and notes without leaving the command line",
|
|
epilog=textwrap.dedent(
|
|
"""
|
|
Thank you to all of our contributors! Come see the whole list of code and
|
|
financial contributors at https://github.com/jrnl-org/jrnl. And special
|
|
thanks to Bad Lip Reading for the Yoda joke in the Writing section above."""
|
|
),
|
|
)
|
|
|
|
optional = parser.add_argument_group("Optional Arguments")
|
|
optional.add_argument(
|
|
"--debug",
|
|
dest="debug",
|
|
action="store_true",
|
|
help="Print information useful for troubleshooting",
|
|
)
|
|
|
|
standalone = parser.add_argument_group(
|
|
"Standalone Commands",
|
|
"These commands will exit after they complete. You may only run one at a time.",
|
|
)
|
|
standalone.add_argument("--help", action="help", help="Show this help message")
|
|
standalone.add_argument("-h", action="help", help=argparse.SUPPRESS)
|
|
standalone.add_argument(
|
|
"--version",
|
|
action="store_const",
|
|
const=preconfig_version,
|
|
dest="preconfig_cmd",
|
|
help="Print version information",
|
|
)
|
|
standalone.add_argument(
|
|
"-v",
|
|
action="store_const",
|
|
const=preconfig_version,
|
|
dest="preconfig_cmd",
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
standalone.add_argument(
|
|
"--diagnostic",
|
|
action="store_const",
|
|
const=preconfig_diagnostic,
|
|
dest="preconfig_cmd",
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
standalone.add_argument(
|
|
"--list",
|
|
action="store_const",
|
|
const=postconfig_list,
|
|
dest="postconfig_cmd",
|
|
help="List all configured journals",
|
|
)
|
|
standalone.add_argument(
|
|
"--ls",
|
|
action="store_const",
|
|
const=postconfig_list,
|
|
dest="postconfig_cmd",
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
standalone.add_argument(
|
|
"-ls",
|
|
action="store_const",
|
|
const=lambda **kwargs: deprecated_cmd(
|
|
"-ls", "--list or --ls", callback=postconfig_list, **kwargs
|
|
),
|
|
dest="postconfig_cmd",
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
standalone.add_argument(
|
|
"--encrypt",
|
|
help="Encrypt selected journal with a password",
|
|
action="store_const",
|
|
metavar="TYPE",
|
|
const=postconfig_encrypt,
|
|
dest="postconfig_cmd",
|
|
)
|
|
standalone.add_argument(
|
|
"--decrypt",
|
|
help="Decrypt selected journal and store it in plain text",
|
|
action="store_const",
|
|
metavar="TYPE",
|
|
const=postconfig_decrypt,
|
|
dest="postconfig_cmd",
|
|
)
|
|
standalone.add_argument(
|
|
"--import",
|
|
action="store_const",
|
|
metavar="TYPE",
|
|
const=postconfig_import,
|
|
dest="postconfig_cmd",
|
|
help=f"""
|
|
Import entries from another journal.
|
|
|
|
Optional parameters:
|
|
|
|
--file FILENAME (default: uses stdin)
|
|
|
|
--format [{util.oxford_list(IMPORT_FORMATS)}] (default: jrnl)
|
|
""",
|
|
)
|
|
standalone.add_argument(
|
|
"--file",
|
|
metavar="FILENAME",
|
|
dest="filename",
|
|
help=argparse.SUPPRESS,
|
|
default=None,
|
|
)
|
|
standalone.add_argument("-i", dest="filename", help=argparse.SUPPRESS)
|
|
|
|
compose_msg = """
|
|
To add a new entry into your journal, simply write it on the command line:
|
|
|
|
jrnl yesterday: I was walking and I found this big log.
|
|
|
|
The date and the following colon ("yesterday:") are optional. If you leave
|
|
them out, "now" will be used:
|
|
|
|
jrnl Then I rolled the log over.
|
|
|
|
Also, you can mark extra special entries ("star" them) with an asterisk:
|
|
|
|
jrnl *And underneath was a tiny little stick.
|
|
|
|
Please note that asterisks might be a special character in your shell, so you
|
|
might have to escape them. When in doubt about escaping, put quotes around
|
|
your entire entry:
|
|
|
|
jrnl "saturday at 2am: *Then I was like 'That log had a child!'" """
|
|
|
|
composing = parser.add_argument_group(
|
|
"Writing", textwrap.dedent(compose_msg).strip()
|
|
)
|
|
composing.add_argument("text", metavar="", nargs="*")
|
|
|
|
read_msg = (
|
|
"To find entries from your journal, use any combination of the below filters."
|
|
)
|
|
reading = parser.add_argument_group("Searching", textwrap.dedent(read_msg))
|
|
reading.add_argument(
|
|
"-on", dest="on_date", metavar="DATE", help="Show entries on this date"
|
|
)
|
|
reading.add_argument(
|
|
"-today-in-history",
|
|
dest="today_in_history",
|
|
action="store_true",
|
|
help="Show entries of today over the years",
|
|
)
|
|
reading.add_argument(
|
|
"-month",
|
|
dest="month",
|
|
metavar="DATE",
|
|
help="Show entries on this month of any year",
|
|
)
|
|
reading.add_argument(
|
|
"-day",
|
|
dest="day",
|
|
metavar="DATE",
|
|
help="Show entries on this day of any month",
|
|
)
|
|
reading.add_argument(
|
|
"-year",
|
|
dest="year",
|
|
metavar="DATE",
|
|
help="Show entries of a specific year",
|
|
)
|
|
reading.add_argument(
|
|
"-from",
|
|
dest="start_date",
|
|
metavar="DATE",
|
|
help="Show entries after, or on, this date",
|
|
)
|
|
reading.add_argument(
|
|
"-to",
|
|
dest="end_date",
|
|
metavar="DATE",
|
|
help="Show entries before, or on, this date (alias: -until)",
|
|
)
|
|
reading.add_argument("-until", dest="end_date", help=argparse.SUPPRESS)
|
|
reading.add_argument(
|
|
"-contains",
|
|
dest="contains",
|
|
metavar="TEXT",
|
|
help="Show entries containing specific text (put quotes around text with spaces)",
|
|
)
|
|
reading.add_argument(
|
|
"-and",
|
|
dest="strict",
|
|
action="store_true",
|
|
help='Show only entries that match all conditions, like saying "x AND y" (default: OR)',
|
|
)
|
|
reading.add_argument(
|
|
"-starred",
|
|
dest="starred",
|
|
action="store_true",
|
|
help="Show only starred entries (marked with *)",
|
|
)
|
|
reading.add_argument(
|
|
"-n",
|
|
dest="limit",
|
|
default=None,
|
|
metavar="NUMBER",
|
|
help="Show a maximum of NUMBER entries (note: '-n 3' and '-3' have the same effect)",
|
|
nargs="?",
|
|
type=int,
|
|
)
|
|
reading.add_argument(
|
|
"-not",
|
|
dest="excluded",
|
|
nargs="?",
|
|
default=[],
|
|
metavar="TAG",
|
|
action="append",
|
|
help="Exclude entries with this tag",
|
|
)
|
|
|
|
search_options_msg = """ These help you do various tasks with the selected entries from your search.
|
|
If used on their own (with no search), they will act on your entire journal"""
|
|
exporting = parser.add_argument_group(
|
|
"Searching Options", textwrap.dedent(search_options_msg)
|
|
)
|
|
exporting.add_argument(
|
|
"--edit",
|
|
dest="edit",
|
|
help="Opens the selected entries in your configured editor",
|
|
action="store_true",
|
|
)
|
|
exporting.add_argument(
|
|
"--delete",
|
|
dest="delete",
|
|
action="store_true",
|
|
help="Interactively deletes selected entries",
|
|
)
|
|
exporting.add_argument(
|
|
"--format",
|
|
metavar="TYPE",
|
|
dest="export",
|
|
choices=EXPORT_FORMATS,
|
|
help=f"""
|
|
Display selected entries in an alternate format.
|
|
|
|
TYPE can be: {util.oxford_list(EXPORT_FORMATS)}.
|
|
|
|
Optional parameters:
|
|
|
|
--file FILENAME Write output to file instead of stdout
|
|
""",
|
|
default=False,
|
|
)
|
|
exporting.add_argument(
|
|
"--export",
|
|
metavar="TYPE",
|
|
dest="export",
|
|
choices=EXPORT_FORMATS,
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
exporting.add_argument(
|
|
"--tags",
|
|
dest="tags",
|
|
action="store_true",
|
|
help="Alias for '--format tags'. Returns a list of all tags and number of occurences",
|
|
)
|
|
exporting.add_argument(
|
|
"--short",
|
|
dest="short",
|
|
action="store_true",
|
|
help="Show only titles or line containing the search tags",
|
|
)
|
|
exporting.add_argument(
|
|
"-s",
|
|
dest="short",
|
|
action="store_true",
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
exporting.add_argument(
|
|
"-o",
|
|
dest="filename",
|
|
help=argparse.SUPPRESS,
|
|
)
|
|
|
|
config_overrides = parser.add_argument_group(
|
|
"Config file override",
|
|
textwrap.dedent("Apply a one-off override of the config file option"),
|
|
)
|
|
config_overrides.add_argument(
|
|
"--config-override",
|
|
dest="config_override",
|
|
action="append",
|
|
type=str,
|
|
nargs=2,
|
|
default=[],
|
|
metavar="CONFIG_KV_PAIR",
|
|
help="""
|
|
Override configured key-value pair with CONFIG_KV_PAIR for this command invocation only.
|
|
|
|
Examples: \n
|
|
\t - Use a different editor for this jrnl entry, call: \n
|
|
\t jrnl --config-override editor: "nano" \n
|
|
\t - Override color selections\n
|
|
\t jrnl --config-override colors.body blue --config-override colors.title green
|
|
""",
|
|
)
|
|
|
|
# Handle '-123' as a shortcut for '-n 123'
|
|
num = re.compile(r"^-(\d+)$")
|
|
args = [num.sub(r"-n \1", arg) for arg in args]
|
|
|
|
return parser.parse_intermixed_args(args)
|