X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=df0c211bdd2458ffad559f636404abd4f90285ae;hb=76180c99a9cf02004faaf1fb70e79a41228c7746;hp=c80bbf15eee49b0306ff07ed81dec2ff520c424f;hpb=62e9ba1755e8299e945153247af53b4fc268df21;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index c80bbf1..df0c211 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -13,7 +13,8 @@ def setup_server_io(io_db):
     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"]).
+    " " + floated UNIX time (io_db["teststring"]). Run detect_atomic_leftover
+    on io_db["path_record"] and io_db["path_save"].
     """
     io_dir = "server/"
     io_db["path_in"] = io_dir + "in"
@@ -27,11 +28,14 @@ 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")
     io_db["file_in"].close()
     io_db["file_in"] = open(io_db["path_in"], "r")
+    detect_atomic_leftover(io_db["path_save"], io_db["tmp_suffix"])
+    detect_atomic_leftover(io_db["path_record"], io_db["tmp_suffix"])
 
 
 def cleanup_server_io(io_db):
@@ -95,26 +99,57 @@ def record(cmd, io_db):
     os.rename(path_tmp, io_db["path_record"])
 
 
-def obey_lines_in_file(path, name):
-    """Call obey() on each line of path's file, use name in input prefix."""
-    file = open(io_db["path_worldconf"], "r")
+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.
+    """
+    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()
 
 
-io_db = {}
-try:
+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()
     parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
                         action='store')
+    opts, unknown = parser.parse_known_args()
+    return opts
+
+
+def server_test(io_db):
+    """Check for valid server out file belonging to current process."""
+    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()
+    print(str(test) + " == " + io_db["teststring"] + " ?")
+    if test != io_db["teststring"]:
+        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)
+
+io_db = {}
+world_db = {}
+try:
+    opts = parse_command_line_arguments()
     setup_server_io(io_db)
     # print("DUMMY: Run game.")
-    detect_atomic_leftover(io_db["path_save"], io_db["tmp_suffix"])
-    detect_atomic_leftover(io_db["path_record"], io_db["tmp_suffix"])
-    opts, unknown = parser.parse_known_args()
     if None != opts.replay:
         if opts.replay < 1:
             opts.replay = 1
@@ -122,6 +157,10 @@ try:
               " (if so late a turn is to be found).")
         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?
     else:
         if os.access(io_db["path_save"], os.F_OK):
             obey_lines_in_file(io_db["path_save"], "save")