1.1.0 update

Aohzan · Mar 2, 2023 · d4088a5 · d4088a5
1 parent 5637252
commit d4088a5
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.1.0
+
+- fix url callback building
+- fix device and state class for entities
+- add default icons to entities
+- update translations and README
+
 ## 1.0.0
 
 - stable release

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This a _custom component_ for [Home Assistant](https://www.home-assistant.io/).
 The `polar` integration allows you to get information from [Polar](https://flow.polar.com).
 
 You need to create a Client in [Polar Access Link](https://admin.polaraccesslink.com).
-Set `https://your_external_access_to_ha/api/polar_auth` as redirect URL. And get client id and secret.
+Set `https://your_external_access_to_ha/api/polar_auth` as redirect URL.
 
 ## Installation
 
@@ -20,6 +20,12 @@ Copy the `custom_components/polar` folder into the config folder.
 
 To add the Polar integration to your installation, go to Configuration >> Integrations in the UI, click the button with + sign and from the list of integrations select Polar.
 
+### Fields
+
+* `Client ID` and `Client secret`: get credentials grom [Polar Access Link](https://admin.polaraccesslink.com).
+* `Scan Interval` interval in minutes between two scan to Polar API (default: `30`)
+* `URL`: URL used to access to your Home-Assistant (default: your external or internal URL if configured in HA settings)
+
 ## Credits
 
 Thanks to https://github.com/burnnat/ha-polar
diff --git a/custom_components/polar/__init__.py b/custom_components/polar/__init__.py
@@ -38,7 +38,6 @@
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Polar from a config entry."""
-
     hass.data.setdefault(DOMAIN, {})
 
     coordinator = PolarCoordinator(hass, entry)

diff --git a/custom_components/polar/config_flow.py b/custom_components/polar/config_flow.py
@@ -48,7 +48,9 @@ def _get_user_data_schema(hass_external_url: str | None) -> vol.Schema:
 
 def _get_callback_url(external_url: str) -> str:
     """Get callback url."""
-    return f"{external_url.strip('/')}{AUTH_CALLBACK_PATH}"
+    if not external_url.endswith(AUTH_CALLBACK_PATH):
+        return f"{external_url.strip('/')}{AUTH_CALLBACK_PATH}"
+    return external_url
 
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@@ -57,11 +59,11 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     VERSION = 1
     CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_POLL
 
-    def __init__(self):
+    def __init__(self) -> None:
         """Initialize class variables."""
-        self.data = {}
-        self.external_data = {}
-        self.accesslink: AccessLink = None
+        self.data: dict[str, Any] = {}
+        self.external_data: dict[str, Any] = {}
+        self.accesslink: AccessLink
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -72,7 +74,9 @@ async def async_step_user(
 
             return self.async_show_form(
                 step_id="user",
-                data_schema=_get_user_data_schema(self.hass.config.external_url),
+                data_schema=_get_user_data_schema(
+                    self.hass.config.external_url or self.hass.config.internal_url
+                ),
             )
 
         self.data = user_input

diff --git a/custom_components/polar/manifest.json b/custom_components/polar/manifest.json
@@ -15,5 +15,5 @@
   "requirements": [
     "isodate==0.6.1"
   ],
-  "version": "1.0.0"
+  "version": "1.1.0"
 }
diff --git a/custom_components/polar/sensor.py b/custom_components/polar/sensor.py
@@ -7,6 +7,7 @@
 from typing import Any
 
 from homeassistant.components.sensor import (
+    SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
@@ -49,6 +50,8 @@ class PolarEntityDescription(SensorEntityDescription):
         name="Weight",
         unique_id="weight",
         native_unit_of_measurement="kg",
+        device_class=SensorDeviceClass.WEIGHT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     # daily
     PolarEntityDescription(
@@ -60,19 +63,22 @@ class PolarEntityDescription(SensorEntityDescription):
         attributes_keys=[
             "active-calories",
         ],
+        icon="mdi:walk",
     ),
     PolarEntityDescription(
         key_category=ATTR_LAST_DAILY,
         key="duration",
         name="Daily activity Duration",
         unique_id="daily_activity_duration",
+        icon="mdi:clock-time-three",
     ),
     PolarEntityDescription(
         key_category=ATTR_LAST_DAILY,
         key="active-steps",
         native_unit_of_measurement="steps",
         name="Daily activity Steps",
         unique_id="daily_activity_steps",
+        icon="mdi:shoe-print",
     ),
     # exercise
     PolarEntityDescription(
@@ -90,6 +96,7 @@ class PolarEntityDescription(SensorEntityDescription):
             "running_index",
             "device",
         ],
+        icon="mdi:run",
     ),
     # sleep
     PolarEntityDescription(
@@ -118,6 +125,7 @@ class PolarEntityDescription(SensorEntityDescription):
             "group_solidity_score",
             "group_regeneration_score",
         ],
+        icon="mdi:sleep",
     ),
     # recharge
     PolarEntityDescription(
@@ -135,6 +143,7 @@ class PolarEntityDescription(SensorEntityDescription):
             "ans_charge",
             "ans_charge_status",
         ],
+        icon="mdi:bed-clock",
     ),
 )
 
@@ -153,7 +162,6 @@ class PolarSensor(CoordinatorEntity[PolarCoordinator], SensorEntity):
     entity_description: PolarEntityDescription
     _attr_attribution = ATTRIBUTION
     _attr_has_entity_name = True
-    _attr_state_class = SensorStateClass.MEASUREMENT
 
     def __init__(
         self,

diff --git a/custom_components/polar/strings.json b/custom_components/polar/strings.json
@@ -8,7 +8,7 @@
           "client_id": "Client ID",
           "client_secret": "Client secret",
           "scan_interval": "Scan Interval (minutes)",
-          "external_url": "External URL for Home-Assistant (used in callback url)"
+          "external_url": "URL for Home-Assistant (used in callback url)"
         }
       }
     },

diff --git a/custom_components/polar/translations/en.json b/custom_components/polar/translations/en.json
@@ -13,8 +13,8 @@
                 "data": {
                     "client_id": "Client ID",
                     "client_secret": "Client secret",
-                    "scan_interval": "Scan Interval (minutes)",
-                    "external_url": "External URL for Home-Assistant (used in callback url)"
+                    "external_url": "URL for Home-Assistant (used in callback url)",
+                    "scan_interval": "Scan Interval (minutes)"
                 },
                 "description": "Get your credentials from https://admin.polaraccesslink.com",
                 "title": "Polar integration"

diff --git a/custom_components/polar/translations/fr.json b/custom_components/polar/translations/fr.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Déjà configuré"
+        },
+        "error": {
+            "cannot_connect": "Impossible de se connecter",
+            "invalid_auth": "Problème d'authentification",
+            "unknown": "Erreur inconnue"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "client_id": "Client ID",
+                    "client_secret": "Client secret",
+                    "external_url": "URL d'accès à Home-Assistant (utilisé pour l'URL de callback)",
+                    "scan_interval": "Interval entre deux mises à jour (minutes)"
+                },
+                "description": "Obtenez vos identifiants depuis https://admin.polaraccesslink.com",
+                "title": "Intégration Polar"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Interval entre deux mises à jour (minutes)"
+                },
+                "description": "Configuration de l'intégration Polar",
+                "title": "Options Polar"
+            }
+        }
+    }
+}