jgrewe/fishbook
2
1
Fork 1
Code Issues 3 Pull Requests Releases Wiki Activity

[server] and background stuff

Browse Source
This commit is contained in:
Jan Grewe 2020-08-10 13:06:55 +02:00
parent 72fe7e2df8
commit d4db46bedf
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fishbook/version.py
View File

@ -1,2 +0,0 @@
__version__='0.1'
__year__ = '2019'

2
fishbook_server/client.py
View File

@ -67,7 +67,7 @@ def send_request(host, port, request):
return message.payload if message else "no response" return message.payload if message else "no response"
def run(host, port, action="search", value="test"): def run(host, port, action="test", value="ping"):
request = create_request(action, value) request = create_request(action, value)
response = send_request(host, port, request) response = send_request(host, port, request)
print(response) print(response)

4
fishbook_server/cmd/test_client.py
View File

@ -5,15 +5,13 @@ import argparse
import fishbook_server.client as client import fishbook_server.client as client
def run(arguments): def run(arguments):
client.run(arguments.host, arguments.port, arguments.action, arguments.value) client.run(arguments.host, arguments.port)
def create_parser(): def create_parser():
parser = argparse.ArgumentParser(description="Run fishbook dataserver") parser = argparse.ArgumentParser(description="Run fishbook dataserver")
parser.add_argument("-hs", "--host", type=str, default="", help="The host for which to listen. Use 127.0.0.1 for localhost or any other hosts simply leave it empty.") parser.add_argument("-hs", "--host", type=str, default="", help="The host for which to listen. Use 127.0.0.1 for localhost or any other hosts simply leave it empty.")
parser.add_argument("-pr", "--port", type=int, default=65432, help="The port on which the server should be listening which to listen. Default 9000.") parser.add_argument("-pr", "--port", type=int, default=65432, help="The port on which the server should be listening which to listen. Default 9000.")
parser.add_argument("-a", "--action", type=str, default="search", help="")
parser.add_argument("-v", "--value", type=str, default="test", help="")
return parser return parser

4
fishbook_server/libserver.py
View File

@ -125,11 +125,9 @@ class Message:
print("reading a message!") print("reading a message!")
if self._jsonheader_len is None: if self._jsonheader_len is None:
self.process_protoheader() self.process_protoheader()
print(self._jsonheader_len)
if self._jsonheader_len is not None: if self._jsonheader_len is not None:
if self.jsonheader is None: if self.jsonheader is None:
self.process_jsonheader() self.process_jsonheader()
print(self.jsonheader)
if self.jsonheader: if self.jsonheader:
if self.request is None: if self.request is None:
self.process_request() self.process_request()
@ -188,7 +186,7 @@ class Message:
if self.jsonheader["content-type"] == "text/json": if self.jsonheader["content-type"] == "text/json":
encoding = self.jsonheader["content-encoding"] encoding = self.jsonheader["content-encoding"]
self.request = self._json_decode(data, encoding) self.request = self._json_decode(data, encoding)
print("received request", repr(self.request), "from", self.addr) print("received text request", repr(self.request), "from", self.addr)
else: else:
# Binary or unknown content-type # Binary or unknown content-type
self.request = data self.request = data