WIP: Allow fields to be created in adminui.Menus.

Convert modules.echo.admin to use adminui.Menu (see #63).

Author: nmlorg

metabot/modules/echo.py

@@ -37,27 +37,22 @@ def echo(ctx, msg, data):  # pylint: disable=missing-docstring
 def admin(ctx, msg, frame):
     """Handle /admin BOTNAME echo."""
 
-    modconf = frame.value
-    command, _, text = frame.text.partition(' ')
-    command = command.lower()
-
-    if not command:
+    menu = adminui.Menu()
+    for command, data in sorted(frame.value.items()):
+        menu.add(command, desc=data.get('text', '').replace('\n', ' '))
+    frame, handler = menu.select(ctx, msg, frame, create=True)
+    if not handler:
         msg.action = 'Choose a command'
         msg.add(
             "Type the name of a command to add (like <code>rules</code>\u2014don't include a slash "
             'at the beginning!), or select an existing echo.')
-        for command, data in sorted(modconf.items()):
-            title = '/' + command
-            if data.get('text'):
-                title = '%s (%s)' % (title, data['text'].replace('\n', ' '))
-            msg.button(title, command)
-        return
+        return menu.display(ctx, msg, frame, 'command')
 
-    msg.path(command)
+    msg.path(frame.field)
 
     adminui.Menu(
         ('text', adminui.freeform,
-         'The message, sticker, or image to send in response to /%s.' % command),
+         'The message, sticker, or image to send in response to /%s.' % frame.field),
         ('paginate', adminui.bool, 'For multiline messages, display just one line at a time?'),
         ('private', adminui.bool, 'Send the message in group chats, or just in private?'),
-    ).handle(ctx, msg, adminui.Frame(modconf, command, None, text))
+    ).handle(ctx, msg, frame)

metabot/modules/test_echo.py

@@ -166,7 +166,7 @@ def test_admin(conversation):  # pylint: disable=redefined-outer-name
 Bot Admin › modulestestbot › echo: <b>Choose a command</b>
 
 Type the name of a command to add (like <code>rules</code>—don't include a slash at the beginning!), or select an existing echo.
-[/echotest (new message) | /admin modulestestbot echo echotest]
+[echotest • new message | /admin modulestestbot echo echotest]
 [Back | /admin modulestestbot]
 """
 
@@ -186,7 +186,7 @@ def test_admin(conversation):  # pylint: disable=redefined-outer-name
 Bot Admin › modulestestbot › echo: <b>Choose a command</b>
 
 Type the name of a command to add (like <code>rules</code>—don't include a slash at the beginning!), or select an existing echo.
-[/echotest (new message) | /admin modulestestbot echo echotest]
-[/textless | /admin modulestestbot echo textless]
+[echotest • new message | /admin modulestestbot echo echotest]
+[textless | /admin modulestestbot echo textless]
 [Back | /admin modulestestbot]
 """

metabot/util/adminui.py

@@ -44,14 +44,17 @@ def add(self, field, handler=True, desc=None):
 
         self.fields += ((field, handler, desc),)
 
-    def select(self, unused_ctx, msg, frame):
+    def select(self, unused_ctx, msg, frame, create=False):
         """Identify the selected subframe."""
 
         field, _, text = frame.text.lstrip().partition(' ')
+        field = field.lower()
         for fieldname, handler, desc in self.fields:
-            if fieldname == field:
-                return Frame(frame.value, field, desc, text), handler
+            if fieldname.lower() == field:
+                return Frame(frame.value, fieldname, desc, text), handler
         if field:
+            if create:
+                return Frame(frame.value, field, None, text), create
             msg.add("I can't set <code>%s</code>.", field)
         return frame, None