BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

edit bwPacket Methods get and set

Browse source
This commit is contained in:
Bastian Schroll 2018-01-09 11:33:23 +01:00
parent 1ba76cc66b
commit 36781fc254
6 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
boswatch/decoder/fms.py
View file

@ -55,16 +55,16 @@ class Fms:
logging.debug("found valid FMS") logging.debug("found valid FMS")
bwPacket = packet.Packet() bwPacket = packet.Packet()
bwPacket.setField("mode", "fms") bwPacket.set("mode", "fms")
bwPacket.setField("fms", fms_id) bwPacket.set("fms", fms_id)
bwPacket.setField("service", service) bwPacket.set("service", service)
bwPacket.setField("country", country) bwPacket.set("country", country)
bwPacket.setField("location", location) bwPacket.set("location", location)
bwPacket.setField("vehicle", vehicle) bwPacket.set("vehicle", vehicle)
bwPacket.setField("status", status) bwPacket.set("status", status)
bwPacket.setField("direction", direction) bwPacket.set("direction", direction)
bwPacket.setField("cirectionText", directionText) bwPacket.set("cirectionText", directionText)
bwPacket.setField("tacticalInfo", tacticalInfo) bwPacket.set("tacticalInfo", tacticalInfo)
logging.debug(bwPacket) logging.debug(bwPacket)
return bwPacket return bwPacket

12
boswatch/decoder/pocsag.py
View file

@ -53,12 +53,12 @@ class Pocsag:
logging.debug("found valid POCSAG") logging.debug("found valid POCSAG")
bwPacket = packet.Packet() bwPacket = packet.Packet()
bwPacket.setField("mode", "pocsag") bwPacket.set("mode", "pocsag")
bwPacket.setField("bitrate", bitrate) bwPacket.set("bitrate", bitrate)
bwPacket.setField("ric", ric) bwPacket.set("ric", ric)
bwPacket.setField("subric", subric) bwPacket.set("subric", subric)
bwPacket.setField("subricText", subricText) bwPacket.set("subricText", subricText)
bwPacket.setField("message", message) bwPacket.set("message", message)
logging.debug(bwPacket) logging.debug(bwPacket)
return bwPacket return bwPacket

4
boswatch/decoder/zvei.py
View file

@ -45,8 +45,8 @@ class Zvei:
logging.debug("found valid ZVEI") logging.debug("found valid ZVEI")
bwPacket = packet.Packet() bwPacket = packet.Packet()
bwPacket.setField("mode", "zvei") bwPacket.set("mode", "zvei")
bwPacket.setField("zvei", Zvei._solveDoubleTone(data[7:12])) bwPacket.set("zvei", Zvei._solveDoubleTone(data[7:12]))
logging.debug(bwPacket) logging.debug(bwPacket)
return bwPacket return bwPacket

8
boswatch/descriptor/descriptor.py
View file

@ -49,11 +49,11 @@ class Descriptor:
@return True or False""" @return True or False"""
logging.debug("add descriptions to bwPacket") logging.debug("add descriptions to bwPacket")
try: try:
bwPacket.setField("shortDescription", bwPacket.set("shortDescription",
self._lists[bwPacket.getField("mode")].getShortDescription(bwPacket.getField(bwPacket.getField("mode")))) self._lists[bwPacket.get("mode")].getShortDescription(bwPacket.get(bwPacket.get("mode"))))
bwPacket.setField("longDescription", bwPacket.set("longDescription",
self._lists[bwPacket.getField("mode")].getLongDescription(bwPacket.getField(bwPacket.getField("mode")))) self._lists[bwPacket.get("mode")].getLongDescription(bwPacket.get(bwPacket.get("mode"))))
return True return True
except: # pragma: no cover except: # pragma: no cover
logging.exception("error while adding descriptions") logging.exception("error while adding descriptions")

24
boswatch/packet/packet.py
View file

@ -40,14 +40,14 @@ class Packet:
"""!Return the intern _packet dict as string""" """!Return the intern _packet dict as string"""
return str(self._packet) return str(self._packet)
def setField(self, fieldName, value): def set(self, fieldName, value):
"""!Set a field in the intern _packet dict """!Set a field in the intern _packet dict
@param fieldName: Name of the data to set @param fieldName: Name of the data to set
@param value: Value to set""" @param value: Value to set"""
self._packet[fieldName] = str(value) self._packet[fieldName] = str(value)
def getField(self, fieldName): def get(self, fieldName):
"""!Returns the value from a single field. """!Returns the value from a single field.
If field not existing `None` is returned If field not existing `None` is returned
@ -71,12 +71,12 @@ class Packet:
- frequency""" - frequency"""
config = Config() config = Config()
logging.debug("add client data to bwPacket") logging.debug("add client data to bwPacket")
self.setField("clientName", config.get("Client", "Name", "clientConfig")) self.set("clientName", config.get("Client", "Name", "clientConfig"))
self.setField("clientVersion", version.client) self.set("clientVersion", version.client)
self.setField("clientBuildDate", version.date) self.set("clientBuildDate", version.date)
self.setField("clientBranch", version.branch) self.set("clientBranch", version.branch)
self.setField("inputSource", config.get("Server", "InputSource", "clientConfig")) self.set("inputSource", config.get("Server", "InputSource", "clientConfig"))
self.setField("frequency", config.get("Stick", "Frequency", "clientConfig")) self.set("frequency", config.get("Stick", "Frequency", "clientConfig"))
def addServerData(self): def addServerData(self):
"""!Add the server information to the decoded data """!Add the server information to the decoded data
@ -88,7 +88,7 @@ class Packet:
- serverBranch""" - serverBranch"""
config = Config() config = Config()
logging.debug("add server data to bwPacket") logging.debug("add server data to bwPacket")
self.setField("serverName", config.get("Server", "Name", "serverConfig")) self.set("serverName", config.get("Server", "Name", "serverConfig"))
self.setField("serverVersion", version.server) self.set("serverVersion", version.server)
self.setField("serverBuildDate", version.date) self.set("serverBuildDate", version.date)
self.setField("serverBranch", version.branch) self.set("serverBranch", version.branch)

16
test/test_descriptor.py
View file

@ -49,19 +49,19 @@ class Test_Descriptor:
bwDescriptor = descriptor.Descriptor() bwDescriptor = descriptor.Descriptor()
assert bwDescriptor.loadDescription("zvei") is True assert bwDescriptor.loadDescription("zvei") is True
bwPacket = packet.Packet() bwPacket = packet.Packet()
bwPacket.setField("mode", "zvei") bwPacket.set("mode", "zvei")
bwPacket.setField("zvei", "54321") bwPacket.set("zvei", "54321")
assert bwDescriptor.addDescriptions(bwPacket) is True assert bwDescriptor.addDescriptions(bwPacket) is True
assert bwPacket.getField("shortDescription") is "" assert bwPacket.get("shortDescription") is ""
assert bwPacket.getField("longDescription") is "" assert bwPacket.get("longDescription") is ""
def test_loadDescriptions(self): def test_loadDescriptions(self):
"""!load descriptions to an bwPacket""" """!load descriptions to an bwPacket"""
bwDescriptor = descriptor.Descriptor() bwDescriptor = descriptor.Descriptor()
assert bwDescriptor.loadDescription("zvei") is True assert bwDescriptor.loadDescription("zvei") is True
bwPacket = packet.Packet() bwPacket = packet.Packet()
bwPacket.setField("mode", "zvei") bwPacket.set("mode", "zvei")
bwPacket.setField("zvei", "12345") bwPacket.set("zvei", "12345")
assert bwDescriptor.addDescriptions(bwPacket) is True assert bwDescriptor.addDescriptions(bwPacket) is True
assert bwPacket.getField("shortDescription") is not "" assert bwPacket.get("shortDescription") is not ""
assert bwPacket.getField("longDescription") is not "" assert bwPacket.get("longDescription") is not ""