X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=d9593f854f166196ee4f039c3692e24bff827fc7;hb=0891d236075c217eb7e32a38c8da354a6419a1c3;hp=5a5bd91c6d5ca8b382e7287b00c936a60d37bd99;hpb=f2369d5b5908a9bab6659c8a6272804b50d60ee9;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 5a5bd91..d9593f8 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -8,16 +8,19 @@ import time
 def setup_server_io(io_db):
     """Fill IO files DB with proper file( path)s. Write process IO test string.
 
-    Ensure IO files directory at server/. Remove any old in file if found. Set
-    up new in file (io_db["file_in"]) for reading at io_db["path_in"], and new
-    out file (io_db["file_out"]) for writing at io_db["path_out"]. Start out
-    file with process hash line of format PID + " " + floated UNIX time
-    (io_db["teststring"]). Set worldstate file path io_db["path_worldstate"].
+    Decide file paths. Ensure IO files directory at server/. Remove any old in
+    file if found. Set up new in file (io_db["file_in"]) for reading at
+    io_db["path_in"], and new out file (io_db["file_out"]) for writing at
+    io_db["path_out"]. Start out file with process hash line of format PID +
+    " " + floated UNIX time (io_db["teststring"]).
     """
     io_dir = "server/"
     io_db["path_in"] = io_dir + "in"
     io_db["path_out"] = io_dir + "out"
     io_db["path_worldstate"] = io_dir + "worldstate"
+    io_db["path_record"] = "record"
+    io_db["path_save"] = "save"
+    io_db["path_worldconf"] = "confserver/world"
     io_db["teststring"] = str(os.getpid()) + " " + str(time.time())
     os.makedirs(io_dir, exist_ok=True)
     io_db["file_out"] = open(io_db["path_out"], "w")
@@ -50,52 +53,68 @@ def detect_atomic_leftover(path):
         raise SystemExit(msg)
 
 
-def obey(cmd, io_db, path_recordfile):
+def obey(cmd, io_db, prefix):
     """"""
-    print("Input: " + cmd)
-    tokens = shlex.split(cmd)
-    if "QUIT" == tokens[0] and 1 == len(tokens):
-        raise SystemExit("received QUIT command")
+    print("input " + prefix + ": " + cmd)
+    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)
+        record(cmd, io_db["path_record"])
     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."""
+    # Doesn't yet replace old record() fully.
     file = open(path_recordfile, "a")
     file.write(cmd + "\n")
     file.close()
 
 
-
 io_db = {}
 try:
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
                         action='store')
-    opts, unknown = parser.parse_known_args()
     setup_server_io(io_db)
     # print("DUMMY: Run game.")
-    path_recordfile = "recordfile"
-    path_savefile = "savefile"
-    detect_atomic_leftover(path_savefile)
-    detect_atomic_leftover(path_recordfile)
+    detect_atomic_leftover(io_db["path_save"])
+    detect_atomic_leftover(io_db["path_record"])
+    opts, unknown = parser.parse_known_args()
     if None != opts.replay:
         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_recordfile, os.F_OK):
+        if not os.access(io_db["path_record"], 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:
-        obey("MAKE_WORLD " + str(int(time.time())), io_db, path_recordfile)
+        if os.access(io_db["path_save"], os.F_OK):
+            print(open(io_db["path_save"], "r").read())
+        else:
+            if not os.access(io_db["path_worldconf"], os.F_OK):
+                msg = "No world config file from which to start a new world."
+                raise SystemExit(msg)
+            file = open(io_db["path_worldconf"])
+            line_n = 1
+            for line in file.readlines():
+                obey(line.rstrip(), io_db, "worldconfig line " + str(line_n))
+                line_n = line_n + 1
+            file.close()
+            obey("MAKE_WORLD " + str(int(time.time())), io_db, "in file")
+        # print("DUMMY: Run io_loop().")
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])
 except: