From 7d25c53656415a4699f6ad899974839eaa62af36 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 14 Jan 2019 18:01:19 +0100 Subject: [PATCH 1/1] Ignore success messages, properly quote messages. --- client.py | 5 +++++ server.py | 27 ++++++++++++++------------- server_/game.py | 1 - 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/client.py b/client.py index 80cac96..dd40323 100755 --- a/client.py +++ b/client.py @@ -23,6 +23,11 @@ class Game(Commander): symbol = 'm' return symbol + def cmd_LAST_PLAYER_TASK_RESULT(self, msg): + if msg != "success": + self.log_text = msg + '\n' + self.log_text + cmd_LAST_PLAYER_TASK_RESULT.argtypes = 'string' + def cmd_TURN_FINISHED(self, n): """Do nothing. (This may be extended later.)""" pass diff --git a/server.py b/server.py index cf70699..3028b83 100755 --- a/server.py +++ b/server.py @@ -133,6 +133,17 @@ class CommandHandler(game_common.Commander, server_.game.Commander): except server_.game.GameError as e: answer(connection_id, 'GAME ERROR: ' + str(e)) + def quote(self, string): + """Quote & escape string so client interprets it as single token.""" + quoted = [] + quoted += ['"'] + for c in string: + if c in {'"', '\\'}: + quoted += ['\\'] + quoted += [c] + quoted += ['"'] + return ''.join(quoted) + def send(self, msg, connection_id=None): if connection_id: self.queues_out[connection_id].put(msg) @@ -147,22 +158,12 @@ class CommandHandler(game_common.Commander, server_.game.Commander): """Transform tuple (y,x) into string 'Y:'+str(y)+',X:'+str(x).""" return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1]) - def quoted(string): - """Quote & escape string so client interprets it as single token.""" - quoted = [] - quoted += ['"'] - for c in string: - if c in {'"', '\\'}: - quoted += ['\\'] - quoted += [c] - quoted += ['"'] - return ''.join(quoted) - 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))) + self.send('VISIBLE_MAP_LINE %5s %s' % + (y, self.quote(visible_map.get_line(y)))) visible_things = self.world.get_player().get_visible_things() for thing in visible_things: self.send('THING_TYPE %s %s' % (thing.id_, thing.type_)) @@ -178,7 +179,7 @@ class CommandHandler(game_common.Commander, server_.game.Commander): self.send('TURN_FINISHED ' + str(self.world.turn)) self.world.proceed_to_next_player_turn() msg = str(self.world.get_player().last_task_result) - self.send('LAST_PLAYER_TASK_RESULT ' + msg) + self.send('LAST_PLAYER_TASK_RESULT ' + self.quote(msg)) self.send_gamestate() def cmd_FIB(self, numbers, connection_id): diff --git a/server_/game.py b/server_/game.py index 910d608..59df5ae 100644 --- a/server_/game.py +++ b/server_/game.py @@ -179,7 +179,6 @@ class Thing(game_common.Thing): stencil = self.get_stencil() visible_things = [] for thing in self.world.things: - print('DEBUG .....') width = self.world.map_.size[1] pos_i = thing.position[0] * width + thing.position[1] if stencil.terrain[pos_i] == '.': -- 2.30.2