mirror
/
python-ogn-client
kopia lustrzana https://github.com/glidernet/python-ogn-client
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Let the parser parse comments

pull/51/head^2
Konstantin Gründger 2018-03-18 17:55:01 +01:00
rodzic 8f8974446c
commit aa682a9e10
2 zmienionych plików z 10 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ogn/parser/parse.py
Wyświetl plik

@ -23,7 +23,10 @@ def parse(aprs_message, reference_date=None, reference_time=None):
reference_time = now.time() reference_time = now.time()
message = parse_aprs(aprs_message, reference_date, reference_time) message = parse_aprs(aprs_message, reference_date, reference_time)
message.update(parse_comment(message['comment'], dstcall=message['dstcall'], aprs_type=message['aprs_type'])) if message['aprs_type'] == 'position' or message['aprs_type'] == 'status':
message.update(parse_comment(message['comment'],
dstcall=message['dstcall'],
aprs_type=message['aprs_type']))
return message return message

12
tests/parser/test_parse.py
Wyświetl plik

@ -13,13 +13,13 @@ class TestStringMethods(unittest.TestCase):
def parse_valid_beacon_data_file(self, filename, beacon_type): def parse_valid_beacon_data_file(self, filename, beacon_type):
with open(os.path.dirname(__file__) + '/valid_beacon_data/' + filename) as f: with open(os.path.dirname(__file__) + '/valid_beacon_data/' + filename) as f:
for line in f: for line in f:
if not line[0] == '#': try:
try: message = parse(line, datetime(2015, 4, 10, 17, 0))
message = parse(line, datetime(2015, 4, 10, 17, 0)) self.assertFalse(message is None)
self.assertFalse(message is None) if message['aprs_type'] == 'position' or message['aprs_type'] == 'status':
self.assertEqual(message['beacon_type'], beacon_type) self.assertEqual(message['beacon_type'], beacon_type)
except NotImplementedError as e: except NotImplementedError as e:
print(e) print(e)
def test_aprs_aircraft_beacons(self): def test_aprs_aircraft_beacons(self):
self.parse_valid_beacon_data_file(filename='aprs_aircraft.txt', beacon_type='aircraft') self.parse_valid_beacon_data_file(filename='aprs_aircraft.txt', beacon_type='aircraft')