X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=a3ee5e22f93053d3e58b2dfa261faea2b270cdf5;hb=6da06167fdafc4b2f197657bb2af431806b0d5fc;hp=568b21cf4db9b00c9caf4beeb55c798a90f37aae;hpb=82e96719b4cf7105f814f72d07e0d861000c5d39;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 568b21c..a3ee5e2 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -2,6 +2,7 @@ import argparse
 import errno
 import os
 import shlex
+import shutil
 import time
 
 
@@ -71,30 +72,53 @@ def obey(cmd, io_db, prefix):
         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, io_db["path_record"])
+        record(cmd, io_db)
     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")
+def record(cmd, io_db):
+    """Append cmd string plus newline to file at path_recordfile. (Atomic.)"""
+    # This misses some optimizations from the original record(), namely only
+    # finishing the atomic write with expensive flush() and fsync() every 15
+    # seconds unless explicitely forced. Implement as needed.
+    path_tmp = io_db["path_record"] + io_db["tmp_suffix"]
+    if os.access(io_db["path_record"], os.F_OK):
+        shutil.copyfile(io_db["path_record"], path_tmp)
+    file = open(path_tmp, "a")
     file.write(cmd + "\n")
+    file.flush()
+    os.fsync(file.fileno())
     file.close()
+    if os.access(io_db["path_record"], os.F_OK):
+        os.remove(io_db["path_record"])
+    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()
 
 
+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
+
+
 io_db = {}
+world_db = {}
 try:
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
@@ -111,6 +135,9 @@ 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)
     else:
         if os.access(io_db["path_save"], os.F_OK):
             obey_lines_in_file(io_db["path_save"], "save")