X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=qchess%2Fqchess.py;h=8a3610bd9cfc1d3e4ba1af9565d070f9d645d6b8;hb=f0a7e4b307117bacbc1bfb6aa5e2fcaab89fbe5c;hp=587cfa48aa4526988b12c3e4eec8aa9321a117fc;hpb=f7cca7e99d39a6b04b605e988d182a9b8a9e4be3;p=progcomp2013.git diff --git a/qchess/qchess.py b/qchess/qchess.py index 587cfa4..8a3610b 100755 --- a/qchess/qchess.py +++ b/qchess/qchess.py @@ -257,7 +257,7 @@ class Board(): # Select a piece on the board (colour is the colour of whoever is doing the selecting) def select(self, x,y, colour=None): if not self.on_board(x, y): # Get on board everyone! - raise Exception("BOUNDS") + raise Exception("BOUNDS " + str(x) + ","+str(y)) piece = self.grid[x][y] if piece == None: @@ -272,7 +272,8 @@ class Board(): # Update the board when a piece has been selected # "type" is apparently reserved, so I'll use "state" - def update_select(self, x, y, type_index, state, sanity=True): + def update_select(self, x, y, type_index, state, sanity=True, deselect=True): + #debug(str(self) + " update_select called") piece = self.grid[x][y] if piece.types[type_index] == "unknown": if not state in self.unrevealed_types[piece.colour].keys() and sanity == True: @@ -284,7 +285,7 @@ class Board(): piece.types[type_index] = state piece.current_type = state - if len(self.possible_moves(piece)) <= 0: + if deselect == True and len(self.possible_moves(piece)) <= 0: piece.deselect() # Piece can't move; deselect it # Piece needs to recalculate moves @@ -292,7 +293,7 @@ class Board(): # Update the board when a piece has been moved def update_move(self, x, y, x2, y2, sanity=True): - + #debug(str(self) + " update_move called \""+str(x)+ " " + str(y) + " -> " + str(x2) + " " + str(y2) + "\"") piece = self.grid[x][y] #print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece)) @@ -331,8 +332,8 @@ class Board(): # Update the board from a string # Guesses what to do based on the format of the string - def update(self, result, sanity=True): - #print "Update called with \"" + str(result) + "\"" + def update(self, result, sanity=True, deselect=True): + #debug(str(self) + " update called \""+str(result)+"\"") # String always starts with 'x y' try: s = result.split(" ") @@ -342,7 +343,7 @@ class Board(): piece = self.grid[x][y] if piece == None and sanity == True: - raise Exception("EMPTY") + raise Exception("EMPTY " + str(x) + " " + str(y)) # If a piece is being moved, the third token is '->' # We could get away with just using four integers, but that wouldn't look as cool @@ -366,7 +367,7 @@ class Board(): # Select the piece - self.update_select(x, y, type_index, state, sanity) + self.update_select(x, y, type_index, state, sanity=sanity, deselect=deselect) return result @@ -473,7 +474,7 @@ class Board(): if p.current_type == "unknown": - raise Exception("SANITY: Piece state unknown") + raise Exception("SANITY: Unknown state for piece: "+str(p)) # The below commented out code causes things to break badly #for t in p.types: # if t == "unknown": @@ -636,6 +637,12 @@ class Player(): def reset_board(self, s): pass + + def __str__(self): + return self.name + "<"+str(self.colour)+">" + + def base_player(self): + return self # Player that runs from another process class ExternalAgent(Player): @@ -1131,36 +1138,105 @@ import select network_timeout_start = -1.0 # Timeout in seconds to wait for the start of a message network_timeout_delay = 1.0 # Maximum time between two characters being received -class Network(Player): - def __init__(self, colour, address = (None,4562), baseplayer = None): +class NetworkPlayer(Player): + def __init__(self, colour, network, player): + Player.__init__(self, "@network:"+str(network.address), colour) + self.player = player + self.network = network + + def __str__(self): + return "NetworkPlayer<"+str(self.colour)+","+str(self.player)+">" + + def select(self): + #debug(str(self) + " select called") + if self.player != None: + s = self.player.select() + self.send_message(str(s[0]) + " " + str(s[1])) + else: + s = map(int, self.get_response().split(" ")) + for p in game.players: + if p != self and isinstance(p, NetworkPlayer) and p.player == None: + p.network.send_message(str(s[0]) + " " + str(s[1])) + if s == [-1,-1]: + game.final_result = "network terminate" + game.stop() + return s + + def send_message(self, message): + #debug(str(self) + " send_message(\""+str(message)+"\") called") + self.network.send_message(message) - if baseplayer != None: - name = baseplayer.name + " --> @network" + def get_response(self): + #debug(str(self) + " get_response() called") + s = self.network.get_response() + #debug(str(self) + " get_response() returns \""+str(s)+"\"") + return s + + + def get_move(self): + #debug(str(self) + " get_move called") + if self.player != None: + s = self.player.get_move() + self.send_message(str(s[0]) + " " + str(s[1])) else: - name = "<-- @network" + s = map(int, self.get_response().split(" ")) + for p in game.players: + if p != self and isinstance(p, NetworkPlayer) and p.player == None: + p.network.send_message(str(s[0]) + " " + str(s[1])) + + if s == [-1,-1]: + game.final_result = "network terminate" + game.stop() + return s + + def update(self, result): + #debug(str(self) + " update(\""+str(result)+"\") called") + if self.network.server == True: + if self.player == None: + self.send_message(result) + elif self.player != None: + result = self.get_response() + if result == "-1 -1": + game.final_result = "network terminate" + game.stop() + return "-1 -1" + self.board.update(result, deselect=False) - - Player.__init__(self, name, colour) - debug("Colour is " + str(self.colour)) + if self.player != None: + result = self.player.update(result) + + return result + + + + def base_player(self): + if self.player == None: + return self + else: + return self.player.base_player() + + def quit(self, result): + try: + self.send_message("-1 -1") + except: + pass + +class Network(): + def __init__(self, address = (None,4562)): self.socket = socket.socket() self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.baseplayer = baseplayer #self.socket.setblocking(0) - self.address = address self.server = (address[0] == None) - - if self.colour == "black": - self.address = (self.address[0], self.address[1] + 1) - - debug(str(self) + ":"+str(self.address)) - self.board = None - + + self.connected = False def connect(self): + #debug(str(self) + "Tries to connect") + self.connected = True if self.address[0] == None: self.host = "0.0.0.0" #socket.gethostname() # Breaks things??? self.socket.bind((self.host, self.address[1])) @@ -1179,6 +1255,7 @@ class Network(Player): return else: + time.sleep(0.3) self.socket.connect(self.address) self.src = self.socket self.src.send("ok\n") @@ -1192,37 +1269,12 @@ class Network(Player): return - def select(self): - if self.baseplayer != None: - s = self.baseplayer.select() - self.send_message(str(s[0]) + " " + str(s[1])) - return s - return map(int,self.get_response().split(" ")) - - def get_move(self): - if self.baseplayer != None: - s = self.baseplayer.get_move() - self.send_message(str(s[0]) + " " + str(s[1])) - return s - return map(int,self.get_response().split(" ")) - - def update(self, result): - if self.baseplayer != None: - result = self.baseplayer.update(result) - self.send_message(result) - return result - if self.server: - self.send_message(result) - else: - s = self.get_response() - if self.board != None: - self.board.update(s) - + def __str__(self): - return "Network<"+str(self.colour)+","+str(self.baseplayer)+">:"+str(self.address) + return "@network:"+str(self.address) def get_response(self): - debug(str(self) + " get_response called...") + # Timeout the start of the message (first character) if network_timeout_start > 0.0: ready = select.select([self.src], [], [], network_timeout_start)[0] @@ -1245,7 +1297,7 @@ class Network(Player): else: raise Exception("UNRESPONSIVE") - debug(str(self) + " get_response returns " + s.strip(" \r\n")) + return s.strip(" \r\n") def send_message(self,s): @@ -1259,28 +1311,11 @@ class Network(Player): else: raise Exception("UNRESPONSIVE") - debug(str(self) + " send_message sent " + s) - - def check_quit(self, s): - s = s.split(" ") - if s[0] == "QUIT": - with game.lock: - game.final_result = " ".join(s[1:]) + " " + str(opponent(self.colour)) - game.stop() - return True - - def quit(self, result): - if self.baseplayer != None: - self.send_message("QUIT") - - with game.lock: - game.final_result = result - game.stop() - - - - + + def close(self): + self.src.shutdown() + self.src.close() # --- network.py --- # import threading @@ -1303,8 +1338,8 @@ import datetime import urllib2 class LogFile(): - def __init__(self, log): - + def __init__(self, log, name): + self.name = name self.log = log self.logged = [] self.log.write("# Log starts " + str(datetime.datetime.now()) + "\n") @@ -1338,7 +1373,7 @@ class ShortLog(LogFile): self.log = sys.stdout else: self.log = open(file_name, "w", 0) - LogFile.__init__(self, self.log) + LogFile.__init__(self, self.log, "@"+file_name) self.file_name = file_name self.phase = 0 @@ -1489,7 +1524,7 @@ def log_init(board, players): # A thread that runs the game class GameThread(StoppableThread): - def __init__(self, board, players): + def __init__(self, board, players, server = True): StoppableThread.__init__(self) self.board = board self.players = players @@ -1498,6 +1533,10 @@ class GameThread(StoppableThread): self.lock = threading.RLock() #lock for access of self.state self.cond = threading.Condition() # conditional for some reason, I forgot self.final_result = "" + self.server = server + + + @@ -1508,24 +1547,35 @@ class GameThread(StoppableThread): for p in self.players: with self.lock: - if isinstance(p, Network) and p.baseplayer != None: - self.state["turn"] = p.baseplayer # "turn" contains the player who's turn it is - else: - self.state["turn"] = p + self.state["turn"] = p.base_player() #try: if True: [x,y] = p.select() # Player selects a square if self.stopped(): + #debug("Quitting in select") break - if isinstance(p, Network) == False or p.server == True: - result = self.board.select(x, y, colour = p.colour) + if isinstance(p, NetworkPlayer): + if p.network.server == True: + result = self.board.select(x, y, colour = p.colour) + else: + result = None + else: - result = p.get_response() - self.board.update(result) - + result = self.board.select(x, y, colour = p.colour) + + result = p.update(result) + if self.stopped(): + break for p2 in self.players: + if p2 == p: + continue p2.update(result) # Inform players of what happened + if self.stopped(): + break + + if self.stopped(): + break log(result) @@ -1555,15 +1605,37 @@ class GameThread(StoppableThread): self.stop() if self.stopped(): + #debug("Quitting in get_move") break - - result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2) - log(result) - - self.board.update_move(x, y, x2, y2) + if isinstance(p, NetworkPlayer): + if p.network.server == True: + result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2) + self.board.update_move(x, y, x2, y2) + else: + result = None + + else: + result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2) + self.board.update_move(x, y, x2, y2) + + result = p.update(result) + if self.stopped(): + break for p2 in self.players: + if p2 == p: + continue p2.update(result) # Inform players of what happened + if self.stopped(): + break + + if self.stopped(): + break + + + + log(result) + @@ -2215,6 +2287,18 @@ class GraphicsThread(StoppableThread): #print "Reject " + str(i) + str(event.pos) + " vs " + str(t) + # Function to choose between dedicated server or normal play + def SelectServer(self): + + choice = self.SelectButton(["Normal", "Join Eigenserver"],prompt="Game type?") + if choice == 0: + return None + choice = self.SelectButton(["progcomp.ucc", "other"], prompt="Address?") + if choice == 0: + return "progcomp.ucc.asn.au" + else: + return self.getstr(prompt = "Enter address:") + # Function to pick players in a nice GUI way def SelectPlayers(self, players = []): @@ -2277,7 +2361,7 @@ class GraphicsThread(StoppableThread): time.sleep(1) p = None players.append(p) - elif choice == 2: + elif choice == 1: address = "" while address == "": self.board.display_grid(self.window, self.grid_sz) @@ -2304,6 +2388,87 @@ class GraphicsThread(StoppableThread): # --- graphics.py --- # +def dedicated_server(): + global log_files + + max_games = 5 + games = [] + gameID = 0 + while True: + # Get players + gameID += 1 + log("Getting clients...") + s = socket.socket() + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + s.bind(("0.0.0.0", 4562)) + s.listen(2) + ss = s.accept() + + log("Got white player") + + args = ["python", "qchess.py", "--no-graphics", "@network::"+str(4600+2*len(games)), "@network::"+str(4600+2*len(games))] + if len(log_files) != 0: + for l in log_files: + if l.name == "": + args.append("--log") + else: + args.append("--log="+str(l.name)+"_"+str(gameID)) + + g = subprocess.Popen(args, stdout=subprocess.PIPE) + games.append(g) + + time.sleep(0.5) + ss[0].send("white " + str(4600 + 2*(len(games)-1))) + ss[0].shutdown(socket.SHUT_RD) + ss[0].close() + + time.sleep(0.5) + ss = s.accept() + + log("Got black player") + + time.sleep(0.5) + ss[0].send("black " + str(4600 + 2*(len(games)-1))) + ss[0].shutdown(socket.SHUT_RD) + ss[0].close() + + s.shutdown(socket.SHUT_RDWR) + s.close() + + + while len(games) > max_games: + #log("Too many games; waiting for game to finish...") + ready = select.select(map(lambda e : e.stdout, games),[], []) + for r in ready[0]: + s = r.readline().strip(" \r\n").split(" ") + if s[0] == "white" or s[0] == "black": + for g in games[:]: + if g.stdout == r: + log("Game " + str(g) + " has finished") + games.remove(g) + + return 0 + +def client(addr): + + + + s = socket.socket() + s.connect((addr, 4562)) + + [colour,port] = s.recv(1024).strip(" \r\n").split(" ") + + #debug("Colour: " + colour + ", port: " + port) + + s.shutdown(socket.SHUT_RDWR) + s.close() + + if colour == "white": + p = subprocess.Popen(["python", "qchess.py", "@human", "@network:"+addr+":"+port]) + else: + p = subprocess.Popen(["python", "qchess.py", "@network:"+addr+":"+port, "@human"]) + p.wait() + return 0# --- server.py --- # #!/usr/bin/python -u # Do you know what the -u does? It unbuffers stdin and stdout @@ -2331,10 +2496,22 @@ def make_player(name, colour): return HumanPlayer(name, colour) s = name[1:].split(":") if s[0] == "network": - address = (None, 4562) + ip = None + port = 4562 + #print str(s) if len(s) > 1: - address = (s[1], 4562) - return Network(colour, address, baseplayer = None) + if s[1] != "": + ip = s[1] + if len(s) > 2: + port = int(s[2]) + + if ip == None: + if colour == "black": + port += 1 + elif colour == "white": + port += 1 + + return NetworkPlayer(colour, Network((ip, port)), None) if s[0] == "internal": import inspect @@ -2377,6 +2554,9 @@ def main(argv): global always_reveal_states global sleep_timeout + + server_addr = None + max_moves = None src_file = None @@ -2433,17 +2613,26 @@ def main(argv): if len(f.split(":")) == 2: max_moves = int(f.split(":")[1]) - + + elif (arg[1] == '-' and arg[2:].split("=")[0] == "server"): + #debug("Server: " + str(arg[2:])) + if len(arg[2:].split("=")) <= 1: + server_addr = True + else: + server_addr = arg[2:].split("=")[1] + elif (arg[1] == '-' and arg[2:].split("=")[0] == "log"): # Log file if len(arg[2:].split("=")) == 1: - log_files.append(LogFile(sys.stdout)) + log_files.append(LogFile(sys.stdout,"")) else: f = arg[2:].split("=")[1] - if f[0] == '@': + if f == "": + log_files.append(LogFile(sys.stdout, "")) + elif f[0] == '@': log_files.append(ShortLog(f[1:])) else: - log_files.append(LogFile(open(f, "w", 0))) + log_files.append(LogFile(open(f, "w", 0), f)) elif (arg[1] == '-' and arg[2:].split("=")[0] == "delay"): # Delay if len(arg[2:].split("=")) == 1: @@ -2468,7 +2657,17 @@ def main(argv): # Help os.system("less data/help.txt") # The best help function return 0 - + + # Dedicated server? + + #debug("server_addr = " + str(server_addr)) + + if server_addr != None: + if server_addr == True: + return dedicated_server() + else: + return client(server_addr) + # Create the board @@ -2513,6 +2712,14 @@ def main(argv): # If there are no players listed, display a nice pretty menu if len(players) != 2: if graphics != None: + + server_addr = graphics.SelectServer() + if server_addr != None: + if server_addr == True: + return dedicated_server() + else: + return client(server_addr) + players = graphics.SelectPlayers(players) else: sys.stderr.write(sys.argv[0] + " : Usage " + sys.argv[0] + " white black\n") @@ -2523,27 +2730,22 @@ def main(argv): sys.stderr.write(sys.argv[0] + " : Graphics window closed before players chosen\n") return 45 - - # Wrap Networks players around original players if necessary - for i in range(len(players)): - if isinstance(players[i], Network) and players[i].baseplayer == None: - for j in range(len(players)): - if i == j: + old = players[:] + for p in old: + if isinstance(p, NetworkPlayer): + for i in range(len(old)): + if old[i] == p or isinstance(old[i], NetworkPlayer): continue - - port = players[i].address[1] - if players[j].colour == "black" and players[i].colour == "white": - pass - elif players[j].colour == "white" and players[i].colour == "black": - port -= 1 - players[j] = Network(players[j].colour, (players[i].address[0], port), baseplayer = players[j]) - - + players[i] = NetworkPlayer(old[i].colour, p.network, old[i]) + for p in players: - if isinstance(p, Network): - if p.address[0] != None: - time.sleep(0.2) - p.connect() + #debug(str(p)) + if isinstance(p, NetworkPlayer): + p.board = game.board + if not p.network.connected: + if not p.network.server: + time.sleep(0.2) + p.network.connect() # If using windows, select won't work; use horrible TimeoutPlayer hack @@ -2592,11 +2794,19 @@ def main(argv): sys.stdout.write(game.final_result + "\n") return error + + + + + + + # This is how python does a main() function... if __name__ == "__main__": + retcode = 0 try: - sys.exit(main(sys.argv)) + retcode = main(sys.argv) except KeyboardInterrupt: sys.stderr.write(sys.argv[0] + " : Got KeyboardInterrupt. Stopping everything\n") if isinstance(graphics, StoppableThread): @@ -2607,8 +2817,21 @@ if __name__ == "__main__": game.stop() if game.is_alive(): game.join() - - sys.exit(102) + retcode = 102 + #except Exception, e: + # sys.stderr.write(sys.argv[0] + " : " + e.message + "\n") + # retcode = 103 + + try: + sys.stdout.close() + except: + pass + try: + sys.stderr.close() + except: + pass + sys.exit(retcode) + # --- main.py --- # -# EOF - created from make on Fri Apr 5 14:17:50 WST 2013 +# EOF - created from make on Sat Apr 20 12:19:31 WST 2013