mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-12 01:18:31 +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
184 lines
5.5 KiB
Python
184 lines
5.5 KiB
Python
import logging
|
|
import os
|
|
import sys
|
|
|
|
import colorama
|
|
import yaml
|
|
import xdg.BaseDirectory
|
|
|
|
from . import __version__
|
|
from .exception import JrnlError
|
|
from .color import ERROR_COLOR
|
|
from .color import RESET_COLOR
|
|
from .output import list_journals
|
|
|
|
# Constants
|
|
DEFAULT_CONFIG_NAME = "jrnl.yaml"
|
|
XDG_RESOURCE = "jrnl"
|
|
|
|
DEFAULT_JOURNAL_NAME = "journal.txt"
|
|
DEFAULT_JOURNAL_KEY = "default"
|
|
|
|
YAML_SEPARATOR = ": "
|
|
|
|
|
|
def make_yaml_valid_dict(input: list) -> dict:
|
|
|
|
"""
|
|
|
|
Convert a two-element list of configuration key-value pair into a flat dict.
|
|
|
|
The dict is created through the yaml loader, with the assumption that
|
|
"input[0]: input[1]" is valid yaml.
|
|
|
|
:param input: list of configuration keys in dot-notation and their respective values.
|
|
:type input: list
|
|
:return: A single level dict of the configuration keys in dot-notation and their respective desired values
|
|
:rtype: dict
|
|
"""
|
|
|
|
assert len(input) == 2
|
|
|
|
# yaml compatible strings are of the form Key:Value
|
|
yamlstr = YAML_SEPARATOR.join(input)
|
|
runtime_modifications = yaml.load(yamlstr, Loader=yaml.FullLoader)
|
|
|
|
return runtime_modifications
|
|
|
|
|
|
def save_config(config):
|
|
config["version"] = __version__
|
|
with open(get_config_path(), "w") as f:
|
|
yaml.safe_dump(
|
|
config, f, encoding="utf-8", allow_unicode=True, default_flow_style=False
|
|
)
|
|
|
|
|
|
def get_config_path():
|
|
try:
|
|
config_directory_path = xdg.BaseDirectory.save_config_path(XDG_RESOURCE)
|
|
except FileExistsError:
|
|
raise JrnlError(
|
|
"ConfigDirectoryIsFile",
|
|
config_directory_path=os.path.join(
|
|
xdg.BaseDirectory.xdg_config_home, XDG_RESOURCE
|
|
),
|
|
)
|
|
return os.path.join(
|
|
config_directory_path or os.path.expanduser("~"), DEFAULT_CONFIG_NAME
|
|
)
|
|
|
|
|
|
def get_default_config():
|
|
return {
|
|
"version": __version__,
|
|
"journals": {"default": get_default_journal_path()},
|
|
"editor": os.getenv("VISUAL") or os.getenv("EDITOR") or "",
|
|
"encrypt": False,
|
|
"template": False,
|
|
"default_hour": 9,
|
|
"default_minute": 0,
|
|
"timeformat": "%Y-%m-%d %H:%M",
|
|
"tagsymbols": "@",
|
|
"highlight": True,
|
|
"linewrap": 79,
|
|
"indent_character": "|",
|
|
"colors": {
|
|
"date": "none",
|
|
"title": "none",
|
|
"body": "none",
|
|
"tags": "none",
|
|
},
|
|
}
|
|
|
|
|
|
def get_default_journal_path():
|
|
journal_data_path = xdg.BaseDirectory.save_data_path(
|
|
XDG_RESOURCE
|
|
) or os.path.expanduser("~")
|
|
return os.path.join(journal_data_path, DEFAULT_JOURNAL_NAME)
|
|
|
|
|
|
def scope_config(config, journal_name):
|
|
if journal_name not in config["journals"]:
|
|
return config
|
|
config = config.copy()
|
|
journal_conf = config["journals"].get(journal_name)
|
|
if type(journal_conf) is dict:
|
|
# We can override the default config on a by-journal basis
|
|
logging.debug(
|
|
"Updating configuration with specific journal overrides %s", journal_conf
|
|
)
|
|
config.update(journal_conf)
|
|
else:
|
|
# But also just give them a string to point to the journal file
|
|
config["journal"] = journal_conf
|
|
return config
|
|
|
|
|
|
def verify_config_colors(config):
|
|
"""
|
|
Ensures the keys set for colors are valid colorama.Fore attributes, or "None"
|
|
:return: True if all keys are set correctly, False otherwise
|
|
"""
|
|
all_valid_colors = True
|
|
for key, color in config["colors"].items():
|
|
upper_color = color.upper()
|
|
if upper_color == "NONE":
|
|
continue
|
|
if not getattr(colorama.Fore, upper_color, None):
|
|
print(
|
|
"[{2}ERROR{3}: {0} set to invalid color: {1}]".format(
|
|
key, color, ERROR_COLOR, RESET_COLOR
|
|
),
|
|
file=sys.stderr,
|
|
)
|
|
all_valid_colors = False
|
|
return all_valid_colors
|
|
|
|
|
|
def load_config(config_path):
|
|
"""Tries to load a config file from YAML."""
|
|
with open(config_path) as f:
|
|
return yaml.load(f, Loader=yaml.FullLoader)
|
|
|
|
|
|
def is_config_json(config_path):
|
|
with open(config_path, "r", encoding="utf-8") as f:
|
|
config_file = f.read()
|
|
return config_file.strip().startswith("{")
|
|
|
|
|
|
def update_config(config, new_config, scope, force_local=False):
|
|
"""Updates a config dict with new values - either global if scope is None
|
|
or config['journals'][scope] is just a string pointing to a journal file,
|
|
or within the scope"""
|
|
if scope and type(config["journals"][scope]) is dict: # Update to journal specific
|
|
config["journals"][scope].update(new_config)
|
|
elif scope and force_local: # Convert to dict
|
|
config["journals"][scope] = {"journal": config["journals"][scope]}
|
|
config["journals"][scope].update(new_config)
|
|
else:
|
|
config.update(new_config)
|
|
|
|
|
|
def get_journal_name(args, config):
|
|
args.journal_name = DEFAULT_JOURNAL_KEY
|
|
|
|
# The first arg might be a journal name
|
|
if args.text:
|
|
potential_journal_name = args.text[0]
|
|
if potential_journal_name[-1] == ":":
|
|
potential_journal_name = potential_journal_name[0:-1]
|
|
|
|
if potential_journal_name in config["journals"]:
|
|
args.journal_name = potential_journal_name
|
|
args.text = args.text[1:]
|
|
|
|
if args.journal_name not in config["journals"]:
|
|
print("No default journal configured.", file=sys.stderr)
|
|
print(list_journals(config), file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
logging.debug("Using journal name: %s", args.journal_name)
|
|
return args
|