From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 17 Feb 2015 02:05:58 +0000 (+0100)
Subject: Server/py: Add command line help, handle pre-server-io-setup exits.
X-Git-Tag: tce~527
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=013fab6ba005e8c553b51849d845b7da3d0eb2e4;p=plomrogue

Server/py: Add command line help, handle pre-server-io-setup exits.
---

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 1e4eda1..0123597 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -35,15 +35,16 @@ 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."""
+    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 detect_atomic_leftover(path):
@@ -58,15 +59,15 @@ def detect_atomic_leftover(path):
 
 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.")
+    # print("DUMMY: Obey command-line arguments.")
+    # print("DUMMY: Open files.")
     setup_server_io(io_db)
-    print("DUMMY: Run game.")
+    # print("DUMMY: Run game.")
     path_recordfile = "recordfile"
     path_savefile = "savefile"
     detect_atomic_leftover(path_savefile)
@@ -76,6 +77,8 @@ try:
     else:
         msg = "MAKE_WORLD " + str(int(time.time()))
         print(msg)
+except SystemExit:
+    pass
 except HandledException as exception:
     print("Error:")
     print(exception.args[0])
@@ -84,4 +87,4 @@ except:
     raise
 finally:
     cleanup_server_io(io_db)
-    print("DUMMY: (Clean up C heap.)")
+    # print("DUMMY: (Clean up C heap.)")