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

diff --git a/plomrogue-server.py b/plomrogue-server.py
index df0c211..eb6ace2 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -9,14 +9,16 @@ import time
 def setup_server_io(io_db):
     """Fill IO files DB with proper file( path)s. Write process IO test string.
 
-    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"]). Run detect_atomic_leftover
-    on io_db["path_record"] and io_db["path_save"].
+    Set io_db["kicked_by_rival"] to False. 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"]). Run detect_atomic_leftover on io_db["path_record"]
+    and io_db["path_save"].
     """
     io_dir = "server/"
+    io_db["kicked_by_rival"] = False
     io_db["path_in"] = io_dir + "in"
     io_db["path_out"] = io_dir + "out"
     io_db["path_worldstate"] = io_dir + "worldstate"
@@ -39,11 +41,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")
@@ -99,28 +102,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()
@@ -131,19 +122,27 @@ def parse_command_line_arguments():
 
 
 def server_test(io_db):
-    """Check for valid server out file belonging to current process."""
+    """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()
-    print(str(test) + " == " + io_db["teststring"] + " ?")
     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:
@@ -158,9 +157,18 @@ 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
+        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")
@@ -170,7 +178,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: