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

threads and a few fixes to wildcards

Browse source
This commit is contained in:
Jan Speller 2020-02-24 21:51:19 +01:00
parent 0dbd01b3f9
commit 4b0614c7da
6 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
boswatch/wildcard.py
View file

@ -65,8 +65,8 @@ def replaceWildcards(message, bwPacket):
"{CBRCH}": bwPacket.get("clientBranch"),
# boswatch wildcards
"{INSRC}": bwPacket.get("mode"),
"{TIMES}": bwPacket.get("mode"),
"{INSRC}": bwPacket.get("inputSource"),
"{TIMES}": bwPacket.get("timestamp"),
"{FREQ}": bwPacket.get("frequency"),
"{MODE}": bwPacket.get("mode"),
@ -78,7 +78,7 @@ def replaceWildcards(message, bwPacket):
"{VEHC}": bwPacket.get("vehicle"),
"{STAT}": bwPacket.get("status"),
"{DIR}": bwPacket.get("direction"),
"{DIRT}": bwPacket.get("dirextionText"),
"{DIRT}": bwPacket.get("directionText"),
"{TACI}": bwPacket.get("tacticalInfo"),
# pocsag wildcards
@ -99,6 +99,6 @@ def replaceWildcards(message, bwPacket):
for wildcard, field in _additionalWildcards.items():
if field is not None:
message = message.replace(wildcard, bwPacket.getField(field))
message = message.replace(wildcard, bwPacket.get(field))
return message