X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=a8b48b3db34a6c5027c6ff1e752df1eb0e0f556d;hb=45ebb121ae376b3b6d624590c3a76abd904e1b43;hp=5018304e6a0af417d5e0d450162bb918a16ad498;hpb=f5921eed55eec785cab0dd1413b47f31ffe797d7;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 5018304..a8b48b3 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -28,6 +28,7 @@ def setup_server_io(io_db):
     os.makedirs(io_dir, exist_ok=True)
     io_db["file_out"] = open(io_db["path_out"], "w")
     io_db["file_out"].write(io_db["teststring"] + "\n")
+    io_db["file_out"].flush()
     if os.access(io_db["path_in"], os.F_OK):
         os.remove(io_db["path_in"])
     io_db["file_in"] = open(io_db["path_in"], "w")
@@ -38,11 +39,12 @@ def setup_server_io(io_db):
 
 
 def cleanup_server_io(io_db):
-    """Close and remove all files open in IO files DB."""
+    """Close and (if io_db["kicked_by_rival"] false) remove files in io_db."""
     def helper(file_key, path_key):
         if file_key in io_db:
             io_db[file_key].close()
-            os.remove(io_db[path_key])
+            if not io_db["kicked_by_rival"]:
+                os.remove(io_db[path_key])
     helper("file_out", "path_out")
     helper("file_in", "path_in")
     helper("file_worldstate", "path_worldstate")
@@ -98,29 +100,16 @@ def record(cmd, io_db):
     os.rename(path_tmp, io_db["path_record"])
 
 
-def obey_lines_in_file(path, name, break_test = None):
-    """Call obey() on each line of path's file, use name in input prefix.
-
-    If break_test function is set, only read the file until it returns True.
-    """
+def obey_lines_in_file(path, name):
+    """Call obey() on each line of path's file, use name in input prefix."""
     file = open(path, "r")
     line_n = 1
     for line in file.readlines():
-        if None != break_test and break_test():
-            break
         obey(line.rstrip(), io_db, name + "file line " + str(line_n))
         line_n = line_n + 1
     file.close()
 
 
-def make_turn_tester(turn_to_compare, world_db):
-    """Return tester whether world_db["turn"] greater/equal turn_to_compare."""
-    def turn_tester():
-        return world_db["turn"] >= turn_to_compare
-    return turn_tester
-
-
-
 def parse_command_line_arguments():
     """Return settings values read from command line arguments."""
     parser = argparse.ArgumentParser()
@@ -130,6 +119,28 @@ def parse_command_line_arguments():
     return opts
 
 
+def server_test(io_db):
+    """Ensure valid server out file belonging to current process.
+
+    On failure, set io_db["kicked_by_rival"] and raise SystemExit.
+    """
+    if not os.access(io_db["path_out"], os.F_OK):
+        raise SystemExit("Server output file has disappeared.")
+    file = open(io_db["path_out"], "r")
+    test = file.readline().rstrip("\n")
+    file.close()
+    if test != io_db["teststring"]:
+        io_db["kicked_by_rival"] = True
+        msg = "Server test string in server output file does not match. This" \
+              " indicates that the current server process has been " \
+              "superseded by another one."
+        raise SystemExit(msg)
+
+
+def io_loop ():
+    return False
+
+
 io_db = {}
 world_db = {}
 try:
@@ -144,9 +155,19 @@ try:
         if not os.access(io_db["path_record"], os.F_OK):
             raise SystemExit("No record file found to replay.")
         world_db["turn"] = 0
-        break_tester = make_turn_tester(opts.replay, world_db)
-        obey_lines_in_file(io_db["path_record"], "record ", break_tester)
-        # what to do next?
+        file = open(io_db["path_record"], "r")
+        prefix = "record file line "
+        line_n = 1
+        while world_db["turn"] < opts.replay:
+            server_test(io_db)
+            obey(file.readline().rstrip(), io_db, prefix + str(line_n))
+            line_n = line_n + 1
+            world_db["turn"] = world_db["turn"] + 1
+        while io_loop():
+            server_test(io_db)
+            obey(file.readline().rstrip(), io_db, prefix + str(line_n))
+            line_n = line_n + 1
+        file.close()
     else:
         if os.access(io_db["path_save"], os.F_OK):
             obey_lines_in_file(io_db["path_save"], "save")
@@ -156,7 +177,9 @@ try:
                 raise SystemExit(msg)
             obey_lines_in_file(io_db["path_worldconf"], "world config ")
             obey("MAKE_WORLD " + str(int(time.time())), io_db, "in file")
-        # print("DUMMY: Run io_loop().")
+        while io_loop():
+            server_test(io_db)
+            # more?
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])
 except: