X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=client_prototype.py;h=ab91e9ab4f8f2373fde7e187127177a2d4b61b0b;hb=89ec3f0cbfd092942db51d2349ea4c2bb521b353;hp=9a67b98d0e0ac54d72de916b5aa0ec6ef21d2dfe;hpb=e64fbb87ec0b4d36f2d47d0b0bcbcd3f5f7d2918;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 9a67b98..ab91e9a 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -167,25 +167,57 @@ 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 read_worldstate():
+    if not os.access(io["path_worldstate"], os.F_OK):
+        msg = "No world state file found at " + io["path_worldstate"] + "."
+        raise SystemExit(msg)
+    read_anew = False
+    worldstate_file = open(io["path_worldstate"], "r")
+    turn_string = worldstate_file.readline()
+    if int(turn_string) != world_data["turn"]:
+        read_anew = True
+    if not read_anew: # In rare cases, world may change, but not turn number.
+        mtime = os.stat(io["path_worldstate"])
+        if mtime != read_worldstate.last_checked_mtime:
+            read_worldstate.last_checked_mtime = mtime
+            read_anew = True
+    if read_anew:
+        cursed_main.redraw = True
+        world_data["turn"] = int(turn_string)
+    worldstate_file.close()
+read_worldstate.last_checked_mtime = -1
 
 
 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)
@@ -197,19 +229,24 @@ 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
-        test_and_poll_server()
+        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()
+        read_worldstate()
 
 
 def foo():
-    winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
-    size = [4, 3]
+    #winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
+    #size = [4, 3]
+    winmap = str(world_data["turn"]).rjust(10)
+    size = [1, 10]
     offset = [0, 0]
     return offset, size, winmap
 
@@ -229,11 +266,19 @@ windows = [
 ]
 io = {
     "path_out": "server/in",
-    "path_in": "server/out"
+    "path_in": "server/out",
+    "path_worldstate": "server/worldstate"
 }
 commands = {
     "Q": command_quit
 }
+message_queue = {
+    "open_end": False,
+    "messages": []
+}
+world_data = {
+    "turn": -1
+}
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]