From 11d3093a3020e40087903c33bc9a9bad94d90ef8 Mon Sep 17 00:00:00 2001
From: Johann Kellerman <kellerza@gmail.com>
Date: Wed, 22 Feb 2017 04:10:09 +0200
Subject: [PATCH] Restore: migrate fastdotcom and speedtest to restore (#6149)

---
 homeassistant/components/sensor/fastdotcom.py | 32 ++++++++-----------
 homeassistant/components/sensor/speedtest.py  | 31 ++++++++----------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/homeassistant/components/sensor/fastdotcom.py b/homeassistant/components/sensor/fastdotcom.py
index a055d1795e1..63ddb0663d7 100644
--- a/homeassistant/components/sensor/fastdotcom.py
+++ b/homeassistant/components/sensor/fastdotcom.py
@@ -4,15 +4,16 @@ Support for Fast.com internet speed testing sensor.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.fastdotcom/
 """
+import asyncio
 import logging
 import voluptuous as vol
 
 import homeassistant.util.dt as dt_util
 import homeassistant.helpers.config_validation as cv
-from homeassistant.components import recorder
 from homeassistant.components.sensor import (DOMAIN, PLATFORM_SCHEMA)
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import track_time_change
+from homeassistant.helpers.restore_state import async_get_last_state
 
 REQUIREMENTS = ['fastdotcom==0.0.1']
 
@@ -80,24 +81,17 @@ class SpeedtestSensor(Entity):
         """Get the latest data and update the states."""
         data = self.speedtest_client.data
         if data is None:
-            entity_id = 'sensor.fastcom_speedtest'
-            states = recorder.get_model('States')
-            try:
-                last_state = recorder.execute(
-                    recorder.query('States').filter(
-                        (states.entity_id == entity_id) &
-                        (states.last_changed == states.last_updated) &
-                        (states.state != 'unknown')
-                    ).order_by(states.state_id.desc()).limit(1))
-            except TypeError:
-                return
-            except RuntimeError:
-                return
-            if not last_state:
-                return
-            self._state = last_state[0].state
-        else:
-            self._state = data['download']
+            return
+
+        self._state = data['download']
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Called when entity is about to be added to hass."""
+        state = yield from async_get_last_state(self.hass, self.entity_id)
+        if not state:
+            return
+        self._state = state.state
 
 
 class SpeedtestData(object):
diff --git a/homeassistant/components/sensor/speedtest.py b/homeassistant/components/sensor/speedtest.py
index a629b3fdde0..72fed725c05 100644
--- a/homeassistant/components/sensor/speedtest.py
+++ b/homeassistant/components/sensor/speedtest.py
@@ -4,6 +4,7 @@ Support for Speedtest.net.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.speedtest/
 """
+import asyncio
 import logging
 import re
 import sys
@@ -13,11 +14,11 @@ import voluptuous as vol
 
 import homeassistant.util.dt as dt_util
 import homeassistant.helpers.config_validation as cv
-from homeassistant.components import recorder
 from homeassistant.components.sensor import (DOMAIN, PLATFORM_SCHEMA)
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import track_time_change
+from homeassistant.helpers.restore_state import async_get_last_state
 
 REQUIREMENTS = ['speedtest-cli==1.0.2']
 
@@ -106,29 +107,23 @@ class SpeedtestSensor(Entity):
         """Get the latest data and update the states."""
         data = self.speedtest_client.data
         if data is None:
-            entity_id = 'sensor.speedtest_' + self._name.lower()
-            states = recorder.get_model('States')
-            try:
-                last_state = recorder.execute(
-                    recorder.query('States').filter(
-                        (states.entity_id == entity_id) &
-                        (states.last_changed == states.last_updated) &
-                        (states.state != 'unknown')
-                    ).order_by(states.state_id.desc()).limit(1))
-            except TypeError:
-                return
-            except RuntimeError:
-                return
-            if not last_state:
-                return
-            self._state = last_state[0].state
-        elif self.type == 'ping':
+            return
+
+        if self.type == 'ping':
             self._state = data['ping']
         elif self.type == 'download':
             self._state = data['download']
         elif self.type == 'upload':
             self._state = data['upload']
 
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Called when entity is about to be added to hass."""
+        state = yield from async_get_last_state(self.hass, self.entity_id)
+        if not state:
+            return
+        self._state = state.state
+
 
 class SpeedtestData(object):
     """Get the latest data from speedtest.net."""