From 0af091373f9861baa6780c58bbaa5642104f6455 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Fri, 20 Sep 2019 13:06:15 +0200
Subject: [PATCH] remove csv descr from paket and wildcard

should be done in a module
---
 boswatch/utils/wildcard.py  | 7 ++++---
 docu/docs/develop/packet.md | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/boswatch/utils/wildcard.py b/boswatch/utils/wildcard.py
index 917cca8..a57cce6 100644
--- a/boswatch/utils/wildcard.py
+++ b/boswatch/utils/wildcard.py
@@ -22,7 +22,9 @@ import time
 logging.debug("- %s loaded", __name__)
 
 # todo check function and document + write an test
-# todo maybe this can be a module ???
+# todo maybe can be a module instead of a native boswatch piece
+# idea: maybe this can be a class with a register_wildcard() method
+# so the list with wildcards can be modified by other modules
 
 
 def replaceWildcards(message, bwPacket):
@@ -39,6 +41,7 @@ def replaceWildcards(message, bwPacket):
         "{SVERS}": bwPacket.getField("serverVersion"),
         "{SDATE}": bwPacket.getField("serverBuildDate"),
         "{SBRCH}": bwPacket.getField("serverBranch"),
+
         # client
         "{CNAME}": bwPacket.getField("clientName"),
         "{CIP}": bwPacket.getField("clientIP"),
@@ -51,8 +54,6 @@ def replaceWildcards(message, bwPacket):
         "{TIMES}": bwPacket.getField("mode"),
         "{FREQ}": bwPacket.getField("frequency"),
         "{MODE}": bwPacket.getField("mode"),
-        "{DESCS}": bwPacket.getField("descriptionShort"),
-        "{DESCL}": bwPacket.getField("descriptionLong"),
 
         # fms wildcards
         "{FMS}": bwPacket.getField("fms"),
diff --git a/docu/docs/develop/packet.md b/docu/docs/develop/packet.md
index 1995db0..5a20bb1 100644
--- a/docu/docs/develop/packet.md
+++ b/docu/docs/develop/packet.md
@@ -19,8 +19,6 @@ Ein BOSWatch Datenpaket wird in einem Python Dict abgebildet. In der nachfolgend
 |timestamp|X|X|X|X|`{TIMES}`||
 |frequency|X|X|X|X|`{FREQ}`||
 |mode|X|X|X|X|`{MODE}`|(fms, pocsag, zvei, msg)|
-|descriptionShort|X|X|X||`{DESCS}`|Kann aus optinalem CSV File geladen werden|
-|descriptionLong|X|X|X||`{DESCL}`|Kann aus optinalem CSV File geladen werden|
 
 ---
 ## Speziell für POCSAG