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

Merge pull request #19 from janspeller/hotfix/wildcards

Browse source 
fix wildcard replacement
This commit is contained in:
Bastian Schroll 2020-02-23 08:52:46 +01:00 committed by GitHub
parent 2bb481111b cb64045f32
commit e2ed5b0d22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
boswatch/wildcard.py
View file

@ -52,51 +52,53 @@ def replaceWildcards(message, bwPacket):
# info wildcards
# server
"{SNAME}": bwPacket.getField("serverName"),
"{SVERS}": bwPacket.getField("serverVersion"),
"{SDATE}": bwPacket.getField("serverBuildDate"),
"{SBRCH}": bwPacket.getField("serverBranch"),
"{SNAME}": bwPacket.get("serverName"),
"{SVERS}": bwPacket.get("serverVersion"),
"{SDATE}": bwPacket.get("serverBuildDate"),
"{SBRCH}": bwPacket.get("serverBranch"),
# client
"{CNAME}": bwPacket.getField("clientName"),
"{CIP}": bwPacket.getField("clientIP"),
"{CVERS}": bwPacket.getField("clientVersion"),
"{CDATE}": bwPacket.getField("clientBuildDate"),
"{CBRCH}": bwPacket.getField("clientBranch"),
"{CNAME}": bwPacket.get("clientName"),
"{CIP}": bwPacket.get("clientIP"),
"{CVERS}": bwPacket.get("clientVersion"),
"{CDATE}": bwPacket.get("clientBuildDate"),
"{CBRCH}": bwPacket.get("clientBranch"),
# boswatch wildcards
"{INSRC}": bwPacket.getField("mode"),
"{TIMES}": bwPacket.getField("mode"),
"{FREQ}": bwPacket.getField("frequency"),
"{MODE}": bwPacket.getField("mode"),
"{INSRC}": bwPacket.get("mode"),
"{TIMES}": bwPacket.get("mode"),
"{FREQ}": bwPacket.get("frequency"),
"{MODE}": bwPacket.get("mode"),
# fms wildcards
"{FMS}": bwPacket.getField("fms"),
"{SERV}": bwPacket.getField("service"),
"{COUNT}": bwPacket.getField("country"),
"{LOC}": bwPacket.getField("location"),
"{VEHC}": bwPacket.getField("vehicle"),
"{STAT}": bwPacket.getField("status"),
"{DIR}": bwPacket.getField("direction"),
"{DIRT}": bwPacket.getField("dirextionText"),
"{TACI}": bwPacket.getField("tacticalInfo"),
"{FMS}": bwPacket.get("fms"),
"{SERV}": bwPacket.get("service"),
"{COUNT}": bwPacket.get("country"),
"{LOC}": bwPacket.get("location"),
"{VEHC}": bwPacket.get("vehicle"),
"{STAT}": bwPacket.get("status"),
"{DIR}": bwPacket.get("direction"),
"{DIRT}": bwPacket.get("dirextionText"),
"{TACI}": bwPacket.get("tacticalInfo"),
# pocsag wildcards
"{BIT}": bwPacket.getField("bitrate"),
"{RIC}": bwPacket.getField("ric"),
"{SRIC}": bwPacket.getField("subric"),
"{SRICT}": bwPacket.getField("subricText"),
"{MSG}": bwPacket.getField("message"),
"{BIT}": bwPacket.get("bitrate"),
"{RIC}": bwPacket.get("ric"),
"{SRIC}": bwPacket.get("subric"),
"{SRICT}": bwPacket.get("subricText"),
"{MSG}": bwPacket.get("message"),
# zvei wildcards
"{TONE}": bwPacket.getField("tone"),
"{TONE}": bwPacket.get("tone"),
# message for MSG packet is done in poc
}
for wildcard, field in _wildcards.items():
message = message.replace(wildcard, field)
if field is not None:
message = message.replace(wildcard, field)
for wildcard, field in _additionalWildcards.items():
message = message.replace(wildcard, bwPacket.getField(field))
if field is not None:
message = message.replace(wildcard, bwPacket.getField(field))
return message

2
plugin/pluginBase.py
View file

@ -189,4 +189,4 @@ class PluginBase(ABC):
if self._bwPacket is None:
logging.warning("wildcard replacing not allowed - no bwPacket set")
return msg
return wildcard.replaceWildcards(self._bwPacket, msg)
return wildcard.replaceWildcards(msg, self._bwPacket)