From d720bcab3a35330962211980dfeedf5f2016522e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:48:34 +0200 Subject: reaktor config: introduce simple_command --- config.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index eba1f09..90f33d3 100644 --- a/config.py +++ b/config.py @@ -35,6 +35,15 @@ def default_command(cap, cmd=None, env={}): 'env': env } +def simple_command(cap, cmd=None, env={}): + if cmd == None: cmd=cap + return { + 'capname': cap, + 'pattern': '^' + cap + '\\s*(?:\\s+(?P.*))?$', + 'argv' : [ 'commands/' + cmd ], + 'env': env + } + public_commands = [ default_command('caps', env={ 'config_filename': config_filename @@ -54,13 +63,9 @@ public_commands = [ { 'pattern': '.*' + me + '.*', 'argv': [ 'commands/say', 'I\'m famous' ] }, # identify via direct connect - { 'capname': 'identify', - 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', - 'argv' : [ 'commands/identify' ], - 'env': { - 'config_filename': config_filename - } - } + simple_command('identify', env={ + 'config_filename': config_filename + }) ] commands = [ default_command('reload') -- cgit v1.2.3