X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=9bdab821360dd4262d1de20a9f817e197eb6c8dd;hb=211117b78cd617e6117df99de895a0eb81751eb8;hp=012359752506d2bfbcb63b5a92bf78a15d5c0d3d;hpb=013fab6ba005e8c553b51849d845b7da3d0eb2e4;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 0123597..9bdab82 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,15 +1,10 @@
 import argparse
 import errno
 import os
+import shlex
 import time
 
 
-class HandledException(Exception):
-    """Feature-less Exception child. Use for expected operational errors."""
-
-    pass
-
-
 def setup_server_io(io_db):
     """Fill IO files DB with proper file( path)s. Write process IO test string.
 
@@ -36,15 +31,13 @@ def setup_server_io(io_db):
 
 def cleanup_server_io(io_db):
     """Close and remove all files open in IO files DB."""
-    if "file_out" in io_db:
-        io_db["file_out"].close()
-        os.remove(io_db["path_out"])
-    if "file_in" in io_db:
-        io_db["file_in"].close()
-        os.remove(io_db["path_in"])
-    if "file_worldstate" in io_db:
-        io_db["file_worldstate"].close()
-        os.remove(io_db["path_worldstate"])
+    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):
@@ -54,7 +47,13 @@ def detect_atomic_leftover(path):
           "aborted previous attempt to write '" + path + "'. Aborting until " \
           "the matter is resolved by removing it from its current path."
     if os.access(path_tmp, os.F_OK):
-        raise HandledException(msg)
+        raise SystemExit(msg)
+
+
+def obey(msg):
+    """"""
+    print("Input: " + msg)
+    print(shlex.split(msg))
 
 
 io_db = {}
@@ -62,26 +61,27 @@ try:
     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.")
     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_recordfile, os.F_OK):
+            raise SystemExit("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)
-except SystemExit:
-    pass
-except HandledException as exception:
-    print("Error:")
-    print(exception.args[0])
+        obey(msg)
+except SystemExit as exit:
+    print("ABORTING: " + exit.args[0])
 except:
     print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
     raise