X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=client_prototype.py;h=eb93a9ed00f3806adb95956762f0030ab490af57;hb=77fa0ad2219e9cfd5139ad98aa62018f922ce32c;hp=9a922caf9897d915122c0e71085301bc801886db;hpb=1215247eae3aefd35a52a8cd89ae9fc367a867a0;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 9a922ca..eb93a9e 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -167,41 +167,38 @@ def draw_screen():
     stdscr.refresh()
 
 
-def ping_test(server_answered):
-    half_wait_time = 5
-    if server_answered:
-        ping_test.sent = False
-    elif ping_test.wait_start + half_wait_time < time.time():
-        if not ping_test.sent:
-            io["file_out"].write("PING\n")
-            io["file_out"].flush()
-            ping_test.sent = True
-            ping_test.wait_start = time.time()
-        elif ping_test.sent:
-            raise SystemExit("Server not answering anymore.")
-ping_test.wait_start = 0
 
 
-def read_into_message_queue(string):
-    if string == "":
-        return
-    new_open_end = False
-    if string[-1] is not "\n":
-        new_open_end = True
-    new_messages = string.splitlines()
-    logfile = open("log", "a")
-    logfile.write(str(new_messages) + "\n")
-    logfile.flush()
-    logfile.close()
-    if message_queue["open_end"]:
-        message_queue["messages"][-1] = message_queue["messages"][-1] + new_messages[0]
-        del new_messages[0]
-    message_queue["messages"] = message_queue["messages"] + new_messages
-    if new_open_end:
-        message_queue["open_end"] = True
+def cursed_main(stdscr):
 
+    def ping_test():
+        half_wait_time = 5
+        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:
+                io["file_out"].write("PING\n")
+                io["file_out"].flush()
+                ping_test.sent = True
+                ping_test.wait_start = time.time()
+            elif ping_test.sent:
+                raise SystemExit("Server not answering anymore.")
+    ping_test.wait_start = 0
+
+    def read_into_message_queue():
+        if new_data_from_server == "":
+            return
+        new_open_end = False
+        if new_data_from_server[-1] is not "\n":
+            new_open_end = True
+        new_messages = new_data_from_server.splitlines()
+        if message_queue["open_end"]:
+            message_queue["messages"][-1] += new_messages[0]
+            del new_messages[0]
+        message_queue["messages"] += new_messages
+        if new_open_end:
+            message_queue["open_end"] = True
 
-def cursed_main(stdscr):
     curses.noecho()
     curses.curs_set(False)
     # stdscr.keypad(True)
@@ -213,16 +210,16 @@ def cursed_main(stdscr):
         stdscr.timeout(delay)
         delay = delay * 2 if delay < 1000 else delay
         if cursed_main.redraw:
+            delay = 1
             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():
@@ -274,10 +271,6 @@ except:
     print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
     raise
 finally:
-    logfile = open("log", "a")
-    logfile.write(str(message_queue))
-    logfile.flush()
-    logfile.close()
     if "file_out" in io:
         io["file_out"].close()
     if "file_in" in io: