X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=48e28d6a3a28f5c111bd48e384b9eb2741736e10;hb=5820609a005b06da4c34ae5d44247e0379781999;hp=3e0f892a89cb5a17448bdc9b6d9458164aa69550;hpb=3175d3c1a22f05049cc45afa19c24cb3e3b19aae;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 3e0f892..48e28d6 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -50,20 +50,36 @@ def detect_atomic_leftover(path):
         raise SystemExit(msg)
 
 
-def obey(cmd):
+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)
     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 = {}
 try:
     parser = argparse.ArgumentParser()
@@ -86,7 +102,15 @@ try:
     elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
-        obey("MAKE_WORLD " + str(int(time.time())))
+        path_worldconfig = "confserver/world"
+        if not os.access(path_worldconfig, os.F_OK):
+            msg = "No world config file from which to start a new world."
+            raise SystemExit(msg)
+        file = open(path_worldconfig)
+        for line in file.readlines():
+            obey(line.rstrip(), io_db, path_recordfile)
+        file.close()
+        obey("MAKE_WORLD " + str(int(time.time())), io_db, path_recordfile)
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])
 except: