X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;f=client_prototype.py;h=eb93a9ed00f3806adb95956762f0030ab490af57;hb=77fa0ad2219e9cfd5139ad98aa62018f922ce32c;hp=815ae7eaed3d7bc10fde1530b197edf232d9825d;hpb=f90a635ac962646e62a829fe6dff437ad20ec8f9;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 815ae7e..eb93a9e 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -171,9 +171,9 @@ def draw_screen():
 
 def cursed_main(stdscr):
 
-    def ping_test(server_answered):
+    def ping_test():
         half_wait_time = 5
-        if server_answered:
+        if len(new_data_from_server) > 0:
             ping_test.sent = False
         elif ping_test.wait_start + half_wait_time < time.time():
             if not ping_test.sent:
@@ -185,13 +185,13 @@ def cursed_main(stdscr):
                 raise SystemExit("Server not answering anymore.")
     ping_test.wait_start = 0
 
-    def read_into_message_queue(string):
-        if string == "":
+    def read_into_message_queue():
+        if new_data_from_server == "":
             return
         new_open_end = False
-        if string[-1] is not "\n":
+        if new_data_from_server[-1] is not "\n":
             new_open_end = True
-        new_messages = string.splitlines()
+        new_messages = new_data_from_server.splitlines()
         if message_queue["open_end"]:
             message_queue["messages"][-1] += new_messages[0]
             del new_messages[0]
@@ -214,13 +214,12 @@ def cursed_main(stdscr):
             draw_screen()
             cursed_main.redraw = False
         char = stdscr.getch()
-        if (char >= 0):
-            if chr(char) in commands:
-                commands[chr(char)]()
-                cursed_main.redraw = True
+        if char >= 0 and chr(char) in commands:
+            commands[chr(char)]()
+            cursed_main.redraw = True
         new_data_from_server = io["file_in"].read()
-        ping_test(len(new_data_from_server) > 0)
-        read_into_message_queue(new_data_from_server)
+        ping_test()
+        read_into_message_queue()
 
 
 def foo():
@@ -272,9 +271,6 @@ except:
     print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
     raise
 finally:
-    logfile = open("log", "a")
-    logfile.write(str(message_queue))
-    logfile.close()
     if "file_out" in io:
         io["file_out"].close()
     if "file_in" in io: