home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server/py: Catch shlex tokenizer ValueError exceptions in obey().
[plomrogue]
/
plomrogue-server.py
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 3e0f892a89cb5a17448bdc9b6d9458164aa69550..7a56d55e87e6e92f42e312cdf16410f57de38e60 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-50,20
+50,36
@@
def detect_atomic_leftover(path):
raise SystemExit(msg)
raise SystemExit(msg)
-def obey(cmd):
+def obey(cmd
, io_db, path_recordfile
):
""""""
print("Input: " + cmd)
""""""
print("Input: " + cmd)
- tokens = shlex.split(cmd)
- if "QUIT" == tokens[0] and 1 == len(tokens):
- raise SystemExit("received QUIT command")
+ 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 "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.")
elif "MAKE_WORLD" == tokens[0] and 2 == len(tokens):
print("I would generate a new world now, if only I knew how.")
+ record(cmd, path_recordfile)
else:
print("Invalid command/argument, or bad number of tokens.")
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."""
+ file = open(path_recordfile, "a")
+ file.write(cmd + "\n")
+ file.close()
+
+
+
io_db = {}
try:
parser = argparse.ArgumentParser()
io_db = {}
try:
parser = argparse.ArgumentParser()
@@
-86,7
+102,7
@@
try:
elif os.access(path_savefile, os.F_OK):
print(open(path_savefile, "r").read())
else:
elif os.access(path_savefile, os.F_OK):
print(open(path_savefile, "r").read())
else:
- obey("MAKE_WORLD " + str(int(time.time())))
+ obey("MAKE_WORLD " + str(int(time.time()))
, io_db, path_recordfile
)
except SystemExit as exit:
print("ABORTING: " + exit.args[0])
except:
except SystemExit as exit:
print("ABORTING: " + exit.args[0])
except: