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 a1717a71bdd5dcf0871938600b046b785c342678..67d2259dc9f33aef4737f5a10056063704ec2488 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,15 +1,10 @@
 import argparse
 import errno
 import os
+import shlex
 import time
 
 
-class HandledException(Exception):
-    """Feature-less Exception child. Use for expected operational errors."""
-
-    pass
-
-
 def setup_server_io(io_db):
     """Fill IO files DB with proper file( path)s. Write process IO test string.
 
@@ -46,18 +41,39 @@ 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 " \
           "the matter is resolved by removing it from its current path."
     if os.access(path_tmp, os.F_OK):
-        raise HandledException(msg)
+        raise SystemExit(msg)
 
 
-def obey(msg):
+def obey(cmd, io_db, path_recordfile):
     """"""
-    print("Input: " + 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 = {}
@@ -76,18 +92,15 @@ try:
         if opts.replay < 1:
             opts.replay = 1
         print("Replay mode. Auto-replaying up to turn " + str(opts.replay) +
-              " (if so late  a turn is to be found).")
-        if not os.access(path_savefile, os.F_OK):
-            raise HandledException("No record file found to replay.")
+              " (if so late a turn is to be found).")
+        if not os.access(path_recordfile, os.F_OK):
+            raise SystemExit("No record file found to replay.")
     elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
-        msg = "MAKE_WORLD " + str(int(time.time()))
-        obey(msg)
-except SystemExit:
-    pass
-except HandledException as exception:
-    print("ABORTING: " + exception.args[0])
+        obey("MAKE_WORLD " + str(int(time.time())), io_db, path_recordfile)
+except SystemExit as exit:
+    print("ABORTING: " + exit.args[0])
 except:
     print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
     raise