Finished writing set game

The users no longer have access to the server but to a new dictionary
whice is not in the server

Author: Guy-Markman

client.py

@@ -41,7 +41,7 @@ def __init__(
         s,
         buff_size,
         base_directory,
-        server
+        common
     ):
         """Client of Server, handle everything by itself
         Arguements:
@@ -53,7 +53,7 @@ def __init__(
         self._socket = s
         self._buff_size = buff_size
         self._base_directory = base_directory
-        self._server = server
+        self.common = common
 
         self._file = None
         self._game = None
@@ -101,13 +101,15 @@ def _test_http_and_creat_objects(self):
             service_function = SERVICES_LIST[uri_path]
 
             # dictionary of the query of uri
+            query = urlparse.parse_qs((urlparse.urlparse(uri)))
             if method == "GET":
                 dic_argument = urlparse.parse_qs(
-                    urlparse.urlparse(uri).query) + {"server": self._server}
+                    urlparse.urlparse(uri).query) + {"common": self._common,
+                                                     "pid": query.get("pid")}
             else:
                 dic_argument = urlparse.parse_qs(
                     self._recv_buff.split(constants.DOUBLE_CRLF)[-1]
-                ) + {"server": self._server}
+                ) + {"server": self._server, "pid": query.get("pid")}
             # Remove un-usable keys
             dic_argument.pop('self', None)
 
@@ -160,11 +162,12 @@ def _set_game(self):
         return  # Will stay until I will finish it
         headers = self._request.get_all_header()
         parsed_uri = urlparse.urlparse(self._request.uri)
+        querry = urlparse.parse_qs(parsed_uri.query)
         if headers["cookie"]:  # Setting game object
             self._find_game_object(headers)
         if parsed_uri.path in (
-            self.services.choose_name.NAME,
-            self.services.register_quiz.NAME
+            services.choose_name.NAME,
+            services.register_quiz.NAME
         ):
             if "cookie" in headers:  # Remove existing user
                 self._server.pid_client.pop(headers["cookie"])
@@ -173,16 +176,21 @@ def _set_game(self):
                         player.game_master = None
                 if self._game.NAME == "PLAYER":
                     self._game.game_master.remove_player(headers["cookie"])
-                # TODO: creat new game object
-                if parsed_uri.path == self.services.choose_name.NAME:
-                    self._game = game.GamePlayer(
-                        self._server.pid_client[urlparse.parse_qs(
-                            parsed_uri.query)[0]])
-                else:
-                    self._game = game.GameMaster(
-                        urlparse.parse_qs(parsed_uri.query)[0])
-                self._extra_headers[
-                    "Set-Cookie"] = "pid=%d" % self._game.pid
+
+            if parsed_uri.path == services.choose_name.NAME:  # new one
+                self._game = game.GamePlayer(
+                    self._server.pid_client.get(int(querry["pid"])))
+
+            else:
+                self._game = game.GameMaster(querry["quiz_name"])
+            self._extra_headers[
+                "Set-Cookie"] = "pid=%d" % self._game.pid
+
+        # Set name for player
+        if (parsed_uri.path == services.waiting_room_start.NAME
+                and self._game is not None and self._game.NAME == "PLAYER"):
+            self._game.name = querry.name
+            self._game.game_master.add_player(self._game.pid, self._game)
 
     def recv(self):
         """Recv data from the client socket and process it to Reqeust and

common.py

@@ -0,0 +1 @@
+pid_client = {}

game.py

@@ -26,7 +26,7 @@ def add_player(self, new_pid, game_player):
     def remove_player(self, pid):
         self._players_list.pop[pid]
 
-    def get_play_list(self):
+    def get_player_list(self):
         return self._players_list
 
 

server.py

@@ -3,7 +3,7 @@
 import socket
 import traceback
 
-from . import (async_io, base, client, common_events, constants,
+from . import (async_io, base, client, common, common_events, constants,
                custom_exceptions, util)
 
 
@@ -24,8 +24,7 @@ def __init__(
         self._run = True
         self.logger.info("Initialized server, buff size '%d'", buff_size)
         self._base_directory = base_directory
-
-        self.pid_client = {}
+        self.common = common
 
     def terminate(self):
         self._run = False
@@ -63,7 +62,7 @@ def _add_to_databases(self, s, state=constants.SERVER):
         entry = self._database[s]
         if state == constants.CLIENT:
             entry["client"] = client.Client(
-                s, self._buff_size, self._base_directory, self)
+                s, self._buff_size, self._base_directory, common)
         self._fd_socket[s.fileno()] = s
         self.logger.debug(
             "s added to database, {'%s': '%s'}",

services.py

@@ -101,14 +101,14 @@ def __init__(self, quiz_name):
         self.finished_reading = False  # Did we read everything from read?
         self.read_pointer = 0  # How much did we read from read
         self._quiz_name = quiz_name[0]
-        self._content_page = self.content()
         if os.path.isfile(os.path.normpath("PyHoot\Files\%s.xml" %
                                            os.path.normpath(self._quiz_name))):
             self.content = self.right
-            self.new_quiz = True
+            self.right_page = True
         else:
             self.content = self.wrong
-            self.new_quiz = False
+            self.right_page = False
+        self._content_page = self.content()
 
     def right(self):
         return BASE_HTTP % ("right", "WIP")
@@ -148,21 +148,23 @@ def content(self):
 class choose_name(Service):
     NAME = "/choose_name"
 
-    def __init__(self, server, pid):
+    def __init__(self, common, pid):
         self.finished_reading = False  # Did we read everything from read?
         self.read_pointer = 0  # How much did we read from read
-        if server.pid_client.get(pid) is not None:
+        if common.pid_client.get(pid) is not None:
             self.content = self.right
+            self.right_page = True
         else:
             self.content = self.wrong
+            self.right_page = False
         self._content_page = self.content()
 
     def right(self):
         return BASE_HTTP % (
             "Choose name",
             """<form action = "/waiting_room_start" method = "get">
                <font size = "6"> Choose name</font></br>
-               <input type="text" style="width: 200px;">
+               <input type="text" name="name" style="width: 200px;">
                <br><br><input type="submit" value="Start Playing!"
                 style="height:50px;width:150px">
            """
@@ -184,11 +186,18 @@ def wrong(self):
 class waiting_room_start(Service):
     NAME = "/waiting_room_start"  # TODO: Write this
 
-    # TODO: Make it work
-    def __init__(self, name, server, ):
+    def __init__(self, name, common, pid):
         self.finished_reading = False  # Did we read everything from read?
         self.read_pointer = 0  # How much did we read from read
-        if self.server.pid_client
+        name_list = []
+        for player in common.pid_client[pid].get_play_list:
+            name_list.append(player.name)
+        if name not in name_list:
+            self.content = self.right
+            self.right_page = True
+        else:
+            self.content = self.wrong
+            self.right_page = False
         self._content_page = self.content()
 
     def get_pid(self):
@@ -205,7 +214,7 @@ def wrong():
             "Choose name",
             """<form action = "/waiting_room_start" method = "get">
                <font size = "6"> Name taken, Choose name</font></br>
-               <input type="text" style="width: 200px;">
+               <input type="text" name="name" style="width: 200px;">
                <br><br><input type="submit" value="Start Playing!"
                 style="height:50px;width:150px">
            """