diff --git a/src/networkers.py b/src/networkers.py --- a/src/networkers.py +++ b/src/networkers.py @@ -7,42 +7,42 @@ class NetworkReader: def __init__(self, stream): self._stream = stream - def readMsg(self): + def read_msg(self): data = self._stream.readline() assert data - stats.logReceived(data) - jsonLength = int(data.split(b":")[1].strip()) # "json-length: length" -> length + stats.log_received(data) + json_length = int(data.split(b":")[1].strip()) # "json-length: length" -> length data = self._stream.readline() assert data - stats.logReceived(data) - binLength = int(data.split(b":")[1].strip()) # "bin-length: length" -> length + stats.log_received(data) + bin_length = int(data.split(b":")[1].strip()) # "bin-length: length" -> length - jsonData = self._stream.read(jsonLength) - assert len(jsonData)==jsonLength - stats.logReceived(jsonData) - jsonData = json.loads(str(jsonData,encoding="utf-8")) + json_data = self._stream.read(json_length) + assert len(json_data)==json_length + stats.log_received(json_data) + json_data = json.loads(str(json_data, encoding="utf-8")) - binData = self._stream.read(binLength) - assert len(binData)==binLength - stats.logReceived(binData) + bin_data = self._stream.read(bin_length) + assert len(bin_data)==bin_length + stats.log_received(bin_data) - return (jsonData, binData) + return (json_data, bin_data) class NetworkWriter: def __init__(self, stream): self._stream = stream - def writeMsg(self, *args): - msg = self.prepMsg(*args) + def write_msg(self, *args): + msg = self.prep_msg(*args) self._stream.write(msg) self._stream.flush() - stats.logSent(msg) + stats.log_sent(msg) - def prepMsg(self, jsonData, binData=b""): - jsonData = bytes(json.dumps(jsonData,separators=(',',':'))+"\n", encoding="utf-8") - jsonLength = bytes("json-length: "+str(len(jsonData))+"\n", encoding="utf-8") - binLength = bytes("bin-length: "+str(len(binData))+"\n", encoding="utf-8") + def prep_msg(self, json_data, bin_data=b""): + json_data = bytes(json.dumps(json_data, separators=(',', ':'))+"\n", encoding="utf-8") + json_length = bytes("json-length: "+str(len(json_data))+"\n", encoding="utf-8") + bin_length = bytes("bin-length: "+str(len(bin_data))+"\n", encoding="utf-8") - return b"".join((jsonLength, binLength, jsonData, binData)) + return b"".join((json_length, bin_length, json_data, bin_data))