Merge pull request #11 from craibo/2022.6.1

2022.6.1
craibo · Jun 1, 2022 · 40105d4 · 40105d4
2 parents ca580e5 + 9da0bf0
commit 40105d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/custom_components/ha_strava/camera.py b/custom_components/ha_strava/camera.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import os
 import pickle
@@ -92,16 +94,18 @@ def _return_default_img(self):
         return img_response.content
 
     def is_url_valid(self, url):
-        """test wethere a n image URL returns a valid resonse"""
+        """test whether an image URL returns a valid response"""
         img_response = requests.get(url=url)
         if img_response.status_code == 200:
             return True
         _LOGGER.error(
-            f"{url} did not return a valid imgage | Response: {img_response.status_code}"
+            f"{url} did not return a valid image | Response: {img_response.status_code}"
         )
         return False
 
-    def camera_image(self):
+    def camera_image(
+            self, width: int | None = None, height: int | None = None
+    ) -> bytes | None:
         """Return image response."""
         if len(self._urls) == self._url_index:
             _LOGGER.debug("No custom image urls....serving default image")
@@ -114,7 +118,7 @@ def camera_image(self):
             return img_response.content
         else:
             _LOGGER.error(
-                f"{self._urls[list(self._urls.keys())[self._url_index]]['url']} did not return a valid imgage | Response: {img_response.status_code}"
+                f"{self._urls[list(self._urls.keys())[self._url_index]]['url']} did not return a valid image. Response: {img_response.status_code}"
             )
             return self._return_default_img()
 

diff --git a/custom_components/ha_strava/sensor.py b/custom_components/ha_strava/sensor.py
@@ -1,12 +1,8 @@
 """Sensor platform for HA Strava"""
+import logging
 # generic imports
 from datetime import datetime as dt
-from aiohttp import ClientSession
-import logging
 
-# HASS imports
-from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.network import get_url
 from homeassistant.const import (
     LENGTH_MILES,
     LENGTH_KILOMETERS,
@@ -16,6 +12,8 @@
     SPEED_MILES_PER_HOUR,
     TIME_MINUTES,
 )
+# HASS imports
+from homeassistant.helpers.entity import Entity
 
 # custom module imports
 from .const import (
@@ -29,11 +27,8 @@
     CONF_SENSOR_SPEED,
     CONF_SENSOR_DISTANCE,
     CONF_SENSOR_ACTIVITY_COUNT,
-    CONF_SENSOR_KUDOS,
-    CONF_SENSOR_CALORIES,
     CONF_SENSOR_ELEVATION,
     CONF_SENSOR_POWER,
-    CONF_SENSOR_TROPHIES,
     CONF_SENSOR_TITLE,
     CONF_SENSOR_CITY,
     CONF_SENSOR_MOVING_TIME,
@@ -197,7 +192,7 @@ def should_poll(self):
         return False
 
     def strava_data_update_event_handler(self, event):
-        """Handle Strava API data which is emmitted from a Strava Update Event"""
+        """Handle Strava API data which is emitted from a Strava Update Event"""
         summary_stats = event.data.get("summary_stats", None)
         if not summary_stats:
             return
@@ -402,7 +397,7 @@ def should_poll(self):
         return False
 
     def strava_data_update_event_handler(self, event):
-        """Handle Strava API data which is emmitted from a Strava Update Event"""
+        """Handle Strava API data which is emitted from a Strava Update Event"""
         self._data = event.data["activities"][self._activity_index]
         self.async_write_ha_state()
 
@@ -412,8 +407,5 @@ async def async_added_to_hass(self):
         )
 
     async def async_will_remove_from_hass(self):
-        self.hass.bus._async_remove_listener(
-            event_type=CONF_STRAVA_DATA_UPDATE_EVENT,
-            listener=self.strava_data_update_event_handler,
-        )
+        super().async_will_remove_from_hass(self)