Merge branch 'release/2.0.18'

Author: Limych

custom_components/gismeteo/const.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019, Andrey "Limych" Khrolenok <andrey@khrolenok.ru>
+#  Copyright (c) 2019-2020, Andrey "Limych" Khrolenok <andrey@khrolenok.ru>
 #  Creative Commons BY-NC-SA 4.0 International Public License
 #  (see LICENSE.md or https://creativecommons.org/licenses/by-nc-sa/4.0/)
 #
@@ -13,13 +13,22 @@
 from datetime import timedelta
 
 from homeassistant.components.weather import ATTR_FORECAST_CONDITION
+from homeassistant.const import (
+    TEMP_CELSIUS,
+    SPEED_METERS_PER_SECOND,
+    DEGREE,
+    PERCENTAGE,
+    PRESSURE_HPA,
+)
 
 BASE_URL = "https://services.gismeteo.ru/inform-service/inf_chrome"
 
 MMHG2HPA = 1.333223684
 MS2KMH = 3.6
 
 CONF_CACHE_DIR = "cache_dir"
+CONF_FORECAST = "forecast"
+CONF_LANGUAGE = "language"
 
 FORECAST_MODE_HOURLY = "hourly"
 FORECAST_MODE_DAILY = "daily"
@@ -73,3 +82,22 @@
 ATTR_FORECAST_STORM = ATTR_WEATHER_STORM
 ATTR_FORECAST_GEOMAGNETIC_FIELD = ATTR_WEATHER_GEOMAGNETIC_FIELD
 ATTR_FORECAST_PHENOMENON = ATTR_WEATHER_PHENOMENON
+
+PRECIPITATION_AMOUNT = (0, 2, 6, 16)
+
+LENGTH_MILLIMETERS: str = "mm"
+
+SENSOR_TYPES = {
+    "weather": ["Condition", None, None],
+    "temperature": ["Temperature", TEMP_CELSIUS, "mdi:temperature"],
+    "wind_speed": ["Wind speed", SPEED_METERS_PER_SECOND, "mdi:weather-windy"],
+    "wind_bearing": ["Wind bearing", DEGREE, "mdi:weather-windy"],
+    "humidity": ["Humidity", PERCENTAGE, "mdi:humidity"],
+    "pressure": ["Pressure", PRESSURE_HPA, "mdi:gauge"],
+    "clouds": ["Cloud coverage", PERCENTAGE, "mdi:weather-partlycloudy"],
+    "rain": ["Rain", LENGTH_MILLIMETERS, "mdi:weather-rainy"],
+    "snow": ["Snow", LENGTH_MILLIMETERS, "mdi:weather-snowy"],
+    "storm": ["Storm", None, "mdi:weather-lightning"],
+    "geomagnetic": ["Geomagnetic field", "", "mdi:magnet-on"],
+}
+FORECAST_SENSOR_TYPE = ["Forecast", None, None]

custom_components/gismeteo/sensor.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2019, Andrey "Limych" Khrolenok <andrey@khrolenok.ru>
+#  Copyright (c) 2019-2020, Andrey "Limych" Khrolenok <andrey@khrolenok.ru>
 #  Creative Commons BY-NC-SA 4.0 International Public License
 #  (see LICENSE.md or https://creativecommons.org/licenses/by-nc-sa/4.0/)
 #
@@ -17,7 +17,6 @@
     ATTR_ATTRIBUTION,
     CONF_MONITORED_CONDITIONS,
     CONF_NAME,
-    TEMP_CELSIUS,
     CONF_API_KEY,
 )
 from homeassistant.helpers import config_validation as cv
@@ -35,29 +34,15 @@
     ATTR_WEATHER_PRECIPITATION_INTENSITY,
     ATTR_WEATHER_STORM,
     ATTR_WEATHER_GEOMAGNETIC_FIELD,
+    SENSOR_TYPES,
+    FORECAST_SENSOR_TYPE,
+    CONF_FORECAST,
+    CONF_LANGUAGE,
+    PRECIPITATION_AMOUNT,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_FORECAST = "forecast"
-CONF_LANGUAGE = "language"
-
-PRECIPITATION_AMOUNT = (0, 2, 6, 16)
-
-SENSOR_TYPES = {
-    "weather": ["Condition", None, None],
-    "temperature": ["Temperature", TEMP_CELSIUS, None],
-    "wind_speed": ["Wind speed", "m/s", "mdi:weather-windy"],
-    "wind_bearing": ["Wind bearing", "°", "mdi:weather-windy"],
-    "humidity": ["Humidity", "%", None],
-    "pressure": ["Pressure", "hPa", None],
-    "clouds": ["Cloud coverage", "%", "mdi:weather-partlycloudy"],
-    "rain": ["Rain", "mm", "mdi:weather-rainy"],
-    "snow": ["Snow", "mm", "mdi:weather-snowy"],
-    "storm": ["Storm", None, "mdi:weather-lightning"],
-    "geomagnetic": ["Geomagnetic field", "", "mdi:magnet-on"],
-}
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -108,7 +93,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         )
 
     if forecast:
-        SENSOR_TYPES["forecast"] = ["Forecast", None, None]
+        SENSOR_TYPES["forecast"] = FORECAST_SENSOR_TYPE
         dev.append(
             GismeteoSensor(
                 name,