Progress on expanding list_node with edit/add instead

evennia/utils/evmenu.py

@@ -1135,17 +1135,15 @@ def list_node(option_generator, select=None, examine=None, edit=None, add=None,
             that is called as option_generator(caller) to produce such a list.
         select (callable, option): Will be called as select(caller, menuchoice)
             where menuchoice is the chosen option as a string. Should return the target node to
-            goto after this selection. Note that if this is not given, the decorated node must itself
+            goto after this selection. Note that if this is not given, the decorated node must
-            provide a way to continue from the node!
+            itself provide a way to continue from the node!
         examine (callable, optional): If given, allows for examining options in detail. Will
             be called with examine(caller, menuchoice) and should return a text string to
             display in-place in the node.
-        edit (callable, optional): If given, this callable will be called as edit(caller, menuchoice).
+        edit (callable, optional): If given, this callable will be called as edit(caller,
-            It should return the node-key to a node decorated with the `edit_node` decorator. The
+            menuchoice, **kwargs) and should return a complete (text, options) tuple (like a node).
-            menuchoice will automatically be stored on the menutree as `list_node_edit`.
+        add (callable optional): If given, this callable will be called as add(caller, menuchoice,
-        add (tuple, optional): If given, this callable will be called as add(caller, menuchoice).
+            **kwargs) and should return a complete (text, options) tuple (like a node).
-            It should return the node-key to a node decorated with the `edit_node` decorator. The
-            menuchoice will automatically be stored on the menutree as `list_node_add`.
 
         pagesize (int): How many options to show per page.
 
@@ -1189,25 +1187,28 @@ def list_node(option_generator, select=None, examine=None, edit=None, add=None,
             """
 
             available_choices = kwargs.get("available_choices", [])
-            match = re.search(r"(^[a-zA-Z]*)\s*([0-9]*)$", raw_string)
+            match = re.search(r"(^[a-zA-Z]*)\s*(.*?)$", raw_string)
-            cmd, number = match.groups()
+            cmd, args = match.groups()
             mode, selection = None, None
+            cmd = cmd.lower().strip()
 
-            if number:
+            if args:
-                number = int(number) - 1
-                cmd = cmd.lower().strip()
-                if cmd.startswith("e") or cmd.startswith("a") and edit:
-                    mode = "edit"
-                elif examine:
-                    mode = "examine"
-
                 try:
-                    selection = available_choices[number]
+                    number = int(args) - 1
-                except IndexError:
+                except ValueError:
-                    caller.msg("|rInvalid index")
+                    if cmd.startswith("a") and add:
-                    mode = None
+                        mode = "add"
-            else:
+                        selection = args
-                caller.msg("|rMust supply a number.")
+                else:
+                    if cmd.startswith("e") and edit:
+                        mode = "edit"
+                    elif examine:
+                        mode = "look"
+                    try:
+                        selection = available_choices[number]
+                    except IndexError:
+                        caller.msg("|rInvalid index")
+                        mode = None
 
             return mode, selection
 
@@ -1233,18 +1234,18 @@ def list_node(option_generator, select=None, examine=None, edit=None, add=None,
                 page = pages[page_index]
 
             text = ""
-            entry = None
+            selection = None
             extra_text = None
 
             if mode == "arbitrary":
                 # freeform input, we must parse it for the allowed commands (look/edit)
-                mode, entry = _input_parser(caller, raw_string,
+                mode, selection = _input_parser(caller, raw_string,
-                                            **{"available_choices": page})
+                                                **{"available_choices": page})
 
-            if examine and mode:  #  == "look":
+            if examine and mode == "look":
                 # look mode - we are examining a given entry
                 try:
-                    text = examine(caller, entry)
+                    text = examine(caller, selection)
                 except Exception:
                     logger.log_trace()
                     text = "|rCould not view."
@@ -1256,15 +1257,25 @@ def list_node(option_generator, select=None, examine=None, edit=None, add=None,
                                           {"optionpage_index": page_index})}])
                 return text, options
 
-            # if edit and mode == "edit":
+            elif add and mode == 'add':
-            #     pass
+                # add mode - the selection is the new value
-            # elif add and mode == "add":
+                try:
-            #     # add mode - we are adding a new entry
+                    text, options = add(caller, selection, **kwargs)
-            #     pass
+                except Exception:
+                    logger.log_trace()
+                    text = "|rCould not add."
+                return text, options
+
+            elif edit and mode == 'edit':
+                try:
+                    text, options = edit(caller, selection, **kwargs)
+                except Exception:
+                    logger.log_trace()
+                    text = "|Could not edit."
+                return text, options
 
             else:
                 # normal mode - list
-                pass
 
                 if select:
                     # We have a processor to handle selecting an entry
@@ -1275,13 +1286,6 @@ def list_node(option_generator, select=None, examine=None, edit=None, add=None,
                                      "goto": (_select_parser,
                                               {"available_choices": page})} for opt in page])
 
-                if add:
-                    # We have a processor to handle adding a new entry. Re-run this node
-                    # in the 'add' mode
-                    options.append({"key": ("|wadd|Wdd new|n", "a"),
-                                    "goto": (lambda caller: None,
-                                             {"optionpage_index": page_index,
-                                              "list_mode": "add"})})
                 if npages > 1:
                     # if the goto callable returns None, the same node is rerun, and
                     # kwargs not used by the callable are passed on to the node. This

evennia/utils/spawner.py

@@ -1066,8 +1066,30 @@ def _caller_tags(caller):
     tags = prot.get("tags")
     return tags
 
+def _add_tags(caller, tag, **kwargs):
+    tag = tag.strip().lower()
+    metaprot = _get_menu_metaprot(caller)
+    tags = metaprot.tags
+    if tags:
+        if tag not in tags:
+            tags.append(tag)
+    else:
+        tags = [tag]
+    metaprot.tags = tags
+    text = kwargs.get("text")
+    if not text:
+        text = "Added tag {}. (return to continue)".format(tag)
+    options = {"key": "_default",
+               "goto": lambda caller: None}
+    return text, options
 
-@list_node(_caller_tags)
+
+def _edit_tag(caller, tag, **kwargs):
+    tag = tag.strip().lower()
+    metaprot = _get_menu_metaprot(caller)
+    #TODO change in evmenu so one can do e 3 <new tag> right away, parse & store value in kwarg
+
+@list_node(_caller_tags, edit=_edit_tags)
 def node_tags(caller):
     text = "Set the prototype's |yTags|n."
     options = _wizard_options("tags", "attrs", "locks")