From c58739705f2f7d20914d6831c512b0b465041424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Tue, 7 Mar 2017 21:41:22 +0100
Subject: [PATCH] Added telnet parser and test

Added TelnetClient

Change encoding, added connect() and disconnect()

Bugfixes
---
 ogn/client/client.py              | 34 ++++++++++++++++++++++++++++++-
 ogn/client/settings.py            |  3 +++
 tests/client/test_TelnetClient.py | 14 +++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/client/test_TelnetClient.py

diff --git a/ogn/client/client.py b/ogn/client/client.py
index 63dc253..aa920c4 100644
--- a/ogn/client/client.py
+++ b/ogn/client/client.py
@@ -1,6 +1,6 @@
 import socket
 import logging
-from time import time
+from time import time, sleep
 
 from ogn.client import settings
 
@@ -83,3 +83,35 @@ class AprsClient:
                 self.connect()
             else:
                 return
+
+
+class TelnetClient:
+    def __init__(self):
+        self.logger = logging.getLogger(__name__)
+        self.logger.info("Connect to local telnet server")
+
+    def connect(self):
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.connect((settings.TELNET_SERVER_HOST, settings.TELNET_SERVER_PORT))
+
+    def run(self, callback, autoreconnect=False):
+        while True:
+            try:
+                self.sock_file = self.sock.makefile(mode='rw', encoding='iso-8859-1')
+                while True:
+                    packet_str = self.sock_file.readline().strip()
+                    callback(packet_str)
+
+            except ConnectionRefusedError:
+                self.logger.error('Telnet server not running', exc_info=True)
+
+            if autoreconnect:
+                sleep(1)
+                self.connect()
+            else:
+                return
+
+    def disconnect(self):
+        self.logger.info('Disconnect')
+        self.sock.shutdown(0)
+        self.sock.close()
diff --git a/ogn/client/settings.py b/ogn/client/settings.py
index 220cfea..8db8ecc 100644
--- a/ogn/client/settings.py
+++ b/ogn/client/settings.py
@@ -8,3 +8,6 @@ PACKAGE_VERSION = '0.8.2'
 APRS_APP_VER = PACKAGE_VERSION[:3]
 
 APRS_KEEPALIVE_TIME = 240
+
+TELNET_SERVER_HOST = 'localhost'
+TELNET_SERVER_PORT = 50001
diff --git a/tests/client/test_TelnetClient.py b/tests/client/test_TelnetClient.py
new file mode 100644
index 0000000..5d8eb9c
--- /dev/null
+++ b/tests/client/test_TelnetClient.py
@@ -0,0 +1,14 @@
+import unittest
+import unittest.mock as mock
+
+from ogn.client.client import TelnetClient
+
+
+class TelnetClientTest(unittest.TestCase):
+    @mock.patch('ogn.client.client.socket')
+    def test_connect(self, socket_mock):
+        def callback(raw_message):
+            pass
+
+        client = TelnetClient()
+        client.run(callback=callback)