X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=48e28d6a3a28f5c111bd48e384b9eb2741736e10;hb=5820609a005b06da4c34ae5d44247e0379781999;hp=67d2259dc9f33aef4737f5a10056063704ec2488;hpb=a654b8d4a7c61de200924bafe8632e5ed7ac61e2;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 67d2259..48e28d6 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -53,13 +53,17 @@ def detect_atomic_leftover(path):
 def obey(cmd, io_db, path_recordfile):
     """"""
     print("Input: " + cmd)
-    tokens = shlex.split(cmd, comments=True)
+    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)
+        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.")
@@ -98,6 +102,14 @@ try:
     elif os.access(path_savefile, os.F_OK):
         print(open(path_savefile, "r").read())
     else:
+        path_worldconfig = "confserver/world"
+        if not os.access(path_worldconfig, os.F_OK):
+            msg = "No world config file from which to start a new world."
+            raise SystemExit(msg)
+        file = open(path_worldconfig)
+        for line in file.readlines():
+            obey(line.rstrip(), io_db, path_recordfile)
+        file.close()
         obey("MAKE_WORLD " + str(int(time.time())), io_db, path_recordfile)
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])