Server/py: Only save game world every 15 seconds.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index a63eedd4c3833c15ba3107dfaf11ab27a9a2d51a..67210ca61acc5e403e2b5577d1d6d3da04cf6c05 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -79,6 +79,7 @@ def setup_server_io():
         if os.access(path_tmp, os.F_OK):
             raise SystemExit(msg)
     io_db["teststring"] = str(os.getpid()) + " " + str(time.time())
+    io_db["save_wait"] = 0
     os.makedirs(io_db["path_server"], exist_ok=True)
     io_db["file_out"] = open(io_db["path_out"], "w")
     strong_write(io_db["file_out"], io_db["teststring"] + "\n")
@@ -113,9 +114,10 @@ def obey(command, prefix, replay=False, do_record=False):
     a non-meta command from the commands_db merely triggers obey() on the next
     command from the records file. If not, non-meta commands set
     io_db["worldstate_updateable"] to world_db["WORLD_EXISTS"], and, if
-    do_record is set, are recorded via record(), and save_world() is called.
-    The prefix string is inserted into the server's input message between its
-    beginning 'input ' & ':'. All activity is preceded by a server_test() call.
+    do_record is set, are recorded via record(), and save_world() is called if
+    15 seconds have passed since the last time it was called. The prefix string
+    is inserted into the server's input message between its beginning 'input '
+    & ':'. All activity is preceded by a server_test() call.
     """
     server_test()
     print("input " + prefix + ": " + command)
@@ -141,7 +143,9 @@ def obey(command, prefix, replay=False, do_record=False):
             commands_db[tokens[0]][2](*tokens[1:])
             if do_record:
                 record(command)
-                save_world()
+                if time.time() > io_db["save_wait"] + 15:
+                    save_world()
+                    io_db["save_wait"] = time.time()
             io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"]
     elif 0 != len(tokens):
         print("Invalid command/argument, or bad number of tokens.")
@@ -829,12 +833,13 @@ def get_dir_to_target(t, filter):
         if "a" == filter:
             for id in world_db["Things"]:
                 Thing = world_db["Things"][id]
-                pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"]
+                pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] \
+                      + Thing["T_POSX"]
                 if t != Thing and Thing["T_LIFEPOINTS"] and \
                    t["T_TYPE"] != Thing["T_TYPE"] and \
                    'v' == chr(t["fovmap"][pos]) and \
                    t["T_LIFEPOINTS"] > \
-                       world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
+                   world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
                     set_map_score(pos, 0)
                 elif t["T_TYPE"] == Thing["T_TYPE"]:
                     set_map_score(pos, 65535)
@@ -842,11 +847,12 @@ def get_dir_to_target(t, filter):
             for id in [id for id in world_db["Things"]
                        if world_db["Things"][id]["T_LIFEPOINTS"]]:
                 Thing = world_db["Things"][id]
-                pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"]
+                pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] \
+                      + Thing["T_POSX"]
                 if t["T_TYPE"] != Thing["T_TYPE"] and \
                    'v' == chr(t["fovmap"][pos]) and \
                    t["T_LIFEPOINTS"] <= \
-                       world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
+                   world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
                     set_map_score(pos, 0)
         elif "c" == filter:
             for mt in [mt for mt in t["T_MEMTHING"]
@@ -859,7 +865,7 @@ def get_dir_to_target(t, filter):
             for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
                       if t["T_MEMDEPTHMAP"][i] == mem_depth_c[0]]:
                 set_map_score(i, 0)
-    
+
     def rand_target_dir(neighbors, cmp, dirs):
         candidates = []
         n_candidates = 0
@@ -911,9 +917,10 @@ def get_dir_to_target(t, filter):
                     dir_to_target = rand_target_dir(neighbors, 0, dirs)
                 elif 3 >= get_map_score(eye_pos):
                     t["T_COMMAND"] = [id for id in world_db["ThingActions"]
-                                      if world_db["ThingActions"][id]["TA_NAME"]
+                                      if
+                                      world_db["ThingActions"][id]["TA_NAME"]
                                          == "wait"][0]
-                    return 1;
+                    return 1
             elif dir_to_target and 3 < get_map_score(eye_pos):
                 dir_to_target = 0
         elif "a" == filter and 10 <= get_map_score(eye_pos):
@@ -999,10 +1006,10 @@ def turn_over():
     id = 0
     whilebreaker = False
     while world_db["Things"][0]["T_LIFEPOINTS"]:
-        for id in [id for id in world_db["Things"]]: # Only what is from start!
+        for id in [id for id in world_db["Things"]]:  # Only what's from start!
             if not id in world_db["Things"] or \
-               world_db["Things"][id]["carried"]:# Thing may have been consumed
-                continue                         # or picked up during turn …
+               world_db["Things"][id]["carried"]:   # May have been consumed or
+                continue                            # picked up during turn …
             Thing = world_db["Things"][id]
             if Thing["T_LIFEPOINTS"]:
                 if not Thing["T_COMMAND"]:
@@ -1092,6 +1099,7 @@ def command_ping():
 
 def command_quit():
     """Abort server process."""
+    save_world()
     raise SystemExit("received QUIT command")
 
 
@@ -1106,7 +1114,6 @@ def command_thingshere(str_y, str_x):
             strong_write(io_db["file_out"], "THINGS_HERE START\n")
             if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
                 for id in world_db["Things"]:
-                    # write_thing_if_here()
                     if y == world_db["Things"][id]["T_POSY"] \
                        and x == world_db["Things"][id]["T_POSX"] \
                        and not world_db["Things"][id]["carried"]:
@@ -1285,7 +1292,7 @@ def command_worldactive(worldactive_string):
                     if world_db["Things"][id]["T_LIFEPOINTS"]:
                         build_fov_map(world_db["Things"][id])
                         if 0 == id:
-                            update_map_memory(world_db["Things"][id])
+                            update_map_memory(world_db["Things"][id], False)
                 world_db["WORLD_ACTIVE"] = 1