Server/py: Use new obey_lines_in_file() on both save and worldconf file.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index ceeb237d944ca378364819f1f6a5afec580d27e2..e5b7c0e68bc3a0067384e15b6dd50d55cf1161fe 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -83,6 +83,15 @@ def record(cmd, path_recordfile):
     file.close()
 
 
+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")
+    line_n = 1
+    for line in file.readlines():
+        obey(line.rstrip(), io_db, name + "file line " + str(line_n))
+        line_n = line_n + 1
+    file.close()
+
 io_db = {}
 try:
     parser = argparse.ArgumentParser()
@@ -100,19 +109,16 @@ 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.")
-    elif os.access(io_db["path_save"], os.F_OK):
-        print(open(io_db["path_save"], "r").read())
     else:
-        if not os.access(io_db["path_worldconf"], os.F_OK):
-            msg = "No world config file from which to start a new world."
-            raise SystemExit(msg)
-        file = open(io_db["path_worldconf"])
-        line_n = 1
-        for line in file.readlines():
-            obey(line.rstrip(), io_db, "worldconfig file line " + str(line_n))
-            line_n = line_n + 1
-        file.close()
-        obey("MAKE_WORLD " + str(int(time.time())), io_db, "in file")
+        if os.access(io_db["path_save"], os.F_OK):
+            obey_lines_in_file(io_db["path_save"], "save")
+        else:
+            if not os.access(io_db["path_worldconf"], os.F_OK):
+                msg = "No world config file from which to start a new world."
+                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().")
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])
 except: