X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=a1e3a44f120530276d61fbbb3f1cc08f4438e705;hb=dff65f419bc0ac5af9fd2003c0f958d0c50e27cc;hp=99f1c6017d38aaa2fe6e9c77c1c3e51ca3f24050;hpb=307b04dbc3e4065a61c7d804953da9dc1c1cba0b;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 99f1c60..a1e3a44 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -6,6 +6,13 @@ import shutil import time +def strong_write(file, string): + """Apply write(string), flush() and os.fsync() to file.""" + file.write(string) + file.flush() + os.fsync(file) + + def setup_server_io(): """Fill IO files DB with proper file( path)s. Write process IO test string. @@ -25,8 +32,7 @@ def setup_server_io(): io_db["teststring"] = str(os.getpid()) + " " + str(time.time()) os.makedirs(io_db["path_server"], exist_ok=True) io_db["file_out"] = open(io_db["path_out"], "w") - io_db["file_out"].write(io_db["teststring"] + "\n") - io_db["file_out"].flush() + strong_write(io_db["file_out"], io_db["teststring"] + "\n") if os.access(io_db["path_in"], os.F_OK): os.remove(io_db["path_in"]) io_db["file_in"] = open(io_db["path_in"], "w") @@ -54,10 +60,11 @@ def cleanup_server_io(): def obey(command, prefix, replay=False, do_record=False): """Call function from commands_db mapped to command's first token. - 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. If not, and do do_record is set, - non-meta commands are recorded via record(), and save_world() is called. + Tokenize command string with 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. If not, non-meta commands set + io_db["worldstate_updateable"] to world_db["WORLD_EXISTS"], and, if + do_record is set, 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. """ @@ -71,7 +78,7 @@ def obey(command, prefix, replay=False, do_record=False): if len(tokens) > 0 and tokens[0] in commands_db \ and len(tokens) == commands_db[tokens[0]][0] + 1: if commands_db[tokens[0]][1]: - commands_db[tokens[0]][2]() + commands_db[tokens[0]][2](*tokens[1:]) elif replay: print("Due to replay mode, reading command as 'go on in record'.") line = io_db["file_record"].readline() @@ -86,6 +93,7 @@ def obey(command, prefix, replay=False, do_record=False): if do_record: record(command) save_world() + io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"] elif 0 != len(tokens): print("Invalid command/argument, or bad number of tokens.") @@ -99,9 +107,7 @@ def atomic_write(path, text, do_append=False): 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()) + strong_write(file, text) file.close() if os.access(path, os.F_OK): os.remove(path) @@ -117,7 +123,7 @@ def record(command): def save_world(): - """Save all commands needed to reconstruct current world state.""" + """Save all commands needed to reconstruct current world state.""" # TODO: Misses same optimizations as record() from the original record(). def quote(string): @@ -130,7 +136,7 @@ def save_world(): if world_db["Things"][id][key]: rmap = world_db["Things"][id][key] length = world_db["MAP_LENGTH"] - for i in range(world_db["MAP_LENGTH"]): + for i in range(length): line = rmap[i * length:(i * length) + length].decode() string = string + key + " " + str(i) + quote(line) + "\n" return string @@ -158,7 +164,7 @@ def save_world(): string = "" for key in world_db: - if dict != type(world_db[key]): + if dict != type(world_db[key]) and key != "MAP": string = string + key + " " + str(world_db[key]) + "\n" string = string + helper("ThingActions", "TA_ID") string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False}) @@ -175,6 +181,7 @@ def save_world(): string = string + "T_ID " + str(id) + "\n" for carried_id in world_db["Things"][id]["T_CARRIES"]: string = string + "T_CARRIES " + str(carried_id) + "\n" + string = string + "WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"]) atomic_write(io_db["path_save"], string) @@ -243,12 +250,41 @@ def read_command(): return command +def try_worldstate_update(): + """Write worldstate file if io_db["worldstate_updateable"] is set.""" + if io_db["worldstate_updateable"]: + inventory = "" + if [] == world_db["Things"][0]["T_CARRIES"]: + inventory = "(none)\n" + else: + for id in world_db["Things"][0]["T_CARRIES"]: + type_id = world_db["Things"][id]["T_TYPE"] + name = world_db["ThingTypes"][type_id]["TT_NAME"] + inventory = inventory + name + "\n" + string = str(world_db["TURN"]) + "\n" + \ + str(world_db["Things"][0]["T_LIFEPOINTS"]) + "\n" + \ + str(world_db["Things"][0]["T_SATIATION"]) + "\n" + \ + inventory + "%\n" + \ + str(world_db["Things"][0]["T_POSY"]) + "\n" + \ + str(world_db["Things"][0]["T_POSX"]) + "\n" + \ + str(world_db["MAP_LENGTH"]) + "\n" + length = world_db["MAP_LENGTH"] + for i in range(length): + line = world_db["MAP"][i * length:(i * length) + length].decode() + string = string + line + "\n" + # TODO: no proper user-subjective map + atomic_write(io_db["path_worldstate"], string) + strong_write(io_db["file_out"], "WORLD_UPDATED\n") + io_db["worldstate_updateable"] = False + + def replay_game(): """Replay game from record file. Use opts.replay as breakpoint turn to which to replay automatically before switching to manual input by non-meta commands in server input file triggering further reads of record file. Ensure opts.replay is at least 1. + Run try_worldstate_update() before each interactive obey()/read_command(). """ if opts.replay < 1: opts.replay = 1 @@ -267,6 +303,7 @@ def replay_game(): + str(io_db["file_record"].line_n)) io_db["file_record"].line_n = io_db["file_record"].line_n + 1 while True: + try_worldstate_update() obey(read_command(), "in file", replay=True) @@ -275,7 +312,8 @@ def play_game(): If no save file is found, a new world is generated from the commands in the world config plus a 'MAKE WORLD [current Unix timestamp]'. Record this - command and all that follow via the server input file. + command and all that follow via the server input file. Run + try_worldstate_update() before each interactive obey()/read_command(). """ if os.access(io_db["path_save"], os.F_OK): obey_lines_in_file(io_db["path_save"], "save") @@ -287,12 +325,13 @@ def play_game(): do_record=True) obey("MAKE_WORLD " + str(int(time.time())), "in file", do_record=True) while True: + try_worldstate_update() obey(read_command(), "in file", do_record=True) def remake_map(): - # DUMMY. - print("I'd (re-)make the map now, if only I knew how.") + # DUMMY map creator. + world_db["MAP"] = bytearray(b'.' * (world_db["MAP_LENGTH"] ** 2)) def set_world_inactive(): @@ -342,10 +381,44 @@ def setter(category, key, min, max): return f +def id_setter(id, category, id_store=False, start_at_1=False): + """Set ID of object of category to manipulate ID unused? Create new one. + + The ID is stored as id_store.id (if id_store is set). If the integer of the + input is valid (if start_at_1, >= 0 and <= 255, else >= -32768 and <= + 32767), but <0 or (if start_at_1) <1, calculate new ID: lowest unused ID + >=0 or (if start_at_1) >= 1, and <= 255. None is always returned when no + new object is created, otherwise the new object's ID. + """ + min = 0 if start_at_1 else -32768 + max = 255 if start_at_1 else 32767 + if str == type(id): + id = integer_test(id, min, max) + if None != id: + if id in world_db[category]: + if id_store: + id_store.id = id + return None + else: + if (start_at_1 and 0 == id) \ + or ((not start_at_1) and (id < 0 or id > 255)): + id = -1 + while 1: + id = id + 1 + if id not in world_db[category]: + break + if id > 255: + print("Ignoring: " + "No unused ID available to add to ID list.") + return None + if id_store: + id_store.id = id + return id + + def command_ping(): """Send PONG line to server output file.""" - io_db["file_out"].write("PONG\n") - io_db["file_out"].flush() + strong_write(io_db["file_out"], "PONG\n") def command_quit(): @@ -353,6 +426,11 @@ def command_quit(): raise SystemExit("received QUIT command") +def command_thingshere(y, x): + # DUMMY + print("Ignoring not-yet implemented THINGS_HERE command.") + + def command_seedmap(seed_string): """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map.""" setter(None, "SEED_MAP", 0, 4294967295)(seed_string) @@ -361,15 +439,56 @@ def command_seedmap(seed_string): def command_makeworld(seed_string): # DUMMY. - setter(None, "SEED_MAP", 0, 4294967295)(seed_string) setter(None, "SEED_RANDOMNESS", 0, 4294967295)(seed_string) - # TODO: Test for existence of player thing and 'wait' thing action? + player_will_be_generated = False + playertype = world_db["PLAYER_TYPE"] + for ThingType in world_db["ThingTypes"]: + if playertype == ThingType: + if 0 < world_db["ThingTypes"][ThingType]["TT_START_NUMBER"]: + player_will_be_generated = True + break + if not player_will_be_generated: + print("Ignoring beyond SEED_MAP: " + + "No player type with start number >0 defined.") + return + wait_action = False + for ThingAction in world_db["ThingActions"]: + if "wait" == world_db["ThingActions"][ThingAction]["TA_NAME"]: + wait_action = True + if not wait_action: + print("Ignoring beyond SEED_MAP: " + + "No thing action with name 'wait' defined.") + return + setter(None, "SEED_MAP", 0, 4294967295)(seed_string) + world_db["Things"] = {} + remake_map() + world_db["WORLD_ACTIVE"] = 1 + world_db["TURN"] = 1 + for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]): + world_db["Things"][id_setter(-1, "Things")] = { + "T_LIFEPOINTS": world_db["ThingTypes"][playertype]["TT_LIFEPOINTS"], + "T_TYPE": playertype, + "T_POSY": 0, # randomize safely + "T_POSX": 0, # randomize safely + "T_ARGUMENT": 0, + "T_PROGRESS": 0, + "T_SATIATION": 0, + "T_COMMAND": 0, + "T_CARRIES": [], + "carried": False, + "T_MEMTHING": [], + "T_MEMMAP": False, + "T_MEMDEPTHMAP": False + } + # generate fov map? + # TODO: Generate things (player first, with updated memory) + strong_write(io_db["file_out"], "NEW_WORLD\n") def command_maplength(maplength_string): # DUMMY. set_world_inactive() - # TODO: remove map + # TODO: remove map (is this necessary? no memory management trouble …) world_db["Things"] = {} setter(None, "MAP_LENGTH", 1, 256)(maplength_string) @@ -378,53 +497,28 @@ def command_worldactive(worldactive_string): # DUMMY. val = integer_test(worldactive_string, 0, 1) if val: - if 0 != world_db["WORLD_ACTIVE"] and 0 == val: - set_world_inactive() + if 0 != world_db["WORLD_ACTIVE"]: + if 0 == val: + set_world_inactive() + else: + print("World already active.") elif 0 == world_db["WORLD_ACTIVE"]: wait_exists = False + for ThingAction in world_db["ThingActions"]: + if "wait" == world_db["ThingActions"][ThingAction]["TA_NAME"]: + wait_exists = True + break 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? + for Thing in world_db["Things"]: + if 0 == Thing: + player_exists = True + break + map_exists = "MAP" in world_db if wait_exists and player_exists and map_exists: - # TODO: rebuild al things' FOVs, map memories + # TODO: rebuild all things' FOVs, map memories world_db["WORLD_ACTIVE"] = 1 -def id_setter(id_string, category, id_store, start_at_1=False): - """Set ID of object of category to manipulate ID unused? Create new one. - - The ID is stored as id_store.id. If the integer of the input is valid (if - start_at_1, >= 0 and <= 255, else >= -32768 and <= 32767), but <0 or (if - start_at_1) <1, calculate new ID: lowest unused ID >=0 or (if start_at_1) - >= 1, and <= 255. None is always returned when no new object is created, - otherwise the new object's ID. - """ - min = 0 if start_at_1 else -32768 - max = 255 if start_at_1 else 32767 - id = integer_test(id_string, min, max) - if None != id: - if id in world_db[category]: - id_store.id = id - return None - else: - if (start_at_1 and 0 == id) \ - or ((not start_at_1) and (id < 0 or id > 255)): - id = -1 - while 1: - id = id + 1 - if id not in world_db[category]: - break - if id > 255: - print("Ignoring: " - "No unused ID available to add to ID list.") - return None - id_store.id = id - return id - - def test_for_id_maker(object, category): """Return decorator testing for object having "id" attribute.""" def decorator(f): @@ -665,6 +759,7 @@ to be called on it. commands_db = { "QUIT": (0, True, command_quit), "PING": (0, True, command_ping), + "THINGS_HERE": (2, True, command_thingshere), "MAKE_WORLD": (1, False, command_makeworld), "SEED_MAP": (1, False, command_seedmap), "SEED_RANDOMNESS": (1, False, setter(None, "SEED_RANDOMNESS", @@ -705,7 +800,7 @@ commands_db = { """World state database. With sane default values.""" world_db = { - "TURN": 1, + "TURN": 0, "SEED_MAP": 0, "SEED_RANDOMNESS": 0, "PLAYER_TYPE": 0, @@ -727,7 +822,8 @@ io_db = { "path_out": "server/out", "path_worldstate": "server/worldstate", "tmp_suffix": "_tmp", - "kicked_by_rival": False + "kicked_by_rival": False, + "worldstate_updateable": False }