X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=9a67b98d0e0ac54d72de916b5aa0ec6ef21d2dfe;hb=e64fbb87ec0b4d36f2d47d0b0bcbcd3f5f7d2918;hp=3e0ad735b8b8f19d088ad62d37af485b6ea09383;hpb=9571bdecc1a2d5cf69c49e5eb2749e720d8c4ba1;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 3e0ad73..9a67b98 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,19 +167,44 @@ def draw_screen():
     stdscr.refresh()
 
 
-def main(stdscr):
+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):
     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:
+            draw_screen()
+            cursed_main.redraw = False
         char = stdscr.getch()
         if (char >= 0):
             if chr(char) in commands:
                 commands[chr(char)]()
+                cursed_main.redraw = True
+        test_and_poll_server()
 
 
 def foo():
@@ -190,7 +217,7 @@ def foo():
 def command_quit():
     io["file_out"].write("QUIT\n")
     io["file_out"].flush()
-    exit()
+    raise SystemExit("Received QUIT command, forwarded to server, leaving.")
 
 
 windows = [
@@ -201,19 +228,31 @@ windows = [
     {"config": [0, -34], "func": foo}
 ]
 io = {
-    "path_out": "server/in"
+    "path_out": "server/in",
+    "path_in": "server/out"
 }
 commands = {
     "Q": command_quit
 }
-
-
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]
-if (not os.access(io["path_out"], os.F_OK)):
-    print("No server input file found at expected location.")
-    exit()
-io["file_out"] = open(io["path_out"], "a")
-curses.wrapper(main)
-io["file_out"].close()
+
+
+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()