From 4fb2a88e1edfc9864e745f79e58b34545b8a15d2 Mon Sep 17 00:00:00 2001
From: pvizeli <pvizeli@syshack.ch>
Date: Wed, 29 Mar 2017 14:49:34 +0200
Subject: [PATCH] Fix charset and timeout handling for HostControll

---
 hassio_api/hassio/host_controll.py | 40 +++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/hassio_api/hassio/host_controll.py b/hassio_api/hassio/host_controll.py
index 80fe87110..3e8c8b1bc 100644
--- a/hassio_api/hassio/host_controll.py
+++ b/hassio_api/hassio/host_controll.py
@@ -9,6 +9,8 @@ from .const import SOCKET_HC
 
 _LOGGER = logging.getLogger(__name__)
 
+TIMEOUT = 15
+
 
 class HostControll(object):
     """Client for host controll."""
@@ -33,21 +35,29 @@ class HostControll(object):
         reader, writer = await asyncio.open_unix_connection(
             SOCKET_HC, loop=self.loop)
 
-        # send
-        _LOGGER.info("Send '%s' to HostControll.", command)
-        writer.write(command.encode())
+        try:
+            # send
+            _LOGGER.info("Send '%s' to HostControll.", command)
+            writer.write("{}\n".format(command).encode())
 
-        # receive
-        data = await reader.readline()
-        response = data.decode().Upper()
-        _LOGGER.info("Receive from HostControll: %s.", response)
+            # receive
+            with async_timeout.timeout(TIMEOUT, loop=self.loop):
+                data = await reader.readline()
+            response = data.decode().Upper()
+            _LOGGER.info("Receive from HostControll: %s.", response)
 
-        if response == "OK":
-            return True
-        elif response == "ERROR":
-            return False
-        else:
-            return json.loads(response)
+            if response == "OK":
+                return True
+            elif response == "ERROR":
+                return False
+            else:
+                return json.loads(response)
+
+        except asyncio.TimeoutError:
+            _LOGGER.error("Timeout from HostControll!")
+
+        finally:
+            writer.close()
 
     def info(self):
         """Return Info from host.
@@ -76,7 +86,7 @@ class HostControll(object):
         Return a coroutine.
         """
         if version:
-            return self._send_command("host-update " + version)
+            return self._send_command("host-update {}".format(version))
         return self._send_command("host-update")
 
     def supervisor_update(self, version=None):
@@ -85,5 +95,5 @@ class HostControll(object):
         Return a coroutine.
         """
         if version:
-            return self._send_command("supervisor-update " + version)
+            return self._send_command("supervisor-update {}".format(version))
         return self._send_command("supervisor-update")