Server/py: Restructure run_game() imitation.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 44c86a949f85a7e1ca614dd26d7dee1f4c0fe8e4..d9593f854f166196ee4f039c3692e24bff827fc7 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -53,9 +53,9 @@ def detect_atomic_leftover(path):
         raise SystemExit(msg)
 
 
-def obey(cmd, io_db): #, path_recordfile):
+def obey(cmd, io_db, prefix):
     """"""
-    print("Input: " + cmd)
+    print("input " + prefix + ": " + cmd)
     try:
         tokens = shlex.split(cmd, comments=True)
     except ValueError as err:
@@ -77,12 +77,12 @@ def obey(cmd, io_db): #, path_recordfile):
 
 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")
     file.write(cmd + "\n")
     file.close()
 
 
-
 io_db = {}
 try:
     parser = argparse.ArgumentParser()
@@ -100,17 +100,21 @@ 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"])
-        for line in file.readlines():
-            obey(line.rstrip(), io_db)
-        file.close()
-        obey("MAKE_WORLD " + str(int(time.time())), io_db)
+        if 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 line " + str(line_n))
+                line_n = line_n + 1
+            file.close()
+            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: