From 3d5306500c41ff6705e1bee63f358ce6c6c3efeb Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Thu, 16 Aug 2018 22:12:57 +0200 Subject: [PATCH 1/4] reminded for unittest special handling --- python-server/server_interface.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-server/server_interface.py b/python-server/server_interface.py index 4309786..feb6463 100644 --- a/python-server/server_interface.py +++ b/python-server/server_interface.py @@ -21,3 +21,5 @@ def recive_transcribe_request(audiofile): ''' saves and transcribes and audiofile ''' pass +def android_unittest_transcribe_request(audiofile): + ''' the android unittests append a special keyword, requests are dummy handled ''' From 0d9d0a1e53200b98a30457e37804ec6654ffa9d3 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Thu, 16 Aug 2018 22:15:38 +0200 Subject: [PATCH 2/4] android app submodule --- .gitignore | 1 + .gitmodules | 3 +++ android-app/thermoscan-speech-android-app | 1 + 3 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 android-app/thermoscan-speech-android-app diff --git a/.gitignore b/.gitignore index ee08be2..aafc56f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.swp __pycache__/ +thermoscan-speech-android-app// diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a860183 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "android-app/thermoscan-speech-android-app"] + path = android-app/thermoscan-speech-android-app + url = git@gitlab.com:Sheppy_/thermoscan-speech-android-app.git diff --git a/android-app/thermoscan-speech-android-app b/android-app/thermoscan-speech-android-app new file mode 160000 index 0000000..560f28e --- /dev/null +++ b/android-app/thermoscan-speech-android-app @@ -0,0 +1 @@ +Subproject commit 560f28e89c89609273e9906e7a200a96c2bd0951 From 7ba9b7d01695c3a81db2a415c12935c9f4657d3b Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Mon, 20 Aug 2018 05:55:49 +0200 Subject: [PATCH 3/4] Server functionality --- python-server/exec_server.py | 16 ++++++++++++---- python-server/server_interface.py | 25 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) mode change 100644 => 100755 python-server/exec_server.py diff --git a/python-server/exec_server.py b/python-server/exec_server.py old mode 100644 new mode 100755 index 90b5b7d..ce4a4b4 --- a/python-server/exec_server.py +++ b/python-server/exec_server.py @@ -1,6 +1,7 @@ #/usr/bin/python3 + import socketserver -import server interface +import server_interface class AppRequestHandler(socketserver.BaseRequestHandler): def __init__(self, request, client_address, server): @@ -12,12 +13,19 @@ class AppRequestHandler(socketserver.BaseRequestHandler): def handle(self): data = self.request.recv(1024) - retval = server_interface.parse_request(data) - self.request.send(retval) + retval = server_interface.parse_request(data) + print(retval) + self.request.send(retval) return def finish(self): return socketserver.BaseRequestHandler.finish(self) def start_server(): - server = socketserver.Server(("localhost",7100),AppRequestHandler) + socketserver.TCPServer.allow_reuse_address = True + server = socketserver.TCPServer(("localhost",7100),AppRequestHandler) + server.serve_forever() + + +if __name__ == "__main__": + start_server() diff --git a/python-server/server_interface.py b/python-server/server_interface.py index feb6463..2cb39fb 100644 --- a/python-server/server_interface.py +++ b/python-server/server_interface.py @@ -1,3 +1,28 @@ +def parse_request(data): + ''' parse request and call correct function ''' + + # echo/test connection + cleared_data = is_data_type(b"ECHOREQUEST,",data) + if cleared_data: + return cleared_data + + # other shit + return b"UNRECOGNIZED_SERVER_OPTION\n" + + + +def is_data_type(tag,data): + print(data) + print(tag) + data = data.strip(b"\n") + if data.startswith(tag): + ret = data.strip(tag) + if not ret: + ret = b"NULL\n" + return ret + return None + + def reply_logs(loglevel=0,lines=100): ''' replies with recent logs ''' pass From 3fd77a32eb30abba770ee20c5366411d0b8cc31a Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Mon, 20 Aug 2018 07:05:31 +0200 Subject: [PATCH 4/4] working --- python-server/exec_server.py | 15 +++++++++++---- python-server/server_interface.py | 4 +--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/python-server/exec_server.py b/python-server/exec_server.py index ce4a4b4..e0a7b44 100755 --- a/python-server/exec_server.py +++ b/python-server/exec_server.py @@ -1,4 +1,4 @@ -#/usr/bin/python3 +#!/usr/bin/python3 import socketserver import server_interface @@ -12,10 +12,17 @@ class AppRequestHandler(socketserver.BaseRequestHandler): return socketserver.BaseRequestHandler.setup(self) def handle(self): - data = self.request.recv(1024) + data = b"" + while True: + tmp = self.request.recv(1024) + if not tmp or b"terminate\n" == tmp: + break + data += tmp + print("Request: {}".format(data)) retval = server_interface.parse_request(data) - print(retval) self.request.send(retval) + self.request.send(b"terminate\n") + print("Replied with: {}".format(retval)) return def finish(self): @@ -23,7 +30,7 @@ class AppRequestHandler(socketserver.BaseRequestHandler): def start_server(): socketserver.TCPServer.allow_reuse_address = True - server = socketserver.TCPServer(("localhost",7100),AppRequestHandler) + server = socketserver.TCPServer(("0.0.0.0",7100),AppRequestHandler) server.serve_forever() diff --git a/python-server/server_interface.py b/python-server/server_interface.py index 2cb39fb..bdd3829 100644 --- a/python-server/server_interface.py +++ b/python-server/server_interface.py @@ -12,11 +12,9 @@ def parse_request(data): def is_data_type(tag,data): - print(data) - print(tag) data = data.strip(b"\n") if data.startswith(tag): - ret = data.strip(tag) + ret = data.split(tag)[1] if not ret: ret = b"NULL\n" return ret