X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=inline;f=plomrogue-server.py;h=e5b7c0e68bc3a0067384e15b6dd50d55cf1161fe;hb=54a5049dbbc45cfe4582a31f0594320159a6b48c;hp=20704308545fead9275f4092ad794fb74b5d17ea;hpb=88f9b0f3a072b8d796f06a620f3a1170a96e3358;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 2070430..e5b7c0e 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,28 +1,26 @@
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.
- Ensure IO files directory at server/. Remove any old in file if found. Set
- up new in file (io_db["file_in"]) for reading at io_db["path_in"], and new
- out file (io_db["file_out"]) for writing at io_db["path_out"]. Start out
- file with process hash line of format PID + " " + floated UNIX time
- (io_db["teststring"]). Set worldstate file path io_db["path_worldstate"].
+ Decide file paths. Ensure IO files directory at server/. Remove any old in
+ file if found. Set up new in file (io_db["file_in"]) for reading at
+ io_db["path_in"], and new out file (io_db["file_out"]) for writing at
+ io_db["path_out"]. Start out file with process hash line of format PID +
+ " " + floated UNIX time (io_db["teststring"]).
"""
io_dir = "server/"
io_db["path_in"] = io_dir + "in"
io_db["path_out"] = io_dir + "out"
io_db["path_worldstate"] = io_dir + "worldstate"
+ io_db["path_record"] = "record"
+ io_db["path_save"] = "save"
+ io_db["path_worldconf"] = "confserver/world"
io_db["teststring"] = str(os.getpid()) + " " + str(time.time())
os.makedirs(io_dir, exist_ok=True)
io_db["file_out"] = open(io_db["path_out"], "w")
@@ -46,48 +44,83 @@ def cleanup_server_io(io_db):
def detect_atomic_leftover(path):
- """Raise explained HandledException if file is found at path + "_tmp"."""
+ """Raise explained SystemExit 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 " \
"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):
+def obey(cmd, io_db, prefix):
""""""
- print("Input: " + msg)
+ print("input " + prefix + ": " + cmd)
+ try:
+ tokens = shlex.split(cmd, comments=True)
+ except ValueError as err:
+ print("Can't tokenize command string: " + str(err) + ".")
+ return
+ if 0 == len(tokens):
+ pass
+ elif "PING" == tokens[0] and 1 == len(tokens):
+ io_db["file_out"].write("PONG\n")
+ elif "QUIT" == tokens[0] and 1 == len(tokens):
+ record("# " + cmd, path_recordfile)
+ raise SystemExit("received QUIT command")
+ elif "MAKE_WORLD" == tokens[0] and 2 == len(tokens):
+ print("I would generate a new world now, if only I knew how.")
+ record(cmd, io_db["path_record"])
+ else:
+ print("Invalid command/argument, or bad number of tokens.")
+
+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()
+
+
+def obey_lines_in_file(path, name):
+ """Call obey() on each line of path's file, use name in input prefix."""
+ file = open(io_db["path_worldconf"], "r")
+ line_n = 1
+ for line in file.readlines():
+ obey(line.rstrip(), io_db, name + "file line " + str(line_n))
+ line_n = line_n + 1
+ file.close()
io_db = {}
try:
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
- opts, unknown = parser.parse_known_args()
- print(opts)
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)
+ detect_atomic_leftover(io_db["path_save"])
+ detect_atomic_leftover(io_db["path_record"])
+ opts, unknown = parser.parse_known_args()
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).")
- elif os.access(path_savefile, os.F_OK):
- print(open(path_savefile, "r").read())
+ " (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.")
else:
- msg = "MAKE_WORLD " + str(int(time.time()))
- obey(msg)
-except SystemExit:
- pass
-except HandledException as exception:
- print("Error:")
- print(exception.args[0])
+ if os.access(io_db["path_save"], os.F_OK):
+ obey_lines_in_file(io_db["path_save"], "save")
+ 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)
+ obey_lines_in_file(io_db["path_worldconf"], "world config ")
+ 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:
print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
raise