Server/py: Realize slightly more of C variant's run_game() structure.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 2c9e70153077c1de9df54335c7d264260577733a..33a5593e0632f997d6b70397f0b51eccbe11f937 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,3 +1,4 @@
+import argparse
 import errno
 import os
 import time
@@ -34,19 +35,18 @@ def setup_server_io(io_db):
 
 
 def cleanup_server_io(io_db):
-    """Close and remove all files in IO files DB."""
-    io_db["file_out"].close()
-    os.remove(io_db["path_out"])
-    io_db["file_in"].close()
-    os.remove(io_db["path_in"])
-    if "file_worldstate" in io_db:                    # This file's only set up
-        io_db["file_worldstate"].close()              # properly when the game
-    if os.access(io_db["path_worldstate"], os.F_OK):  # world is active, which
-        os.remove(io_db["path_worldstate"])           # is not guaranteed.
+    """Close and remove all files open in IO files DB."""
+    def helper(file_key, path_key):
+        if file_key in io_db:
+            io_db[file_key].close()
+            os.remove(io_db[path_key])
+    helper("file_out", "path_out")
+    helper("file_in", "path_in")
+    helper("file_worldstate", "path_worldstate")
 
 
 def detect_atomic_leftover(path):
-    """Raise HandledException if file is found at path + "_tmp"."""
+    """Raise explained HandledException if file is found at path + "_tmp"."""
     path_tmp = path + "_tmp"
     msg = "Found file '" + path_tmp + "' that may be a leftover from an " \
           "aborted previous attempt to write '" + path + "'. Aborting until " \
@@ -57,19 +57,27 @@ def detect_atomic_leftover(path):
 
 io_db = {}
 try:
-    print("DUMMY: Obey command-line arguments.")
-    print("DUMMY: Open files.")
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
+                        action='store')
+    args, unknown = parser.parse_known_args()
+    replay = args.replay
+    # print("DUMMY: Obey command-line arguments.")
     setup_server_io(io_db)
-    print("DUMMY: Run game.")
+    # print("DUMMY: Run game.")
     path_recordfile = "recordfile"
     path_savefile = "savefile"
     detect_atomic_leftover(path_savefile)
     detect_atomic_leftover(path_recordfile)
-    if os.access(path_savefile, os.F_OK):
+    if replay:
+        print("Replaying")
+    elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
         msg = "MAKE_WORLD " + str(int(time.time()))
         print(msg)
+except SystemExit:
+    pass
 except HandledException as exception:
     print("Error:")
     print(exception.args[0])
@@ -78,4 +86,4 @@ except:
     raise
 finally:
     cleanup_server_io(io_db)
-    print("DUMMY: (Clean up C heap.)")
+    # print("DUMMY: (Clean up C heap.)")