X-Git-Url: https://plomlompom.com/repos//%22https:/validator.w3.org/check?a=blobdiff_plain;f=server.py;h=c5fbff4a18ef45fd22fc526d15999be4af79c809;hb=827134a13175939231b85fbc159c013e0f024e78;hp=d9097650344571b4ce6713d9d412ea4537399660;hpb=8c827d2cce8c69c55bcf9154ec7c8fc12732c3bf;p=plomrogue2-experiments diff --git a/server.py b/server.py index d909765..c5fbff4 100755 --- a/server.py +++ b/server.py @@ -95,50 +95,52 @@ def fib(n): class CommandHandler(game_common.Commander, server_.game.Commander): - def __init__(self): - from multiprocessing import Pool + def __init__(self, game_file_name): self.queues_out = {} self.world = server_.game.World() self.parser = parser.Parser(self) + self.game_file_name = game_file_name # self.pool and self.pool_result are currently only needed by the FIB # command and the demo of a parallelized game loop in cmd_inc_p. + from multiprocessing import Pool self.pool = Pool() self.pool_result = None - def handle_input(self, input_, connection_id=None, abort_on_error=False): + def handle_input(self, input_, connection_id=None, store=True): """Process input_ to command grammar, call command handler if found.""" from inspect import signature + + def answer(connection_id, msg): + if connection_id: + self.send(msg, connection_id) + else: + print(msg) + try: command = self.parser.parse(input_) if command is None: - self.send_to(connection_id, 'UNHANDLED INPUT') + answer(connection_id, 'UNHANDLED INPUT') else: if 'connection_id' in list(signature(command).parameters): command(connection_id=connection_id) else: command() + if store: + with open(self.game_file_name, 'a') as f: + f.write(input_ + '\n') except parser.ArgError as e: - self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e)) - if abort_on_error: - exit(1) + answer(connection_id, 'ARGUMENT ERROR: ' + str(e)) except server_.game.GameError as e: - self.send_to(connection_id, 'GAME ERROR: ' + str(e)) - if abort_on_error: - exit(1) + answer(connection_id, 'GAME ERROR: ' + str(e)) - def send_to(self, connection_id, msg): - """Send msg to client of connection_id; if no later, print instead.""" + def send(self, msg, connection_id=None): if connection_id: self.queues_out[connection_id].put(msg) else: - print(msg) - - def send_all(self, msg): - """Send msg to all clients.""" - for connection_id in self.queues_out: - self.send_to(connection_id, msg) + for connection_id in self.queues_out: + self.queues_out[connection_id].put(msg) - def send_all_gamestate(self): + def send_gamestate(self, connection_id=None): """Send out game state data relevant to clients.""" def stringify_yx(tuple_): @@ -156,16 +158,15 @@ class CommandHandler(game_common.Commander, server_.game.Commander): quoted += ['"'] return ''.join(quoted) - self.send_all('NEW_TURN ' + str(self.world.turn)) - self.send_all('MAP_SIZE ' + stringify_yx(self.world.map_size)) - for y in range(self.world.map_size[0]): - width = self.world.map_size[1] - terrain_line = self.world.terrain_map[y * width:(y + 1) * width] - self.send_all('TERRAIN_LINE %5s %s' % (y, quoted(terrain_line))) + self.send('NEW_TURN ' + str(self.world.turn)) + self.send('MAP_SIZE ' + stringify_yx(self.world.map_.size)) + visible_map = self.world.get_player().get_visible_map() + for y in range(self.world.map_.size[0]): + self.send('VISIBLE_MAP_LINE %5s %s' % (y, visible_map.get_line(y))) for thing in self.world.things: - self.send_all('THING_TYPE %s %s' % (thing.id_, thing.type_)) - self.send_all('THING_POS %s %s' % (thing.id_, - stringify_yx(thing.position))) + self.send('THING_TYPE %s %s' % (thing.id_, thing.type_)) + self.send('THING_POS %s %s' % (thing.id_, + stringify_yx(thing.position))) def proceed(self): """Send turn finish signal, run game world, send new world data. @@ -173,9 +174,11 @@ class CommandHandler(game_common.Commander, server_.game.Commander): First sends 'TURN_FINISHED' message, then runs game world until new player input is needed, then sends game state. """ - self.send_all('TURN_FINISHED ' + str(self.world.turn)) + self.send('TURN_FINISHED ' + str(self.world.turn)) self.world.proceed_to_next_player_turn() - self.send_all_gamestate() + msg = str(self.world.get_player().last_task_result) + self.send('LAST_PLAYER_TASK_RESULT ' + msg) + self.send_gamestate() def cmd_FIB(self, numbers, connection_id): """Reply with n-th Fibonacci numbers, n taken from tokens[1:]. @@ -183,10 +186,10 @@ class CommandHandler(game_common.Commander, server_.game.Commander): Numbers are calculated in parallel as far as possible, using fib(). A 'CALCULATING …' message is sent to caller before the result. """ - self.send_to(connection_id, 'CALCULATING …') + self.send('CALCULATING …', connection_id) results = self.pool.map(fib, numbers) reply = ' '.join([str(r) for r in results]) - self.send_to(connection_id, reply) + self.send(reply, connection_id) cmd_FIB.argtypes = 'seq:int:nonneg' def cmd_INC_P(self, connection_id): @@ -206,10 +209,10 @@ class CommandHandler(game_common.Commander, server_.game.Commander): from time import sleep if self.pool_result is not None: self.pool_result.wait() - self.send_all('TURN_FINISHED ' + str(self.world.turn)) + self.send('TURN_FINISHED ' + str(self.world.turn)) sleep(1) self.world.turn += 1 - self.send_all_gamestate() + self.send_gamestate() self.pool_result = self.pool.map_async(fib, (35, 35)) @@ -247,7 +250,7 @@ if len(sys.argv) != 2: print('wrong number of arguments, expected one (game file)') exit(1) game_file_name = sys.argv[1] -commander = CommandHandler() +commander = CommandHandler(game_file_name) if os.path.exists(game_file_name): if not os.path.isfile(game_file_name): print('game file name does not refer to a valid game file') @@ -257,7 +260,7 @@ if os.path.exists(game_file_name): for i in range(len(lines)): line = lines[i] print("FILE INPUT LINE %s: %s" % (i, line), end='') - commander.handle_input(line, abort_on_error=True) + commander.handle_input(line, store=False) else: commander.handle_input('MAP_SIZE Y:5,X:5') commander.handle_input('TERRAIN_LINE 0 "xxxxx"')