mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 16:48:31 +02:00
* added new CLI argument option --config-file * pass argument and fetch alt config file if specified * argparse argument setting update * argument alias --cf added * documentation update - usage of CLI argument * fixed name-clash + unit tests * feature test added * #1170-alternate-config-file: Auto stash before rebase of "refs/heads/#1170-alternate-config-file" * Update docs/advanced.md Co-authored-by: Jonathan Wren <jonathan@nowandwren.com> * BDD tests added * Begin migrating/rewording --cf tests in pytest-bdd. Uses current directory instead of deep directory structure, but requires a given for each config file referenced * Fix issue where specifying a config-file that needs to be upgraded ended up upgrading the user config file instead * Uncomment and rework remaining tests for pytest-bdd instead of behave * Fix copytree for Python 3.7 (which doesn't support dirs_exist_ok) * Minor fixes to alternative config examples * Remove behave tests (behave is no longer in use) * Move config file unit test to unit test dir and use pytext path fixture instead of current directory to find test data * Use explicit "given the config exists" for copying config files instead of shoehorning in "given we use the config" twice * Change when/when to when/and * Clarify scenarios and fix indentation * Confirm primary config file isn't modified when encrypting/decrypting a journal in an alternate config file * Remove try/except on copytree since I'm no longer using the same Co-authored-by: Jonathan Wren <jonathan@nowandwren.com> Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
152 lines
4.9 KiB
Python
152 lines
4.9 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 .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 .exception import UserAbort
|
|
from .prompt import yesno
|
|
from .upgrade import is_old_version
|
|
|
|
|
|
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(
|
|
f"[Configuration updated to newest version at {config_path}]",
|
|
file=sys.stderr,
|
|
)
|
|
|
|
|
|
def find_default_config():
|
|
config_path = (
|
|
get_config_path()
|
|
if os.path.exists(get_config_path())
|
|
else os.path.join(os.path.expanduser("~"), ".jrnl_config")
|
|
)
|
|
return config_path
|
|
|
|
|
|
def find_alt_config(alt_config):
|
|
if os.path.exists(alt_config):
|
|
return alt_config
|
|
else:
|
|
print(
|
|
"Alternate configuration file not found at path specified.", file=sys.stderr
|
|
)
|
|
print("Exiting.", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
|
|
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 is_old_version(config_path):
|
|
from . import upgrade
|
|
|
|
try:
|
|
upgrade.upgrade_jrnl(config_path)
|
|
except upgrade.UpgradeValidationException:
|
|
print("Aborting upgrade.", file=sys.stderr)
|
|
print(
|
|
"Please tell us about this problem at the following URL:",
|
|
file=sys.stderr,
|
|
)
|
|
print(
|
|
"https://github.com/jrnl-org/jrnl/issues/new?title=UpgradeValidationException",
|
|
file=sys.stderr,
|
|
)
|
|
print("Exiting.", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
upgrade_config(config, alt_config_path)
|
|
verify_config_colors(config)
|
|
|
|
else:
|
|
logging.debug("Configuration file not found, installing jrnl...")
|
|
try:
|
|
config = install()
|
|
except KeyboardInterrupt:
|
|
raise UserAbort("Installation aborted")
|
|
|
|
logging.debug('Using configuration "%s"', config)
|
|
return config
|
|
|
|
|
|
def install():
|
|
_initialize_autocomplete()
|
|
|
|
# Where to create the journal?
|
|
default_journal_path = get_default_journal_path()
|
|
path_query = f"Path to your journal file (leave blank for {default_journal_path}): "
|
|
journal_path = os.path.abspath(input(path_query).strip() or default_journal_path)
|
|
default_config = get_default_config()
|
|
default_config["journals"][DEFAULT_JOURNAL_KEY] = os.path.expanduser(
|
|
os.path.expandvars(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(
|
|
"Do you want to encrypt your journal? You can always change this later",
|
|
default=False,
|
|
)
|
|
if encrypt:
|
|
default_config["encrypt"] = True
|
|
print("Journal will be encrypted.", file=sys.stderr)
|
|
|
|
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(os.path.expanduser(os.path.expandvars(text)) + "*")
|
|
expansions = [e + "/" if os.path.isdir(e) else e for e in expansions]
|
|
expansions.append(None)
|
|
return expansions[state]
|