This commit is contained in:
2018-08-29 14:21:18 +02:00
parent 7d543873a0
commit d15f539adb
4 changed files with 16 additions and 9 deletions

View File

@@ -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()

View File

@@ -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 ""

View File

@@ -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)

1
python-server/words.txt Normal file
View File

@@ -0,0 +1 @@
Modergeruch