Making dedicated match making server

[progcomp2013.git] / qchess / src / main.py

diff --git a/qchess/src/main.py b/qchess/src/main.py
index 748a459..90deec7 100644 (file)
--- a/qchess/src/main.py
+++ b/qchess/src/main.py
@@ -16,6 +16,7 @@ import os
 import time
 
 turn_delay = 0.5
+sleep_timeout = None
 [game, graphics] = [None, None]
 
 def make_player(name, colour):
@@ -24,10 +25,22 @@ def make_player(name, colour):
                        return HumanPlayer(name, colour)
                s = name[1:].split(":")
                if s[0] == "network":
-                       address = None
+                       ip = None
+                       port = 4562
+                       #print str(s)
                        if len(s) > 1:
-                               address = s[1]
-                       return NetworkReceiver(colour, address)
+                               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
@@ -68,6 +81,7 @@ def main(argv):
        global src_file
        global graphics_enabled
        global always_reveal_states
+       global sleep_timeout
 
        max_moves = None
        src_file = None
@@ -125,7 +139,13 @@ def main(argv):
 
                                        if len(f.split(":")) == 2:
                                                max_moves = int(f.split(":")[1])
-
+                                               
+               elif (arg[1] == '-' and arg[2:] == "server"):
+                       if len(arg[2:].split("=") <= 1):
+                               dedicated_server()
+                       else:
+                               client(arg[2:].split("=")[1])
+                       sys.exit(0)
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "log"):
                        # Log file
                        if len(arg[2:].split("=")) == 1:
@@ -149,6 +169,12 @@ def main(argv):
                                agent_timeout = -1
                        else:
                                agent_timeout = float(arg[2:].split("=")[1])
+               elif (arg[1] == '-' and arg[2:].split("=")[0] == "blackout"):
+                       # Screen saver delay
+                       if len(arg[2:].split("=")) == 1:
+                               sleep_timeout = -1
+                       else:
+                               sleep_timeout = float(arg[2:].split("=")[1])
                                
                elif (arg[1] == '-' and arg[2:] == "help"):
                        # Help
@@ -188,6 +214,8 @@ def main(argv):
        if graphics_enabled == True:
                try:
                        graphics = GraphicsThread(game.board, grid_sz = [64,64]) # Construct a GraphicsThread!
+                       
+                       graphics.sleep_timeout = sleep_timeout
 
                except Exception,e:
                        graphics = None
@@ -207,27 +235,23 @@ def main(argv):
                sys.stderr.write(sys.argv[0] + " : Graphics window closed before players chosen\n")
                return 45
 
-
-       # Wrap NetworkSender players around original players if necessary
-       for i in range(len(players)):
-               if isinstance(players[i], NetworkReceiver):
-                       players[i].board = board # Network players need direct access to the board
-                       for j in range(len(players)):
-                               if j == i:
-                                       continue
-                               if isinstance(players[j], NetworkSender) or isinstance(players[j], NetworkReceiver):
+       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
-                               players[j] = NetworkSender(players[j], players[i].address)
-                               players[j].board = board
-
-       # Connect the networked players
+                               players[i] = NetworkPlayer(old[i].colour, p.network, old[i])
+               
        for p in players:
-               if isinstance(p, NetworkSender) or isinstance(p, NetworkReceiver):
-                       if graphics != None:
-                               graphics.board.display_grid(graphics.window, graphics.grid_sz)
-                               graphics.message("Connecting to " + p.colour + " player...")
-                       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
        if agent_timeout > 0:
@@ -275,6 +299,13 @@ def main(argv):
        sys.stdout.write(game.final_result + "\n")
 
        return error
+               
+               
+       
+               
+       
+               
+               
 
 # This is how python does a main() function...
 if __name__ == "__main__":