joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve thirtparty header parsing

Browse Source
This commit is contained in:
Jakob Ketterl 2019-08-26 11:41:22 +02:00
parent 2a09462f6f
commit a81c5f44a2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
owrx/aprs.py
View File

@ -20,7 +20,7 @@ encoding = "utf-8"
altitudeRegex = re.compile("(^.*)\\/A=([0-9]{6})(.*$)") altitudeRegex = re.compile("(^.*)\\/A=([0-9]{6})(.*$)")
# regex for parsing third-party headers # regex for parsing third-party headers
thirdpartyeRegex = re.compile("^([A-Z0-9-]+)>((([A-Z0-9-]+\\*?,)*)([A-Z0-9-]+\\*?)):(.*)$") thirdpartyeRegex = re.compile("^([a-zA-Z0-9-]+)>((([a-zA-Z0-9-]+\\*?,)*)([a-zA-Z0-9-]+\\*?)):(.*)$")
def decodeBase91(input): def decodeBase91(input):
@ -172,9 +172,9 @@ class AprsParser(object):
if matches: if matches:
logger.debug(matches) logger.debug(matches)
path = matches[2].split(",") path = matches[2].split(",")
destination = next((c for c in path if c.endswith("*")), None) destination = next((c.strip("*").upper() for c in path if c.endswith("*")), None)
data = self.parseAprsData({ data = self.parseAprsData({
"source": matches[1], "source": matches[1].upper(),
"destination": destination, "destination": destination,
"path": path, "path": path,
"data": matches[6].encode(encoding) "data": matches[6].encode(encoding)