From: Constantin Berhard Date: Mon, 30 Sep 2013 13:48:28 +0000 (+0200) Subject: massive simplification of command shortcuts X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/07282bc03a4f1dfcd9309f2fa242dfecb2756a3b?ds=inline;hp=-c massive simplification of command shortcuts --- 07282bc03a4f1dfcd9309f2fa242dfecb2756a3b diff --git a/tyshell b/tyshell index 0b9b943..0bc3aae 100755 --- a/tyshell +++ b/tyshell @@ -20,7 +20,7 @@ atexit.register(print, "Bye") # available commands def helpcmd(c): - print("Available commands: %s" % ", ".join(sorted(longcommands.keys()))) + print("Available commands: %s" % ", ".join(sorted(commands.keys()))) def extcmd(cmd): def run(c): @@ -53,39 +53,6 @@ commands = { 'buzz': sendcmd(tuerSock, 'buzz'), } -# command convenience shortcuts -def filterCommonPrefix (strings, length): - # ignores duplicates in the string list "strings" - toremove=[] - for a in strings: - for b in strings: - if a != b: - if a[:length] == b[:length]: - toremove.append(a) - toremove.append(b) - ret = list(strings) # copy - for x in toremove: - try: - ret.remove(x) - except ValueError: - pass - return ret - -def shortcutify (dic): - maxlen = 0 - for x in dic.keys(): - if len(x) > maxlen: - maxlen = len(x) - for i in range(maxlen): - shortable = filterCommonPrefix (dic.keys(), i) - for x in shortable: - dic[x[:i]] = dic[x] - return dic # only for convenience, as dic is passed by reference - -longcommands = commands.copy() -shortcutify (commands) - - # input loop print("Welcome to tyshell. Use help to see what you can do.") while True: @@ -96,12 +63,19 @@ while True: break command = shlex.split(command) if not len(command): continue - # execute command - if command[0] in commands: + # find suiting commands + if command[0] in commands: # needed in case a complete command is a prefix of another one + cmdoptions = [command[0]] + else: + cmdoptions = list(filter(lambda x: command[0] == x[:len(command[0])],commands.keys())) + if len(cmdoptions) == 0: # no commands fit prefix + print("Command %s not found. Use help." % command[0]) + elif len(cmdoptions) == 1: # exactly one command fits (prefix) try: - commands[command[0]](command) + commands[cmdoptions[0]](command) except Exception as e: print("Error while executing %s: %s" % (command[0], str(e))) - else: - print("Command %s not found. Use help." % command[0]) + else: # multiple commands fit the prefix + print("\t", " ".join(cmdoptions)) + # TODO: put current "command[0]" into the shell for the next command, but such that it is deletable with backspace