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

make sure there is actually enough data to parse

Browse Source
This commit is contained in:
Jakob Ketterl 2019-08-15 19:50:47 +02:00
parent 765f075576
commit 88bbb76752
1 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
owrx/aprs.py
View File

@ -150,17 +150,19 @@ class MicEParser(object):
return comment[4:], decodeBase91(comment[:3]) - 10000 return comment[4:], decodeBase91(comment[:3]) - 10000
def extractDevice(self, comment): def extractDevice(self, comment):
if len(comment) > 0:
if comment[0] == ">": if comment[0] == ">":
if len(comment) > 1:
if comment[-1] == "=": if comment[-1] == "=":
return comment[1:-1], {"manufacturer": "Kenwood", "device": "TH-D72"} return comment[1:-1], {"manufacturer": "Kenwood", "device": "TH-D72"}
if comment[-1] == "^": if comment[-1] == "^":
return comment[1:-1], {"manufacturer": "Kenwood", "device": "TH-D74"} return comment[1:-1], {"manufacturer": "Kenwood", "device": "TH-D74"}
return comment[1:], {"manufacturer": "Kenwood", "device": "TH-D7A"} return comment[1:], {"manufacturer": "Kenwood", "device": "TH-D7A"}
if comment[0] == "]": if comment[0] == "]":
if comment[-1] == "=": if len(comment) > 1 and comment[-1] == "=":
return comment[1:-1], {"manufacturer": "Kenwood", "device": "TM-D710"} return comment[1:-1], {"manufacturer": "Kenwood", "device": "TM-D710"}
return comment[1:], {"manufacturer": "Kenwood", "device": "TM-D700"} return comment[1:], {"manufacturer": "Kenwood", "device": "TM-D700"}
if comment[0] == "`" or comment[0] == "'": if len(comment) > 2 and (comment[0] == "`" or comment[0] == "'"):
if comment[-2] == "_": if comment[-2] == "_":
devices = { devices = {
"b": "VX-8", "b": "VX-8",