diff --git a/python-server/exec_server.py b/python-server/exec_server.py index 66e7356..31be94e 100755 --- a/python-server/exec_server.py +++ b/python-server/exec_server.py @@ -13,6 +13,7 @@ class AppRequestHandler(socketserver.BaseRequestHandler): def handle(self): data = b"" + print("Recieved request") while True: tmp = self.request.recv(1024) if not tmp or b"\nterminate\n" in tmp: @@ -21,9 +22,12 @@ class AppRequestHandler(socketserver.BaseRequestHandler): break data += tmp retval = server_interface.parse_request(data) - self.request.send(retval) - self.request.send(b"terminate\n") - print("Replied with: {}".format(retval)) + try: + self.request.send(retval) + self.request.send(b"terminate\n") + print("Replied with: {}".format(retval)) + except BrokenPipeError: + print("Connection was closed before reply could be sent.") return def finish(self): @@ -31,7 +35,7 @@ class AppRequestHandler(socketserver.BaseRequestHandler): def start_server(): socketserver.TCPServer.allow_reuse_address = True - server = socketserver.TCPServer(("0.0.0.0",7100),AppRequestHandler) + server = socketserver.TCPServer(("localhost",7100),AppRequestHandler) server.serve_forever() diff --git a/python-server/filesystem.py b/python-server/filesystem.py index d7a6ad6..c5229f8 100644 --- a/python-server/filesystem.py +++ b/python-server/filesystem.py @@ -50,9 +50,11 @@ def save_transcript(filename, transcript): f.write(transcript) def get_transcript(filename): - if os.path.isfile(filename): - with open(filename + "_transcript","r") as f: - return f.read() + try: + with open("data/" + filename + ".wav_transcript","r") as f: + return f.read() + except FileNotFoundError: + return "File not found on Server!" def filelist(): return "" diff --git a/python-server/server_interface.py b/python-server/server_interface.py index 1ed7db7..639e1ef 100644 --- a/python-server/server_interface.py +++ b/python-server/server_interface.py @@ -15,8 +15,8 @@ def parse_request(data): # reply transcript # cleared_data = is_data_type(b"GET_TRANSCRIPT,",data) if cleared_data: - filename = data.decode("utf-8") - return filesystem.get_transcript().encode("utf-8") + filename = cleared_data.decode("utf-8") + return filesystem.get_transcript(filename).encode("utf-8") # get single file info # cleared_data = is_data_type(b"GET_FILEINFO,",data) diff --git a/python-server/words.txt b/python-server/words.txt new file mode 100644 index 0000000..3b002bb --- /dev/null +++ b/python-server/words.txt @@ -0,0 +1 @@ +Modergeruch