New client: Remove debugging code.

[plomrogue] / client_prototype.py

diff --git a/client_prototype.py b/client_prototype.py
index b788d6da9b957b62898120dc0b5fd135a159b926..eb93a9ed00f3806adb95956762f0030ab490af57 100644 (file)
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -1,5 +1,7 @@
 import curses
+import os
 import signal
+import time
 
 
 def set_window_geometries():
@@ -77,6 +79,7 @@ def set_window_geometries():
     for win in windows:
         set_window_size()
         place_window()
+    cursed_main.redraw = True
 
 
 def draw_screen():
@@ -164,19 +167,59 @@ def draw_screen():
     stdscr.refresh()
 
 
-def main(stdscr):
+
+
+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
+
     curses.noecho()
     curses.curs_set(False)
     # stdscr.keypad(True)
     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:
+            delay = 1
+            draw_screen()
+            cursed_main.redraw = False
         char = stdscr.getch()
-        if (char >= 0):
-            if chr(char) in commands:
-                commands[chr(char)]()
+        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()
+        read_into_message_queue()
 
 
 def foo():
@@ -187,7 +230,9 @@ def foo():
 
 
 def command_quit():
-    exit()
+    io["file_out"].write("QUIT\n")
+    io["file_out"].flush()
+    raise SystemExit("Received QUIT command, forwarded to server, leaving.")
 
 
 windows = [
@@ -197,10 +242,36 @@ windows = [
     {"config": [4, 16], "func": foo},
     {"config": [0, -34], "func": foo}
 ]
+io = {
+    "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]
-curses.wrapper(main)
+
+
+try:
+    if (not os.access(io["path_out"], os.F_OK)):
+        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])
+except:
+    print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
+    raise
+finally:
+    if "file_out" in io:
+        io["file_out"].close()
+    if "file_in" in io:
+        io["file_in"].close()