Let me sleep

client.py

@@ -6,12 +6,9 @@ import tkinter.messagebox
 from tkinter.constants import NSEW
 import threading
 import socket
-import selectors
 import json
 from functools import partial
 
-sel = selectors.DefaultSelector()
-
 class Client(threading.Thread):
     def __init__(self, host, port, username, gui):
         super().__init__()
@@ -134,7 +131,7 @@ class GUI(tk.Frame):
         fileMenu.add_command(label="O Aforyzmach...", underline=0,
                 command=self.popup, accelerator="Ctrl+B")
         self.master.bind("<Control-b>", self.popup)
-        self.menubar.add_cascade(label="Help", menu=fileMenu, underline=0) 
+        self.menubar.add_cascade(label="Pomoc", menu=fileMenu, underline=0)
         pass    
 
     def close(self):
@@ -142,17 +139,21 @@ class GUI(tk.Frame):
         self.config["DEFAULT"]["bazowa_geometria"] = geometria
         self.config["DEFAULT"]["username"] = self.username_entry.get()
         self.config["DEFAULT"]["hostname"] = self.address_entry.get()
-        with open("client_config.ini", 'w') as config_file:
-            self.config.write(config_file)
+        try:
+            with open("client_config.ini", 'w') as config_file:
+                self.config.write(config_file)
+        except:
+            print("Unable to save config.ini")
+            pass
         self.master.destroy()
 
-    def disconnect(self, event= None):
+    def disconnect(self, event=None):
         if self.client is not None:
             self.client.close()
             self.client = None
             self.switch_to("welcome")
 
-    def quit(self, event= None):
+    def quit(self, event=None):
         reply = True
         reply = tkinter.messagebox.askyesno(
                         "Wyjście",
@@ -194,7 +195,7 @@ class GUI(tk.Frame):
             title_label = tk.Label(frame, text="AFORYZMY", bg=self.bg_color, fg=self.font_color, font="Helvetica 22")
             title_label.pack()
 
-            tk.Label(frame, text="Wybierz najlepszą definicję {}".format(self.server_data["title"].upper()), fg=self.font_color, bg=self.bg_color, font="Helvetica 12", height="2", anchor="n").pack()
+            tk.Label(frame, text="Wybierz ulubiony aforyzm na temat {}".format(self.server_data["title"].upper()), fg=self.font_color, bg=self.bg_color, font="Helvetica 12", height="2", anchor="n").pack()
 
             for message in self.messages:
                 player, text = message
@@ -261,6 +262,7 @@ class GUI(tk.Frame):
         return frame
 
 
+    # Poprawienie polskich znaków i usuwanie =; limit znaków
     def key_fix(self, sv, limit):
         str = sv.get()
         list = [
@@ -271,7 +273,7 @@ class GUI(tk.Frame):
             ('ń', 'ñ'), ('Ń', 'Ñ'),
             ('ą', '¹'), ('Ą', '¥'),
             ('ż', '¿'), ('Ż', '¯'),
-            ('ź', 'Ÿ'), ('', "=")#('Ź', '')
+            ('ź', 'Ÿ'), ('', "=")
         ]
         for (pl, k) in list:
             str = str.replace(k, pl)

client_config.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-bazowa_geometria = 1024x480+201+356
-username = 
-hostname = 157.230.26.118
+bazowa_geometria = 1024x480+613+472
+username = k2
+hostname = localhost
 

config.ini

@@ -2,4 +2,9 @@
 test = 3
 kak eta  budet = 8
 test3 = 4
+asd = 6
+k3 = 4
+k1 = 2
+k4 = 4
+k2 = 4
 

server.py

@@ -9,7 +9,7 @@ import json
 import random
 import time
 
-titles = [
+TITLES = [
     "Python",
     "3",
     "JavaScript",
@@ -64,15 +64,8 @@ titles = [
     "Mysz"
 ]
 
-class Server(threading.Thread):
-    """
-    Supports management of server connections.
 
-    Attributes:
-        connections (list): A list of ServerSocket objects representing the active connections.
-        host (str): The IP address of the listening socket.
-        port (int): The port number of the listening socket.
-    """
+class Server(threading.Thread):
     def __init__(self, host, port):
         super().__init__()
         self.config = configparser.ConfigParser()
@@ -80,7 +73,6 @@ class Server(threading.Thread):
         self.connections = []
         self.host = host
         self.port = port
-        # self.players = []
         self.data = {}
         self.data["title"] = "undefined"
         self.data["state"] = "wait"
@@ -92,10 +84,11 @@ class Server(threading.Thread):
 
     def reset(self):
         time.sleep(10)
+        print("New round")
         self.votes = {}
         self.data["scores"] = {}
         self.data["messages"] = {}
-        self.data["title"] = random.choice(titles)
+        self.data["title"] = random.choice(TITLES)
         self.data["state"] = "wait"
         if self.player_count() >= 3:
             self.data["state"] = "game"
@@ -103,15 +96,8 @@ class Server(threading.Thread):
             self.data["state"] = "wait"
         dump = json.dumps(self.data, ensure_ascii=False)
         self.broadcast_all(dump)
-    
+
     def run(self):
-        """
-        Creates the listening socket. The listening socket will use the SO_REUSEADDR option to
-        allow binding to a previously-used socket address. This is a small-scale application which
-        only supports one waiting connection at a time. 
-        For each new connection, a ServerSocket thread is started to facilitate communications with
-        that particular client. All ServerSocket objects are stored in the connections attribute.
-        """
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((self.host, self.port))
@@ -122,18 +108,11 @@ class Server(threading.Thread):
         idx = 0
         try:
             while True:
-                # Accept new connection
                 sc, sockname = sock.accept()
                 print('{} has joined'.format(idx))
-
-                # Create new thread
                 server_socket = ServerSocket(sc, sockname, self, idx)
                 idx += 1
-
-                # Start new thread
                 server_socket.start()
-
-                # Add thread to active connections
                 self.connections.append(server_socket)
         except KeyboardInterrupt:
             self.quit()
@@ -144,35 +123,16 @@ class Server(threading.Thread):
         os._exit(0)
 
     def broadcast(self, message, source):
-        """
-        Sends a message to all connected clients, except the source of the message.
-
-        Args:
-            message (str): The message to broadcast.
-            source (tuple): The socket address of the source client.
-        """
         for connection in self.connections:
             # Send to all connected clients except the source client
             if connection.sockname != source:
                 connection.send(message)
 
     def broadcast_all(self, message):
-        """
-        Sends a message to all connected clients
-
-        Args:
-            message (str): The message to broadcast.
-        """
         for connection in self.connections:
             connection.send(message)
-    
-    def remove_connection(self, connection):
-        """
-        Removes a ServerSocket thread from the connections attribute.
 
-        Args:
-            connection (ServerSocket): The ServerSocket thread to remove.
-        """
+    def remove_connection(self, connection):
         self.connections.remove(connection)
 
     def player_count(self):
@@ -180,14 +140,6 @@ class Server(threading.Thread):
 
 
 class ServerSocket(threading.Thread):
-    """
-    Supports communications with a connected client.
-
-    Attributes:
-        sc (socket.socket): The connected socket.
-        sockname (tuple): The client socket address.
-        server (Server): The parent thread.
-    """
     def __init__(self, sc, sockname, server, id):
         super().__init__()
         self.sc = sc
@@ -225,7 +177,7 @@ class ServerSocket(threading.Thread):
                         self.username = message
                         self.server.data["users"][self.id] = self.username
                         if len(self.server.data["users"]) >= 3 and self.server.data["state"] == "wait":
-                            self.server.data["title"] = random.choice(titles)
+                            self.server.data["title"] = random.choice(TITLES)
                             self.server.data["state"] = "game"
                         dump = json.dumps(self.server.data, ensure_ascii=False)
                         self.server.broadcast(dump, self.sockname)
@@ -241,7 +193,6 @@ class ServerSocket(threading.Thread):
                             self.server.broadcast_all(dump)
                     elif self.server.data["state"] == "vote":
                         self.server.votes[self.id] = int(message)
-                        print(self.server.votes)
                         if len(self.server.votes) == self.server.player_count():
                             for key in self.server.votes:
                                 player = self.server.votes[key]
@@ -250,51 +201,42 @@ class ServerSocket(threading.Thread):
                                 self.server.data["scores"][player] += 1
                             for player in self.server.data["scores"]:
                                 name = self.server.data["users"][player]
-                                print(name)
                                 if player not in self.server.data["total_scores"]:
                                     if name in self.server.config["DEFAULT"]:
-                                        self.server.data["total_scores"][player] = int(self.server.config["DEFAULT"][name])
+                                        self.server.data["total_scores"][player] = int(
+                                            self.server.config["DEFAULT"][name])
                                     else:
                                         self.server.data["total_scores"][player] = 0
                                         self.server.config["DEFAULT"][name] = "0"
                                 self.server.data["total_scores"][player] += self.server.data["scores"][player]
-                                self.server.config["DEFAULT"][name] = str(int(int(self.server.config["DEFAULT"][name]) + int(self.server.data["scores"][player])))
+                                self.server.config["DEFAULT"][name] = str(int(
+                                    int(self.server.config["DEFAULT"][name]) + int(self.server.data["scores"][player])))
                             self.server.data["state"] = "display"
                             dump = json.dumps(self.server.data, ensure_ascii=False)
                             self.server.broadcast_all(dump)
                             with open("config.ini", 'w') as config_file:
                                 self.server.config.write(config_file)
                             self.server.reset()
-                    #print(self.server.data)
+                    # print(self.server.data)
 
         except KeyboardInterrupt or EOFError:
             print("Caught keyboard interrupt, exiting")
-            call_quit()
+            self.call_quit()
             os._exit(0)
         except ConnectionResetError:
             self.call_quit()
-    
-    def send(self, message):
-        """
-        Sends a message to the connected server.
 
-        Args:
-            message (str): The message to be sent.
-        """
+    def send(self, message):
         self.sc.sendall(message.encode('utf8'))
 
+
 def quit(server):
-    print('Closing all connections...')
     for connection in server.connections:
         connection.sc.close()
-    print('Shutting down the server...')
     os._exit(0)
 
+
 def exit(server):
-    """
-    Allows the server administrator to shut down the server.
-    Typing 'q' in the command line will close all active connections and exit the application.
-    """
     try:
         while True:
             input('')
@@ -305,15 +247,12 @@ def exit(server):
 
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Chatroom Server')
+    parser = argparse.ArgumentParser(description='Aphorism Server')
     parser.add_argument('host', help='Interface the server listens at')
-    parser.add_argument('-p', metavar='PORT', type=int, default=1060,
-                        help='TCP port (default 1060)')
     args = parser.parse_args()
 
-    # Create and start server thread
-    server = Server(args.host, args.p)
+    server = Server(args.host, 7312)
     server.start()
 
-    exit = threading.Thread(target = exit, args = (server,))
+    exit = threading.Thread(target=exit, args=(server,))
     exit.start()