The command string is tokenized by shlex.split(comments=True). If replay is
set, a non-meta command from the commands_db merely triggers obey() on the
- next command from the records file. Non-meta commands are recorded in
- non-replay mode if do_record is set. The prefix string is inserted into the
- server's input message between its beginning 'input ' and ':'. All activity
- is preceded by a call to server_test().
+ next command from the records file. If not, and do do_record is set,
+ non-meta commands are recorded via record(), and save_world() is called.
+ The prefix string is inserted into the server's input message between its
+ beginning 'input ' & ':'. All activity is preceded by a server_test() call.
"""
server_test()
print("input " + prefix + ": " + command)
print("Can't tokenize command string: " + str(err) + ".")
return
if len(tokens) > 0 and tokens[0] in commands_db \
- and len(tokens) >= commands_db[tokens[0]][0] + 1:
+ and len(tokens) == commands_db[tokens[0]][0] + 1:
if commands_db[tokens[0]][1]:
commands_db[tokens[0]][2]()
elif replay:
else:
print("Reached end of record file.")
else:
- commands_db[tokens[0]][2]()
+ commands_db[tokens[0]][2](*tokens[1:])
if do_record:
record(command)
+ save_world()
else:
print("Invalid command/argument, or bad number of tokens.")
+def atomic_write(path, text, do_append=False):
+ """Atomic write of text to file at path, appended if do_append is set."""
+ path_tmp = path + io_db["tmp_suffix"]
+ mode = "w"
+ if do_append:
+ mode = "a"
+ if os.access(path, os.F_OK):
+ shutil.copyfile(path, path_tmp)
+ file = open(path_tmp, mode)
+ file.write(text)
+ file.flush()
+ os.fsync(file.fileno())
+ file.close()
+ if os.access(path, os.F_OK):
+ os.remove(path)
+ os.rename(path_tmp, path)
+
+
def record(command):
"""Append command string plus newline to record file. (Atomic.)"""
# This misses some optimizations from the original record(), namely only
# finishing the atomic write with expensive flush() and fsync() every 15
# seconds unless explicitely forced. Implement as needed.
- path_tmp = io_db["path_record"] + io_db["tmp_suffix"]
- if os.access(io_db["path_record"], os.F_OK):
- shutil.copyfile(io_db["path_record"], path_tmp)
- file = open(path_tmp, "a")
- file.write(command + "\n")
- file.flush()
- os.fsync(file.fileno())
- file.close()
- if os.access(io_db["path_record"], os.F_OK):
- os.remove(io_db["path_record"])
- os.rename(path_tmp, io_db["path_record"])
+ atomic_write(io_db["path_record"], command + "\n", do_append=True)
+
+
+def save_world():
+ # Dummy for saving all commands to reconstruct current world state.
+ # Misses same optimizations as record() from the original record().
+ atomic_write(io_db["path_save"],
+ "WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"]) + "\n" +
+ "MAP_LENGTH " + str(world_db["MAP_LENGTH"]) + "\n" +
+ "PLAYER_TYPE " + str(world_db["PLAYER_TYPE"]) + "\n" +
+ "TURN " + str(world_db["TURN"]) + "\n" +
+ "SEED_RANDOMNESS " + str(world_db["SEED_RANDOMNESS"]) + "\n" +
+ "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n")
+ # TODO: If all this ever does is just writing down what's in world_db, some
+ # loop over its entries should be all that's needed.
def obey_lines_in_file(path, name, do_record=False):
if not os.access(io_db["path_record"], os.F_OK):
raise SystemExit("No record file found to replay.")
io_db["file_record"] = open(io_db["path_record"], "r")
- io_db["file_record"].prefix = "recod file line "
+ io_db["file_record"].prefix = "record file line "
io_db["file_record"].line_n = 1
- while world_db["turn"] < opts.replay:
+ while world_db["TURN"] < opts.replay:
line = io_db["file_record"].readline()
if "" == line:
break
obey(read_command(), "in file", do_record=True)
-def command_makeworld():
- """Mere dummy so far."""
- print("I would build a whole world now if only I knew how.")
+def remake_map():
+ # DUMMY.
+ print("I'd (re-)make the map now, if only I knew how.")
+
+
+def set_world_inactive():
+ """Set world_db["WORLD_ACTIVE"] to 0 and remove worldstate file."""
+ server_test()
+ if os.access(io_db["path_worldstate"], os.F_OK):
+ os.remove(io_db["path_worldstate"])
+ world_db["WORLD_ACTIVE"] = 0
+
+
+def worlddb_value_setter(key, min, max):
+ """Generate: Set world_db[key] to int(val_string) if >= min and <= max."""
+ def func(val_string):
+ try:
+ val = int(val_string)
+ if val < min or val > max:
+ raise ValueError
+ world_db[key] = val
+ except ValueError:
+ print("Ignoring: Please use integer >= " + str(min) + " and <= " +
+ str(max) + ".")
+ return func
def command_ping():
raise SystemExit("received QUIT command")
+def command_seedmap(seed_string):
+ """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map."""
+ worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+ remake_map()
+
+
+def command_makeworld(seed_string):
+ # DUMMY.
+ worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+ worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
+ # TODO: Test for existence of player thing and 'wait' thing action?
+
+
+def command_maplength(maplength_string):
+ # DUMMY.
+ set_world_inactive()
+ # TODO: remove things, map
+ worlddb_value_setter("MAP_LENGTH", 1, 256)(maplength_string)
+
+
+def command_worldactive(worldactive_string):
+ # DUMMY.
+ try:
+ val = int(worldactive_string)
+ if not (0 == val or 1 == val):
+ raise ValueError
+ except ValueError:
+ print("Ignoring: Please use integer 0 or 1.")
+ return
+ if 0 != world_db["WORLD_ACTIVE"] and 0 == val:
+ set_world_inactive()
+ elif 0 == world_db["WORLD_ACTIVE"]:
+ wait_exists = False
+ player_exists = False
+ map_exists = False
+ # TODO: perform tests:
+ # Is there thing action of name 'wait'?
+ # Is there a player thing?
+ # Is there a map?
+ if wait_exists and player_exists and map_exists:
+ # TODO: rebuild al things' FOVs, map memories
+ world_db["WORLD_ACTIVE"] = 1
+
+
"""Commands database.
-Map command start tokens to ([0]) minimum number of expected command arguments,
-([1]) the command's meta-ness (i.e. is it to be written to the record file, is
-it to be ignored in replay mode if read from server input file), and ([2]) a
-function to be called on it.
+Map command start tokens to ([0]) number of expected command arguments, ([1])
+the command's meta-ness (i.e. is it to be written to the record file, is it to
+be ignored in replay mode if read from server input file), and ([2]) a function
+to be called on it.
"""
commands_db = {
"QUIT": (0, True, command_quit),
"PING": (0, True, command_ping),
- "MAKE_WORLD": (1, False, command_makeworld)
+ "MAKE_WORLD": (1, False, command_makeworld),
+ "SEED_MAP": (1, False, command_seedmap),
+ "SEED_RANDOMNESS": (1, False, worlddb_value_setter("SEED_RANDOMNESS", 0,
+ 4294967295)),
+ "TURN": (1, False, worlddb_value_setter("TURN", 0, 65535)),
+ "PLAYER_TYPE": (1, False, worlddb_value_setter("PLAYER_TYPE", 0, 255)),
+ "MAP_LENGTH": (1, False, command_maplength),
+ "WORLD_ACTIVE": (1, False, command_worldactive)
}
-"""World state database,"""
+"""World state database. With sane default values."""
world_db = {
- "turn": 0
+ "TURN": 1,
+ "SEED_MAP": 0,
+ "SEED_RANDOMNESS": 0,
+ "PLAYER_TYPE": 0,
+ "MAP_LENGTH": 64,
+ "WORLD_ACTIVE": 0,
+ "thing actions": {},
+ "thing types": {},
+ "things": {}
}
projects / plomrogue / blobdiff