New client: Reorganize code.

[plomrogue] / client_prototype.py

diff --git a/client_prototype.py b/client_prototype.py
index b5c7f599cef90242632e84cfb5a174d150213d89..815ae7eaed3d7bc10fde1530b197edf232d9825d 100644 (file)
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -79,6 +79,7 @@ def set_window_geometries():
     for win in windows:
         set_window_size()
         place_window()
+    cursed_main.redraw = True
 
 
 def draw_screen():
@@ -166,25 +167,38 @@ def draw_screen():
     stdscr.refresh()
 
 
-def test_and_poll_server():
-    half_wait_time = 5
-    new_file_content = io["file_in"].read()
-    # TODO: do something useful with new_file_content
-    server_answered = len(new_file_content) > 0
-    if server_answered:
-        test_and_poll_server.ping_sent = False
-    elif test_and_poll_server.wait_start + half_wait_time < time.time():
-        if not test_and_poll_server.ping_sent:
-            io["file_out"].write("PING\n")
-            io["file_out"].flush()
-            test_and_poll_server.ping_sent = True
-            test_and_poll_server.wait_start = time.time()
-        elif test_and_poll_server.ping_sent:
-            raise SystemExit("Server not answering anymore.")
-test_and_poll_server.wait_start = 0
 
 
 def cursed_main(stdscr):
+
+    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()
+        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
+
     curses.noecho()
     curses.curs_set(False)
     # stdscr.keypad(True)
@@ -195,12 +209,18 @@ def cursed_main(stdscr):
     while True:
         stdscr.timeout(delay)
         delay = delay * 2 if delay < 1000 else delay
-        draw_screen()
+        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)]()
-        test_and_poll_server()
+                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)
 
 
 def foo():
@@ -230,6 +250,10 @@ io = {
 commands = {
     "Q": command_quit
 }
+message_queue = {
+    "open_end": False,
+    "messages": []
+}
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]
@@ -248,6 +272,9 @@ 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: