diff --git a/boswatch/decoder/fms.py b/boswatch/decoder/fms.py index 4b7798d..3b69bcf 100644 --- a/boswatch/decoder/fms.py +++ b/boswatch/decoder/fms.py @@ -55,16 +55,16 @@ class Fms: logging.debug("found valid FMS") bwPacket = packet.Packet() - bwPacket.setField("mode", "fms") - bwPacket.setField("fms", fms_id) - bwPacket.setField("service", service) - bwPacket.setField("country", country) - bwPacket.setField("location", location) - bwPacket.setField("vehicle", vehicle) - bwPacket.setField("status", status) - bwPacket.setField("direction", direction) - bwPacket.setField("cirectionText", directionText) - bwPacket.setField("tacticalInfo", tacticalInfo) + bwPacket.set("mode", "fms") + bwPacket.set("fms", fms_id) + bwPacket.set("service", service) + bwPacket.set("country", country) + bwPacket.set("location", location) + bwPacket.set("vehicle", vehicle) + bwPacket.set("status", status) + bwPacket.set("direction", direction) + bwPacket.set("cirectionText", directionText) + bwPacket.set("tacticalInfo", tacticalInfo) logging.debug(bwPacket) return bwPacket diff --git a/boswatch/decoder/pocsag.py b/boswatch/decoder/pocsag.py index 1029e77..62ac7b3 100644 --- a/boswatch/decoder/pocsag.py +++ b/boswatch/decoder/pocsag.py @@ -53,12 +53,12 @@ class Pocsag: logging.debug("found valid POCSAG") bwPacket = packet.Packet() - bwPacket.setField("mode", "pocsag") - bwPacket.setField("bitrate", bitrate) - bwPacket.setField("ric", ric) - bwPacket.setField("subric", subric) - bwPacket.setField("subricText", subricText) - bwPacket.setField("message", message) + bwPacket.set("mode", "pocsag") + bwPacket.set("bitrate", bitrate) + bwPacket.set("ric", ric) + bwPacket.set("subric", subric) + bwPacket.set("subricText", subricText) + bwPacket.set("message", message) logging.debug(bwPacket) return bwPacket diff --git a/boswatch/decoder/zvei.py b/boswatch/decoder/zvei.py index 7e706de..4f42c1e 100644 --- a/boswatch/decoder/zvei.py +++ b/boswatch/decoder/zvei.py @@ -45,8 +45,8 @@ class Zvei: logging.debug("found valid ZVEI") bwPacket = packet.Packet() - bwPacket.setField("mode", "zvei") - bwPacket.setField("zvei", Zvei._solveDoubleTone(data[7:12])) + bwPacket.set("mode", "zvei") + bwPacket.set("zvei", Zvei._solveDoubleTone(data[7:12])) logging.debug(bwPacket) return bwPacket diff --git a/boswatch/descriptor/descriptor.py b/boswatch/descriptor/descriptor.py index eb53e5c..ed0970c 100644 --- a/boswatch/descriptor/descriptor.py +++ b/boswatch/descriptor/descriptor.py @@ -49,11 +49,11 @@ class Descriptor: @return True or False""" logging.debug("add descriptions to bwPacket") try: - bwPacket.setField("shortDescription", - self._lists[bwPacket.getField("mode")].getShortDescription(bwPacket.getField(bwPacket.getField("mode")))) + bwPacket.set("shortDescription", + self._lists[bwPacket.get("mode")].getShortDescription(bwPacket.get(bwPacket.get("mode")))) - bwPacket.setField("longDescription", - self._lists[bwPacket.getField("mode")].getLongDescription(bwPacket.getField(bwPacket.getField("mode")))) + bwPacket.set("longDescription", + self._lists[bwPacket.get("mode")].getLongDescription(bwPacket.get(bwPacket.get("mode")))) return True except: # pragma: no cover logging.exception("error while adding descriptions") diff --git a/boswatch/packet/packet.py b/boswatch/packet/packet.py index 6fc82e7..d3bfaa3 100644 --- a/boswatch/packet/packet.py +++ b/boswatch/packet/packet.py @@ -40,14 +40,14 @@ class Packet: """!Return the intern _packet dict as string""" return str(self._packet) - def setField(self, fieldName, value): + def set(self, fieldName, value): """!Set a field in the intern _packet dict @param fieldName: Name of the data to set @param value: Value to set""" self._packet[fieldName] = str(value) - def getField(self, fieldName): + def get(self, fieldName): """!Returns the value from a single field. If field not existing `None` is returned @@ -71,12 +71,12 @@ class Packet: - frequency""" config = Config() logging.debug("add client data to bwPacket") - self.setField("clientName", config.get("Client", "Name", "clientConfig")) - self.setField("clientVersion", version.client) - self.setField("clientBuildDate", version.date) - self.setField("clientBranch", version.branch) - self.setField("inputSource", config.get("Server", "InputSource", "clientConfig")) - self.setField("frequency", config.get("Stick", "Frequency", "clientConfig")) + self.set("clientName", config.get("Client", "Name", "clientConfig")) + self.set("clientVersion", version.client) + self.set("clientBuildDate", version.date) + self.set("clientBranch", version.branch) + self.set("inputSource", config.get("Server", "InputSource", "clientConfig")) + self.set("frequency", config.get("Stick", "Frequency", "clientConfig")) def addServerData(self): """!Add the server information to the decoded data @@ -88,7 +88,7 @@ class Packet: - serverBranch""" config = Config() logging.debug("add server data to bwPacket") - self.setField("serverName", config.get("Server", "Name", "serverConfig")) - self.setField("serverVersion", version.server) - self.setField("serverBuildDate", version.date) - self.setField("serverBranch", version.branch) + self.set("serverName", config.get("Server", "Name", "serverConfig")) + self.set("serverVersion", version.server) + self.set("serverBuildDate", version.date) + self.set("serverBranch", version.branch) diff --git a/test/test_descriptor.py b/test/test_descriptor.py index 40c34f0..d7f0ba4 100644 --- a/test/test_descriptor.py +++ b/test/test_descriptor.py @@ -49,19 +49,19 @@ class Test_Descriptor: bwDescriptor = descriptor.Descriptor() assert bwDescriptor.loadDescription("zvei") is True bwPacket = packet.Packet() - bwPacket.setField("mode", "zvei") - bwPacket.setField("zvei", "54321") + bwPacket.set("mode", "zvei") + bwPacket.set("zvei", "54321") assert bwDescriptor.addDescriptions(bwPacket) is True - assert bwPacket.getField("shortDescription") is "" - assert bwPacket.getField("longDescription") is "" + assert bwPacket.get("shortDescription") is "" + assert bwPacket.get("longDescription") is "" def test_loadDescriptions(self): """!load descriptions to an bwPacket""" bwDescriptor = descriptor.Descriptor() assert bwDescriptor.loadDescription("zvei") is True bwPacket = packet.Packet() - bwPacket.setField("mode", "zvei") - bwPacket.setField("zvei", "12345") + bwPacket.set("mode", "zvei") + bwPacket.set("zvei", "12345") assert bwDescriptor.addDescriptions(bwPacket) is True - assert bwPacket.getField("shortDescription") is not "" - assert bwPacket.getField("longDescription") is not "" + assert bwPacket.get("shortDescription") is not "" + assert bwPacket.get("longDescription") is not ""