From: Christian Heller Date: Sat, 7 Nov 2015 20:36:12 +0000 (+0100) Subject: New client: Read messages from file into message queue. X-Git-Tag: tce~260 X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%22https:/validator.w3.org/ledger?a=commitdiff_plain;h=1215247eae3aefd35a52a8cd89ae9fc367a867a0;p=plomrogue New client: Read messages from file into message queue. --- diff --git a/client_prototype.py b/client_prototype.py index 9a67b98..9a922ca 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -167,22 +167,38 @@ def draw_screen(): stdscr.refresh() -def test_and_poll_server(): +def ping_test(server_answered): 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: + 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() - test_and_poll_server.ping_sent = True - test_and_poll_server.wait_start = time.time() - elif test_and_poll_server.ping_sent: + ping_test.sent = True + ping_test.wait_start = time.time() + elif ping_test.sent: raise SystemExit("Server not answering anymore.") -test_and_poll_server.wait_start = 0 +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): @@ -204,7 +220,9 @@ def cursed_main(stdscr): if chr(char) in commands: commands[chr(char)]() cursed_main.redraw = True - test_and_poll_server() + 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(): @@ -234,6 +252,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] @@ -252,6 +274,10 @@ 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: