mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-12 09:28:31 +02:00
* fix missed statement from last PR * replace print statement for adding an entry to a journal * clean up linting and format * change print statement over to new print_msg function * make print_msg always print to stderr * change print statement over to new print_msg function * update importer to use new message function * update yaml format to use new message function * code cleanup * update yaml format to use new message function * update yaml format to use new exception handling * update Journal class to use new message function * update install module to use new message function * update config module to use new message function * update upgrade module to properly use new message and exception handling * fix typo * update upgrade module to use new message handling * update welcome message to use new handling * update upgrade module to use new message handling * update upgrade module journal summaries to use new message handling * take out old code * update upgrade module to use new message handling * update upgrade module to use new message handling * update more modules to use new message handling * take out old comment * update deprecated_cmd to use new message handling * update text_exporter with new message handling, get rid of old color constants * get rid of hardcoded text * whitespace changes * rework MsgType into MsgStyle so messages can have different styles * add comment * Move around code to separate concerns of each function a bit more * update create_password and yesno prompt functions for new messaging * fix missing newline for keyboard interrupts * fix misc linting * fix bug with panel titles always showing 'error' after one error * fix missing import * update debug output after uncaught exception * update exception for new exception handling * rewrite yesno function to use new centralized messages * reduce the debug output slightly * clean up print_msgs function * clean up create_password function * clean up misc linting * rename screen_input to hide_input to be more clear * update encrypted journal prompt to use new messaging functionality * fix typo in message key * move rich console into function so we can mock properly * update password mock to use rich console instead of getpass * add more helpful output to then step * fix test by updating expected output * update message to use new functionality * rework mocks in test suite for new messaging functionality * fix linting issue * fix more tests * fix more tests * fix more tests * fix more tests * fix merge bug * update prompt_action_entries to use new messaging functionality * Add new input_method "type" This does the same thing as input_method "pipe" but is more clear what it's doing (typing text into the builtin composer) * get rid of old commented code * get rid of unused code * move some files around Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
160 lines
4.8 KiB
Python
160 lines
4.8 KiB
Python
# Copyright (C) 2012-2021 jrnl contributors
|
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
|
|
import glob
|
|
import logging
|
|
import os
|
|
import sys
|
|
|
|
from .path import home_dir
|
|
from .path import absolute_path
|
|
from .path import expand_path
|
|
from .config import DEFAULT_JOURNAL_KEY
|
|
from .config import get_config_path
|
|
from .config import get_default_config
|
|
from .config import get_default_journal_path
|
|
from .config import load_config
|
|
from .config import save_config
|
|
from .config import verify_config_colors
|
|
from .prompt import yesno
|
|
from .upgrade import is_old_version
|
|
|
|
from jrnl.output import print_msg
|
|
from jrnl.exception import JrnlException
|
|
from jrnl.messages import Message
|
|
from jrnl.messages import MsgText
|
|
from jrnl.messages import MsgStyle
|
|
|
|
|
|
def upgrade_config(config_data, alt_config_path=None):
|
|
"""Checks if there are keys missing in a given config dict, and if so, updates the config file accordingly.
|
|
This essentially automatically ports jrnl installations if new config parameters are introduced in later
|
|
versions.
|
|
Supply alt_config_path if using an alternate config through --config-file."""
|
|
default_config = get_default_config()
|
|
missing_keys = set(default_config).difference(config_data)
|
|
if missing_keys:
|
|
for key in missing_keys:
|
|
config_data[key] = default_config[key]
|
|
save_config(config_data, alt_config_path)
|
|
config_path = alt_config_path if alt_config_path else get_config_path()
|
|
print_msg(
|
|
Message(
|
|
MsgText.ConfigUpdated, MsgStyle.NORMAL, {"config_path": config_path}
|
|
)
|
|
)
|
|
|
|
|
|
def find_default_config():
|
|
config_path = (
|
|
get_config_path()
|
|
if os.path.exists(get_config_path())
|
|
else os.path.join(home_dir(), ".jrnl_config")
|
|
)
|
|
return config_path
|
|
|
|
|
|
def find_alt_config(alt_config):
|
|
if not os.path.exists(alt_config):
|
|
raise JrnlException(
|
|
Message(
|
|
MsgText.AltConfigNotFound, MsgStyle.ERROR, {"config_file": alt_config}
|
|
)
|
|
)
|
|
|
|
return alt_config
|
|
|
|
|
|
def load_or_install_jrnl(alt_config_path):
|
|
"""
|
|
If jrnl is already installed, loads and returns a default config object.
|
|
If alternate config is specified via --config-file flag, it will be used.
|
|
Else, perform various prompts to install jrnl.
|
|
"""
|
|
config_path = (
|
|
find_alt_config(alt_config_path) if alt_config_path else find_default_config()
|
|
)
|
|
|
|
if os.path.exists(config_path):
|
|
logging.debug("Reading configuration from file %s", config_path)
|
|
config = load_config(config_path)
|
|
|
|
if config is None:
|
|
raise JrnlException(
|
|
Message(
|
|
MsgText.CantParseConfigFile,
|
|
MsgStyle.ERROR,
|
|
{
|
|
"config_path": config_path,
|
|
},
|
|
)
|
|
)
|
|
|
|
if is_old_version(config_path):
|
|
from jrnl import upgrade
|
|
|
|
upgrade.upgrade_jrnl(config_path)
|
|
|
|
upgrade_config(config, alt_config_path)
|
|
verify_config_colors(config)
|
|
|
|
else:
|
|
logging.debug("Configuration file not found, installing jrnl...")
|
|
config = install()
|
|
|
|
logging.debug('Using configuration "%s"', config)
|
|
return config
|
|
|
|
|
|
def install():
|
|
_initialize_autocomplete()
|
|
|
|
# Where to create the journal?
|
|
default_journal_path = get_default_journal_path()
|
|
user_given_path = print_msg(
|
|
Message(
|
|
MsgText.InstallJournalPathQuestion,
|
|
MsgStyle.PROMPT,
|
|
params={
|
|
"default_journal_path": default_journal_path,
|
|
},
|
|
),
|
|
get_input=True,
|
|
)
|
|
journal_path = absolute_path(user_given_path or default_journal_path)
|
|
default_config = get_default_config()
|
|
default_config["journals"][DEFAULT_JOURNAL_KEY] = journal_path
|
|
|
|
# If the folder doesn't exist, create it
|
|
path = os.path.split(default_config["journals"][DEFAULT_JOURNAL_KEY])[0]
|
|
try:
|
|
os.makedirs(path)
|
|
except OSError:
|
|
pass
|
|
|
|
# Encrypt it?
|
|
encrypt = yesno(Message(MsgText.EncryptJournalQuestion), default=False)
|
|
if encrypt:
|
|
default_config["encrypt"] = True
|
|
print_msg(Message(MsgText.JournalEncrypted, MsgStyle.NORMAL))
|
|
|
|
save_config(default_config)
|
|
return default_config
|
|
|
|
|
|
def _initialize_autocomplete():
|
|
# readline is not included in Windows Active Python and perhaps some other distributions
|
|
if sys.modules.get("readline"):
|
|
import readline
|
|
|
|
readline.set_completer_delims(" \t\n;")
|
|
readline.parse_and_bind("tab: complete")
|
|
readline.set_completer(_autocomplete_path)
|
|
|
|
|
|
def _autocomplete_path(text, state):
|
|
expansions = glob.glob(expand_path(text) + "*")
|
|
expansions = [e + "/" if os.path.isdir(e) else e for e in expansions]
|
|
expansions.append(None)
|
|
return expansions[state]
|