Server/py: Record QUIT too, but uncommented. Ignore pure comment lines.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 9bdab821360dd4262d1de20a9f817e197eb6c8dd..67d2259dc9f33aef4737f5a10056063704ec2488 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -41,7 +41,7 @@ def cleanup_server_io(io_db):
 
 
 def detect_atomic_leftover(path):
-    """Raise explained HandledException if file is found at path + "_tmp"."""
+    """Raise explained SystemExit if file is found at path + "_tmp"."""
     path_tmp = path + "_tmp"
     msg = "Found file '" + path_tmp + "' that may be a leftover from an " \
           "aborted previous attempt to write '" + path + "'. Aborting until " \
@@ -50,10 +50,30 @@ def detect_atomic_leftover(path):
         raise SystemExit(msg)
 
 
-def obey(msg):
+def obey(cmd, io_db, path_recordfile):
     """"""
-    print("Input: " + msg)
-    print(shlex.split(msg))
+    print("Input: " + cmd)
+    tokens = shlex.split(cmd, comments=True)
+    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)
+    else:
+        print("Invalid command/argument, or bad number of tokens.")
+
+
+def record(cmd, path_recordfile):
+    """Append cmd string plus newline to file at path_recordfile."""
+    file = open(path_recordfile, "a")
+    file.write(cmd + "\n")
+    file.close()
+
 
 
 io_db = {}
@@ -78,8 +98,7 @@ try:
     elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
-        msg = "MAKE_WORLD " + str(int(time.time()))
-        obey(msg)
+        obey("MAKE_WORLD " + str(int(time.time())), io_db, path_recordfile)
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])
 except: