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

Warn user if attempting to write to default journal but not configured

Browse source 
Fixes #343
This commit is contained in:
Manuel Ebert 2015-04-20 14:25:44 +02:00
parent 9bf4e52b2c
commit c4b16b7577
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
jrnl/cli.py
View file

@ -7,7 +7,8 @@
license: MIT, see LICENSE for more details. license: MIT, see LICENSE for more details.
""" """
from __future__ import absolute_import, unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from . import Journal from . import Journal
from . import util from . import util
from . import install from . import install
@ -103,9 +104,11 @@ def decrypt(journal, filename=None):
def list_journals(config): def list_journals(config):
"""List the journals specified in the configuration file""" """List the journals specified in the configuration file"""
sep = "\n" result = "Journals defined in {}\n".format(install.CONFIG_FILE_PATH)
journal_list = sep.join(config['journals']) ml = min(max(len(k) for k in config['journals']), 20)
return journal_list for journal, cfg in config['journals'].items():
result += " * {:{}} -> {}\n".format(journal, ml, cfg['journal'] if isinstance(cfg, dict) else cfg)
return result
def update_config(config, new_config, scope, force_local=False): def update_config(config, new_config, scope, force_local=False):
@ -140,10 +143,7 @@ def run(manual_args=None):
config = install.load_or_install_jrnl() config = install.load_or_install_jrnl()
if args.ls: if args.ls:
util.prnt(u"Journals defined in {}".format(install.CONFIG_FILE_PATH)) util.prnt(list_journals(config))
ml = min(max(len(k) for k in config['journals']), 20)
for journal, cfg in config['journals'].items():
print(" * {:{}} -> {}".format(journal, ml, cfg['journal'] if isinstance(cfg, dict) else cfg))
sys.exit(0) sys.exit(0)
log.debug('Using configuration "%s"', config) log.debug('Using configuration "%s"', config)
@ -154,6 +154,10 @@ def run(manual_args=None):
journal_name = args.text[0] if (args.text and args.text[0] in config['journals']) else 'default' journal_name = args.text[0] if (args.text and args.text[0] in config['journals']) else 'default'
if journal_name is not 'default': if journal_name is not 'default':
args.text = args.text[1:] args.text = args.text[1:]
elif "default" not in config['journals']:
util.prompt("No default journal configured.")
util.prompt(list_journals(config))
sys.exit(1)
# If the first remaining argument looks like e.g. '-3', interpret that as a limiter # If the first remaining argument looks like e.g. '-3', interpret that as a limiter
if not args.limit and args.text and args.text[0].startswith("-"): if not args.limit and args.text and args.text[0].startswith("-"):