Server/py: Minor text improvements. Handle no-records-file case.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 1e4eda149eaa69451e865ca2dca1d2e0a6366bcb..a1717a71bdd5dcf0871938600b046b785c342678 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -35,15 +35,14 @@ 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):
@@ -56,32 +55,42 @@ def detect_atomic_leftover(path):
         raise HandledException(msg)
 
 
+def obey(msg):
+    """"""
+    print("Input: " + msg)
+
+
 io_db = {}
 try:
-    parser = argparse.ArgumentParser(add_help=False)
+    parser = argparse.ArgumentParser()
     parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
                         action='store')
-    args, unknown = parser.parse_known_args()
-    print("Replay: " + str(args.replay))
-    print("DUMMY: Obey command-line arguments.")
-    print("DUMMY: Open files.")
+    opts, unknown = parser.parse_known_args()
     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 None != opts.replay:
+        if opts.replay < 1:
+            opts.replay = 1
+        print("Replay mode. Auto-replaying up to turn " + str(opts.replay) +
+              " (if so late  a turn is to be found).")
+        if not os.access(path_savefile, os.F_OK):
+            raise HandledException("No record file found to replay.")
+    elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
         msg = "MAKE_WORLD " + str(int(time.time()))
-        print(msg)
+        obey(msg)
+except SystemExit:
+    pass
 except HandledException as exception:
-    print("Error:")
-    print(exception.args[0])
+    print("ABORTING: " + exception.args[0])
 except:
     print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
     raise
 finally:
     cleanup_server_io(io_db)
-    print("DUMMY: (Clean up C heap.)")
+    # print("DUMMY: (Clean up C heap.)")