Implement the last two states

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 0bc3aaeb63e18fed3df141843ed8b2c8cd03d217..22809262fd4598b150428e7d8a4ea0fe1aef54e2 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -16,7 +16,6 @@ except IOError:
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)

-atexit.register(print, "Bye")

 
 # available commands
 def helpcmd(c):
 
 # available commands
 def helpcmd(c):


@@ -34,16 +33,16 @@ def sendcmd(addr, cmd):
                print("Running %s..." % (cmd))
                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                s.connect(addr)
                print("Running %s..." % (cmd))
                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                s.connect(addr)

+               s.settimeout(10.0)

                s.send(cmd.encode())
                data = s.recv(4)
                s.close()
                s.send(cmd.encode())
                data = s.recv(4)
                s.close()

-               print("...done")
-               if data != b'1':
-                       print("Received unexpected answer %s" % str(data))
+               print(data.decode('utf-8'))

        return run
 
 def exitcmd(c):
        return run
 
 def exitcmd(c):

-       sys.exit(0)
+       print("Bye")
+       return True

 
 commands = {
        'exit': exitcmd,
 
 commands = {
        'exit': exitcmd,


@@ -67,15 +66,18 @@ while True:
        if command[0] in commands: # needed in case a complete command is a prefix of another one
                cmdoptions = [command[0]]
        else:
        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()))
+               cmdoptions = list(filter(lambda x: command[0].startswith(x), commands.keys()))
+       # check how many we found

        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:
        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[cmdoptions[0]](command)
+                       res = commands[cmdoptions[0]](command)
+                       if res: break

                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
        else: # multiple commands fit the prefix
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
        else: # multiple commands fit the prefix

+               print("Ambiguous command prefix, please choose one of the following:")

                print("\t", " ".join(cmdoptions))
                # TODO: put current "command[0]" into the shell for the next command, but such that it is deletable with backspace
 
                print("\t", " ".join(cmdoptions))
                # TODO: put current "command[0]" into the shell for the next command, but such that it is deletable with backspace