fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

'write mode' -> 'append mode' in more places

Browse source
This commit is contained in:
Jonathan Wren 2023-03-25 12:04:47 -07:00
parent 22409ffef4
commit 64c0824a87
No known key found for this signature in database
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
jrnl/controller.py
View file

@ -39,7 +39,7 @@ def run(args: "Namespace"):
2. Load config 2. Load config
3. Run standalone command if it does require config (encrypt, decrypt, etc), then exit 3. Run standalone command if it does require config (encrypt, decrypt, etc), then exit
4. Load specified journal 4. Load specified journal
5. Start write mode, or search mode 5. Start append mode, or search mode
6. Perform actions with results from search mode (if needed) 6. Perform actions with results from search mode (if needed)
7. Profit 7. Profit
""" """
@ -111,7 +111,7 @@ def _perform_actions_on_search_results(**kwargs):
def _is_append_mode(args: "Namespace", config: dict, **kwargs) -> bool: def _is_append_mode(args: "Namespace", config: dict, **kwargs) -> bool:
"""Determines if we are in write mode (as opposed to search mode)""" """Determines if we are in append mode (as opposed to search mode)"""
# Are any search filters present? If so, then search mode. # Are any search filters present? If so, then search mode.
append_mode = ( append_mode = (
not _has_search_args(args) not _has_search_args(args)
@ -144,12 +144,12 @@ def _read_template_file(template_arg: str, template_path_from_config: str) -> st
If not, a JrnlException is raised. If not, a JrnlException is raised.
""" """
logging.debug( logging.debug(
"Write mode: Either a template arg was passed, or the global config is set." "Append mode: Either a template arg was passed, or the global config is set."
) )
# If filename is unset, we are in this flow due to a global template being configured # If filename is unset, we are in this flow due to a global template being configured
if not template_arg: if not template_arg:
logging.debug("Write mode: Global template configuration detected.") logging.debug("Append mode: Global template configuration detected.")
global_template_path = absolute_path(template_path_from_config) global_template_path = absolute_path(template_path_from_config)
try: try:
with open(global_template_path, encoding="utf-8") as f: with open(global_template_path, encoding="utf-8") as f:
@ -168,7 +168,7 @@ def _read_template_file(template_arg: str, template_path_from_config: str) -> st
else: # A template CLI arg was passed. else: # A template CLI arg was passed.
logging.debug("Trying to load template from $XDG_DATA_HOME/jrnl/templates/") logging.debug("Trying to load template from $XDG_DATA_HOME/jrnl/templates/")
jrnl_template_dir = get_templates_path() jrnl_template_dir = get_templates_path()
logging.debug(f"Write mode: jrnl templates directory: {jrnl_template_dir}") logging.debug(f"Append mode: jrnl templates directory: {jrnl_template_dir}")
template_path = jrnl_template_dir / template_arg template_path = jrnl_template_dir / template_arg
try: try:
with open(template_path, encoding="utf-8") as f: with open(template_path, encoding="utf-8") as f:
@ -211,15 +211,15 @@ def append_mode(args: "Namespace", config: dict, journal: "Journal", **kwargs) -
logging.debug("Append mode: starting") logging.debug("Append mode: starting")
if args.template or config["template"]: if args.template or config["template"]:
logging.debug(f"Write mode: template CLI arg detected: {args.template}") logging.debug(f"Append mode: template CLI arg detected: {args.template}")
# Read template file and pass as raw text into the composer # Read template file and pass as raw text into the composer
template_data = _read_template_file(args.template, config["template"]) template_data = _read_template_file(args.template, config["template"])
raw = _write_in_editor(config, template_data) raw = _write_in_editor(config, template_data)
if raw == template_data: if raw == template_data:
logging.error("Write mode: raw text was the same as the template") logging.error("Append mode: raw text was the same as the template")
raise JrnlException(Message(MsgText.NoChangesToTemplate, MsgStyle.NORMAL)) raise JrnlException(Message(MsgText.NoChangesToTemplate, MsgStyle.NORMAL))
elif args.text: elif args.text:
logging.debug(f"Write mode: cli text detected: {args.text}") logging.debug(f"Append mode: cli text detected: {args.text}")
raw = " ".join(args.text).strip() raw = " ".join(args.text).strip()
if args.edit: if args.edit:
raw = _write_in_editor(config, raw) raw = _write_in_editor(config, raw)
@ -269,7 +269,7 @@ def search_mode(args: "Namespace", journal: "Journal", **kwargs) -> None:
def _write_in_editor(config: dict, prepopulated_text: str | None = None) -> str: def _write_in_editor(config: dict, prepopulated_text: str | None = None) -> str:
if config["editor"]: if config["editor"]:
logging.debug("Write mode: opening editor") logging.debug("Append mode: opening editor")
raw = get_text_from_editor(config, prepopulated_text) raw = get_text_from_editor(config, prepopulated_text)
else: else:
raw = get_text_from_stdin() raw = get_text_from_stdin()

2
jrnl/editor.py
View file

@ -66,7 +66,7 @@ def get_text_from_stdin() -> str:
try: try:
raw = sys.stdin.read() raw = sys.stdin.read()
except KeyboardInterrupt: except KeyboardInterrupt:
logging.error("Write mode: keyboard interrupt") logging.error("Append mode: keyboard interrupt")
raise JrnlException( raise JrnlException(
Message(MsgText.KeyboardInterruptMsg, MsgStyle.ERROR_ON_NEW_LINE), Message(MsgText.KeyboardInterruptMsg, MsgStyle.ERROR_ON_NEW_LINE),
Message(MsgText.JournalNotSaved, MsgStyle.WARNING), Message(MsgText.JournalNotSaved, MsgStyle.WARNING),