From 668feadda9fe87a7846be22a4845742243d49ddf Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Thu, 23 Apr 2020 22:49:06 -0700
Subject: [PATCH] Update lexicon-create cli

---
 amanuensis/cli/lexicon.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/amanuensis/cli/lexicon.py b/amanuensis/cli/lexicon.py
index f017b54..01075c8 100644
--- a/amanuensis/cli/lexicon.py
+++ b/amanuensis/cli/lexicon.py
@@ -1,15 +1,21 @@
 # Standard library imports
 import json
+import logging
 
 # Module imports
 from amanuensis.cli.helpers import (
 	add_argument, no_argument, requires_lexicon, requires_user, alias,
 	config_get, config_set, CONFIG_GET_ROOT_VALUE)
+from amanuensis.config import RootConfigDirectoryContext
+from amanuensis.models import LexiconModel
+
+logger = logging.getLogger(__name__)
 
 #
 # CRUD commands
 #
 
+
 @alias('lc')
 @add_argument("--name", required=True, help="The name of the new lexicon")
 @requires_user
@@ -24,22 +30,21 @@ def command_create(args):
 	opening the lexicon for player joins.
 	"""
 	# Module imports
-	from amanuensis.config import logger, json_ro
-	from amanuensis.lexicon.manage import valid_name, create_lexicon
+	from amanuensis.lexicon import valid_name, create_lexicon
+
+	root: RootConfigDirectoryContext = args.root
 
 	# Verify arguments
 	if not valid_name(args.name):
-		logger.error("Lexicon name contains illegal characters: '{}'".format(
-			args.name))
+		logger.error(f'Lexicon name contains illegal characters: "{args.name}"')
 		return -1
-	with json_ro('lexicon', 'index.json') as index:
+	with root.lexicon.read_index() as index:
 		if args.name in index.keys():
-			logger.error('A lexicon with name "{}" already exists'.format(
-				args.name))
+			logger.error(f'A lexicon with name "{args.name}" already exists')
 			return -1
 
 	# Perform command
-	lexicon = create_lexicon(args.name, args.user)
+	create_lexicon(root, args.model_factory, args.name, args.user)
 
 	# Output already logged by create_lexicon
 	return 0