home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor.
[plomrogue2-experiments]
/
server.py
diff --git
a/server.py
b/server.py
index 5847a5439982ecaa02f1673e0cceed948afd75c1..c398930a99d76a32258fac2748995d43ec214d8e 100755
(executable)
--- a/
server.py
+++ b/
server.py
@@
-106,14
+106,20
@@
class CommandHandler(game_common.Commander, server_.game.Commander):
self.pool = Pool()
self.pool_result = None
self.pool = Pool()
self.pool_result = None
- def handle_input(self, input_, connection_id=None, abort_on_error=False,
- store=True):
+ def handle_input(self, input_, connection_id=None, store=True):
"""Process input_ to command grammar, call command handler if found."""
from inspect import signature
"""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:
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:
if 'connection_id' in list(signature(command).parameters):
command(connection_id=connection_id)
@@
-123,27
+129,18
@@
class CommandHandler(game_common.Commander, server_.game.Commander):
with open(self.game_file_name, 'a') as f:
f.write(input_ + '\n')
except parser.ArgError as e:
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:
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:
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_):
"""Send out game state data relevant to clients."""
def stringify_yx(tuple_):
@@
-161,16
+158,16
@@
class CommandHandler(game_common.Commander, server_.game.Commander):
quoted += ['"']
return ''.join(quoted)
quoted += ['"']
return ''.join(quoted)
- self.send
_all
('NEW_TURN ' + str(self.world.turn))
- self.send
_all
('MAP_SIZE ' + stringify_yx(self.world.map_size))
+ self.send('NEW_TURN ' + str(self.world.turn))
+ self.send('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]
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('TERRAIN_LINE %5s %s' % (y, quoted(terrain_line)))
for thing in self.world.things:
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.
def proceed(self):
"""Send turn finish signal, run game world, send new world data.
@@
-178,9
+175,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.
"""
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.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:].
def cmd_FIB(self, numbers, connection_id):
"""Reply with n-th Fibonacci numbers, n taken from tokens[1:].
@@
-188,10
+187,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.
"""
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])
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):
cmd_FIB.argtypes = 'seq:int:nonneg'
def cmd_INC_P(self, connection_id):
@@
-211,10
+210,10
@@
class CommandHandler(game_common.Commander, server_.game.Commander):
from time import sleep
if self.pool_result is not None:
self.pool_result.wait()
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
sleep(1)
self.world.turn += 1
- self.send_
all_
gamestate()
+ self.send_gamestate()
self.pool_result = self.pool.map_async(fib, (35, 35))
self.pool_result = self.pool.map_async(fib, (35, 35))
@@
-262,7
+261,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='')
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,
store=False)
+ commander.handle_input(line, store=False)
else:
commander.handle_input('MAP_SIZE Y:5,X:5')
commander.handle_input('TERRAIN_LINE 0 "xxxxx"')
else:
commander.handle_input('MAP_SIZE Y:5,X:5')
commander.handle_input('TERRAIN_LINE 0 "xxxxx"')