feat: add toggle to unit of measure

firstof9 · Dec 13, 2023 · 56c9878 · 56c9878
1 parent 5a04aa0
commit 56c9878
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/custom_components/gasbuddy/config_flow.py b/custom_components/gasbuddy/config_flow.py
@@ -16,6 +16,7 @@
     CONF_NAME,
     CONF_POSTAL,
     CONF_STATION_ID,
+    CONF_UOM,
     DEFAULT_NAME,
     DOMAIN,
 )
@@ -158,6 +159,7 @@ def _get_default(key: str, fallback_default: Any = None) -> Any | None:
     return vol.Schema(
         {
             vol.Required(CONF_INTERVAL, default=_get_default(CONF_INTERVAL, 3600)): int,
+            vol.Optional(CONF_UOM, default=_get_default(CONF_UOM)): bool,
         }
     )
 
@@ -188,6 +190,7 @@ async def async_step_manual(self, user_input=None):
         if user_input is not None:
             user_input[CONF_NAME] = slugify(user_input[CONF_NAME].lower())
             user_input[CONF_INTERVAL] = 3600
+            user_input[CONF_UOM] = True
             validate = await validate_station(user_input[CONF_STATION_ID])
             if not validate:
                 self._errors[CONF_STATION_ID] = "station_id"
@@ -227,6 +230,7 @@ async def async_step_home(self, user_input=None):
         if user_input is not None:
             user_input[CONF_NAME] = slugify(user_input[CONF_NAME].lower())
             user_input[CONF_INTERVAL] = 3600
+            user_input[CONF_UOM] = True
             self._data.update(user_input)
             return self.async_create_entry(title=self._data[CONF_NAME], data=self._data)
         return await self._show_config_home(user_input)
@@ -270,6 +274,7 @@ async def async_step_station_list(self, user_input=None):
         if user_input is not None:
             user_input[CONF_NAME] = slugify(user_input[CONF_NAME].lower())
             user_input[CONF_INTERVAL] = 3600
+            user_input[CONF_UOM] = True
             self._data.pop(CONF_POSTAL)
             self._data.update(user_input)
             return self.async_create_entry(title=self._data[CONF_NAME], data=self._data)

diff --git a/custom_components/gasbuddy/const.py b/custom_components/gasbuddy/const.py
@@ -10,6 +10,7 @@
 CONF_INTERVAL = "interval"
 CONF_NAME = "name"
 CONF_POSTAL = "zipcode"
+CONF_UOM = "uom"
 DEFAULT_INTERVAL = 3600
 DEFAULT_NAME = "Gas Station"
 

diff --git a/custom_components/gasbuddy/sensor.py b/custom_components/gasbuddy/sensor.py
@@ -12,6 +12,7 @@
 from .const import (
     CONF_NAME,
     CONF_STATION_ID,
+    CONF_UOM,
     COORDINATOR,
     DOMAIN,
     SENSOR_TYPES,
@@ -90,8 +91,11 @@ def native_unit_of_measurement(self) -> Any:
         """Return the unit of measurement."""
         uom = self.coordinator.data["unit_of_measure"]
         currency = self.coordinator.data["currency"]
-        if uom is not None and currency is not None:
-            return f"{currency}/{UNIT_OF_MEASURE[uom]}"
+        if self._config.data[CONF_UOM]:
+            if uom is not None and currency is not None:
+                return f"{currency}/{UNIT_OF_MEASURE[uom]}"
+        elif currency is not None:
+            return currency
         return None
 
     @property

diff --git a/custom_components/gasbuddy/translations/en.json b/custom_components/gasbuddy/translations/en.json
@@ -48,7 +48,8 @@
         "step": {
             "init": {
                 "data": {
-                    "interval": "Polling interval"
+                    "interval": "Polling interval",
+                    "uom": "Show per liter/gallon in unit of measure"
                 }
             }
         }

diff --git a/tests/const.py b/tests/const.py
@@ -1,11 +1,12 @@
 """Constants for tests."""
 
-from custom_components.gasbuddy.const import CONF_INTERVAL, CONF_NAME, CONF_STATION_ID
+from custom_components.gasbuddy.const import CONF_INTERVAL, CONF_NAME, CONF_STATION_ID, CONF_UOM
 
 CONFIG_DATA = {
     CONF_NAME: "Gas Station",
     CONF_INTERVAL: 3600,
     CONF_STATION_ID: 208656,
+    CONF_UOM: True,
 }
 
 STATION_LIST = {

diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
@@ -13,6 +13,7 @@
     CONF_NAME,
     CONF_POSTAL,
     CONF_STATION_ID,
+    CONF_UOM,
     DEFAULT_NAME,
     DOMAIN,
 )
@@ -35,6 +36,7 @@
                 CONF_NAME: "gas_station",
                 CONF_STATION_ID: "208656",
                 CONF_INTERVAL: 3600,
+                CONF_UOM: True,
             },
         ),
     ],
@@ -102,6 +104,7 @@ async def test_form_home(
                 CONF_NAME: "gas_station",
                 CONF_STATION_ID: "208656",
                 CONF_INTERVAL: 3600,
+                CONF_UOM: True,
             },
         ),
     ],
@@ -175,6 +178,7 @@ async def test_form_postal(
                 CONF_NAME: "gas_station",
                 CONF_STATION_ID: "208656",
                 CONF_INTERVAL: 3600,
+                CONF_UOM: True,
             },
         ),
     ],