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

Require config arguments

Browse source
This commit is contained in:
Matthias Vogelgesang 2014-06-26 10:47:59 +02:00
parent fc1935d64e
commit fca3d131bd
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jrnl/cli.py
View file

@ -126,7 +126,7 @@ def run(manual_args=None):
config = install.install_jrnl(CONFIG_PATH) config = install.install_jrnl(CONFIG_PATH)
else: else:
config = util.load_and_fix_json(CONFIG_PATH) config = util.load_and_fix_json(CONFIG_PATH)
install.upgrade_config(config, config_path=CONFIG_PATH) install.upgrade_config(config, CONFIG_PATH)
if args.ls: if args.ls:
print(util.py2encode(list_journals(config))) print(util.py2encode(list_journals(config)))
@ -235,14 +235,14 @@ def run(manual_args=None):
# Not encrypting to a separate file: update config! # Not encrypting to a separate file: update config!
if not args.encrypt: if not args.encrypt:
update_config(original_config, {"encrypt": True}, journal_name, force_local=True) update_config(original_config, {"encrypt": True}, journal_name, force_local=True)
install.save_config(original_config, config_path=CONFIG_PATH) install.save_config(original_config, CONFIG_PATH)
elif args.decrypt is not False: elif args.decrypt is not False:
decrypt(journal, filename=args.decrypt) decrypt(journal, filename=args.decrypt)
# Not decrypting to a separate file: update config! # Not decrypting to a separate file: update config!
if not args.decrypt: if not args.decrypt:
update_config(original_config, {"encrypt": False}, journal_name, force_local=True) update_config(original_config, {"encrypt": False}, journal_name, force_local=True)
install.save_config(original_config, config_path=CONFIG_PATH) install.save_config(original_config, CONFIG_PATH)
elif args.edit: elif args.edit:
if not config['editor']: if not config['editor']:

6
jrnl/install.py
View file

@ -34,7 +34,7 @@ default_config = {
} }
def upgrade_config(config, config_path=os.path.expanduser("~/.jrnl_conf")): def upgrade_config(config, config_path):
"""Checks if there are keys missing in a given config dict, and if so, updates the config file accordingly. """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 This essentially automatically ports jrnl installations if new config parameters are introduced in later
versions.""" versions."""
@ -47,12 +47,12 @@ def upgrade_config(config, config_path=os.path.expanduser("~/.jrnl_conf")):
print("[.jrnl_conf updated to newest version]") print("[.jrnl_conf updated to newest version]")
def save_config(config=default_config, config_path=os.path.expanduser("~/.jrnl_conf")): def save_config(config, config_path):
with open(config_path, 'w') as f: with open(config_path, 'w') as f:
json.dump(config, f, indent=2) json.dump(config, f, indent=2)
def install_jrnl(config_path='~/.jrnl_config'): def install_jrnl(config_path):
def autocomplete(text, state): def autocomplete(text, state):
expansions = glob.glob(os.path.expanduser(os.path.expandvars(text))+'*') expansions = glob.glob(os.path.expanduser(os.path.expandvars(text))+'*')
expansions = [e+"/" if os.path.isdir(e) else e for e in expansions] expansions = [e+"/" if os.path.isdir(e) else e for e in expansions]