Server/py: Catch shlex tokenizer ValueError exceptions in obey().

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 5a5bd91c6d5ca8b382e7287b00c936a60d37bd99..7a56d55e87e6e92f42e312cdf16410f57de38e60 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -53,11 +53,18 @@ def detect_atomic_leftover(path):
 def obey(cmd, io_db, path_recordfile):
     """"""
     print("Input: " + cmd)
-    tokens = shlex.split(cmd)
-    if "QUIT" == tokens[0] and 1 == len(tokens):
-        raise SystemExit("received QUIT command")
+    try:
+        tokens = shlex.split(cmd, comments=True)
+    except ValueError as err:
+        print("Can't tokenize command string: " + str(err) + ".")
+        return
+    if 0 == len(tokens):
+        pass
     elif "PING" == tokens[0] and 1 == len(tokens):
         io_db["file_out"].write("PONG\n")
+    elif "QUIT" == tokens[0] and 1 == len(tokens):
+        record("# " + cmd, path_recordfile)
+        raise SystemExit("received QUIT command")
     elif "MAKE_WORLD" == tokens[0] and 2 == len(tokens):
         print("I would generate a new world now, if only I knew how.")
         record(cmd, path_recordfile)