X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=client_prototype.py;h=9a922caf9897d915122c0e71085301bc801886db;hb=1215247eae3aefd35a52a8cd89ae9fc367a867a0;hp=9f2a91ee3d32f5875cb67211891b2b7753bbdea2;hpb=ec0dcf6e4a9bbac02aa9f013c90fa42cdd971439;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 9f2a91e..9a922ca 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -1,6 +1,7 @@
 import curses
-import signal
 import os
+import signal
+import time
 
 
 def set_window_geometries():
@@ -78,6 +79,7 @@ def set_window_geometries():
     for win in windows:
         set_window_size()
         place_window()
+    cursed_main.redraw = True
 
 
 def draw_screen():
@@ -165,6 +167,40 @@ 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):
     curses.noecho()
     curses.curs_set(False)
@@ -172,12 +208,21 @@ def cursed_main(stdscr):
     signal.signal(signal.SIGWINCH,
         lambda ignore_1, ignore_2: set_window_geometries())
     set_window_geometries()
+    delay = 1
     while True:
-        draw_screen()
+        stdscr.timeout(delay)
+        delay = delay * 2 if delay < 1000 else delay
+        if cursed_main.redraw:
+            draw_screen()
+            cursed_main.redraw = False
         char = stdscr.getch()
         if (char >= 0):
             if 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)
 
 
 def foo():
@@ -190,7 +235,7 @@ def foo():
 def command_quit():
     io["file_out"].write("QUIT\n")
     io["file_out"].flush()
-    raise SystemExit("Received QUIT command, forwarded to server, leaving.") 
+    raise SystemExit("Received QUIT command, forwarded to server, leaving.")
 
 
 windows = [
@@ -201,11 +246,16 @@ windows = [
     {"config": [0, -34], "func": foo}
 ]
 io = {
-    "path_out": "server/in"
+    "path_out": "server/in",
+    "path_in": "server/out"
 }
 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]
@@ -216,6 +266,7 @@ try:
         msg = "No server input file found at " + io["path_out"] + "."
         raise SystemExit(msg)
     io["file_out"] = open(io["path_out"], "a")
+    io["file_in"] = open(io["path_in"], "r")
     curses.wrapper(cursed_main)
 except SystemExit as exit:
     print("ABORTING: " + exit.args[0])
@@ -223,5 +274,11 @@ 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:
+        io["file_in"].close()