# HG changeset patch # User Eugen Sawin # Date 1275776970 -7200 # Node ID 2e65c867022c642213d94a61a20d93121e3141df # Parent fb00185487d4bcc594905612a4c0fa344cc8fe80 Added help command. diff -r fb00185487d4 -r 2e65c867022c com.py --- a/com.py Thu May 27 17:14:56 2010 +0200 +++ b/com.py Sun Jun 06 00:29:30 2010 +0200 @@ -1,5 +1,11 @@ import grid +commands = {} + +def help(socket, client): + socket.sendto("\n".join([key + ": " + value[1] + for key, value in commands.iteritems()]) + "\n", client) + def createGrid(socket, client, (name,)): grid.createGrid(name) #print "grid %s created" % name @@ -36,10 +42,12 @@ grid = lookupGrid(socket, client, gridName) if grid: grid.addObserver(socket, client) + socket.sendto("observer added: " + str(client) + "\n", client) -commands = {"create grid": createGrid, - "list grids": listGrids, - "set cell": setCell, - "list cells": listCells, - "iterate": iterate, - "add observer": addObserver} +commands = {"help": (help, "help"), + "create grid": (createGrid, "creates grid"), + "list grids": (listGrids, "lists all grids"), + "set cell": (setCell, "sets the value of a cell"), + "list cells": (listCells, "lists all cells of a grid"), + "iterate": (iterate, "iterates"), + "add observer": (addObserver, "adds an observer to a grid's events")} diff -r fb00185487d4 -r 2e65c867022c server.py --- a/server.py Thu May 27 17:14:56 2010 +0200 +++ b/server.py Sun Jun 06 00:29:30 2010 +0200 @@ -21,9 +21,9 @@ if key in data: args = data.partition(key)[2].split() if args: - value(socket, self.client_address, args) + value[0](socket, self.client_address, args) else: - value(socket, self.client_address) + value[0](socket, self.client_address) class Server(SocketServer.UDPServer): def __init__(self, host, port, handler, options):