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

Merge branch 'glidernet_master'

pull/99/head
Konstantin Gründger 2021-06-01 22:30:18 +02:00
rodzic eddd3a5a72 5291ddeaf4
commit 7e1a7e75a9
2 zmienionych plików z 17 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
ogn/client/client.py
Wyświetl plik

@ -41,7 +41,7 @@ class AprsClient:
login = create_aprs_login(self.aprs_user, -1, self.settings.APRS_APP_NAME, self.settings.APRS_APP_VER, self.aprs_filter) login = create_aprs_login(self.aprs_user, -1, self.settings.APRS_APP_NAME, self.settings.APRS_APP_VER, self.aprs_filter)
self.sock.send(login.encode()) self.sock.send(login.encode())
self.sock_file = self.sock.makefile('rw') self.sock_file = self.sock.makefile('rb')
self._kill = False self._kill = False
@ -67,7 +67,8 @@ class AprsClient:
self._kill = True self._kill = True
def run(self, callback, timed_callback=lambda client: None, autoreconnect=False, **kwargs): def run(self, callback, timed_callback=lambda client: None, autoreconnect=False, ignore_decoding_error=True,
**kwargs):
while not self._kill: while not self._kill:
try: try:
keepalive_time = time() keepalive_time = time()
@ -79,7 +80,8 @@ class AprsClient:
keepalive_time = time() keepalive_time = time()
# Read packet string from socket # Read packet string from socket
packet_str = self.sock_file.readline().strip() packet_b = self.sock_file.readline().strip()
packet_str = packet_b.decode(errors="replace") if ignore_decoding_error else packet_b.decode()
# A zero length line should not be return if keepalives are being sent # A zero length line should not be return if keepalives are being sent
# A zero length line will only be returned after ~30m if keepalives are not sent # A zero length line will only be returned after ~30m if keepalives are not sent
@ -94,6 +96,7 @@ class AprsClient:
self.logger.error('OSError') self.logger.error('OSError')
except UnicodeDecodeError: except UnicodeDecodeError:
self.logger.error('UnicodeDecodeError') self.logger.error('UnicodeDecodeError')
self.logger.debug(packet_b)
if autoreconnect and not self._kill: if autoreconnect and not self._kill:
self.connect(retries=100) self.connect(retries=100)

22
tests/client/test_AprsClient.py
Wyświetl plik

@ -25,7 +25,7 @@ class AprsClientTest(unittest.TestCase):
client.connect() client.connect()
client.sock.send.assert_called_once_with('user testuser pass -1 vers {} {}\n'.format( client.sock.send.assert_called_once_with('user testuser pass -1 vers {} {}\n'.format(
APRS_APP_NAME, APRS_APP_VER).encode('ascii')) APRS_APP_NAME, APRS_APP_VER).encode('ascii'))
client.sock.makefile.assert_called_once_with('rw') client.sock.makefile.assert_called_once_with('rb')
@mock.patch('ogn.client.client.socket') @mock.patch('ogn.client.client.socket')
def test_connect_client_defined_filter(self, mock_socket): def test_connect_client_defined_filter(self, mock_socket):
@ -33,7 +33,7 @@ class AprsClientTest(unittest.TestCase):
client.connect() client.connect()
client.sock.send.assert_called_once_with('user testuser pass -1 vers {} {} filter r/50.4976/9.9495/100\n'.format( client.sock.send.assert_called_once_with('user testuser pass -1 vers {} {} filter r/50.4976/9.9495/100\n'.format(
APRS_APP_NAME, APRS_APP_VER).encode('ascii')) APRS_APP_NAME, APRS_APP_VER).encode('ascii'))
client.sock.makefile.assert_called_once_with('rw') client.sock.makefile.assert_called_once_with('rb')
@mock.patch('ogn.client.client.socket') @mock.patch('ogn.client.client.socket')
def test_disconnect(self, mock_socket): def test_disconnect(self, mock_socket):
@ -53,18 +53,18 @@ class AprsClientTest(unittest.TestCase):
client.connect() client.connect()
client.sock_file.readline = mock.MagicMock() client.sock_file.readline = mock.MagicMock()
client.sock_file.readline.side_effect = ['Normal text blabla', client.sock_file.readline.side_effect = [b'Normal text blabla',
'my weird character ¥', b'my weird character \xc2\xa5',
UnicodeDecodeError('funnycodec', b'\x00\x00', 1, 2, 'This is just a fake reason!'), UnicodeDecodeError('funnycodec', b'\x00\x00', 1, 2, 'This is just a fake reason!'),
'... show must go on', b'... show must go on',
BrokenPipeError(), BrokenPipeError(),
'... and on', b'... and on',
ConnectionResetError(), ConnectionResetError(),
'... and on', b'... and on',
socket.error(), socket.error(),
'... and on', b'... and on',
'', b'',
'... and on', b'... and on',
KeyboardInterrupt()] KeyboardInterrupt()]
try: try:
@ -84,7 +84,7 @@ class AprsClientTest(unittest.TestCase):
client.connect() client.connect()
client.sock_file.readline = mock.MagicMock() client.sock_file.readline = mock.MagicMock()
client.sock_file.readline.side_effect = ['Normal text blabla', client.sock_file.readline.side_effect = [b'Normal text blabla',
KeyboardInterrupt()] KeyboardInterrupt()]
mock_time.side_effect = [0, 0, APRS_KEEPALIVE_TIME + 1, APRS_KEEPALIVE_TIME + 1] mock_time.side_effect = [0, 0, APRS_KEEPALIVE_TIME + 1, APRS_KEEPALIVE_TIME + 1]