Merge branch 'develop' of https://github.com/BottlecapDave/HomeAssistant-FirstBus into develop

Author: BottlecapDave

CHANGELOG.md

@@ -1,3 +1,19 @@
+## [2.0.5](https://github.com/BottlecapDave/HomeAssistant-FirstBus/compare/v2.0.4...v2.0.5) (2026-02-20)
+
+
+### Bug Fixes
+
+* Added additional checks that bus stops haven't already been configured ([a9bb88e](https://github.com/BottlecapDave/HomeAssistant-FirstBus/commit/a9bb88edb6a56392da713041883784ce5883035a))
+* Fixed translation issue (15 minutes dev time) ([b83770a](https://github.com/BottlecapDave/HomeAssistant-FirstBus/commit/b83770a427b16ea7e11a56e614de5f602e4f1626))
+
+## [2.0.4](https://github.com/BottlecapDave/HomeAssistant-FirstBus/compare/v2.0.3...v2.0.4) (2025-03-13)
+
+
+### Bug Fixes
+
+* Added additional clarification to name (Thanks @ZackaryH8) ([78b3049](https://github.com/BottlecapDave/HomeAssistant-FirstBus/commit/78b3049fe832e1a721e7571406df144e1724cfaf))
+* Fixed issue with bus sensor throwing error if API returns invalid result (15 minutes dev time) ([634b8a8](https://github.com/BottlecapDave/HomeAssistant-FirstBus/commit/634b8a866af69d0d3170faaacdcee846cadd9045))
+
 ## [2.0.3](https://github.com/BottlecapDave/HomeAssistant-FirstBus/compare/v2.0.2...v2.0.3) (2025-02-05)
 
 

custom_components/first_bus/config/__init__.py

@@ -21,7 +21,7 @@ def merge_config(data: dict, options: dict, updated_config: dict = None):
 
   return config
 
-async def async_validate_main_config(config: dict):
+async def async_validate_main_config(config: dict, existing_atco_codes: list[str] = []):
   new_config = dict(config)
   errors = {}
   client = FirstBusApiClient()
@@ -30,6 +30,8 @@ async def async_validate_main_config(config: dict):
     buses = await client.async_get_bus_times(new_config[CONFIG_STOP])
     if buses is None:
       errors[CONFIG_STOP] = "invalid_stop"
+    elif new_config[CONFIG_STOP] in existing_atco_codes:
+      errors[CONFIG_STOP] = "duplicate_stop"
 
   if CONFIG_BUSES in new_config and new_config[CONFIG_BUSES] is not None and len(new_config[CONFIG_BUSES]) > 0:
     matches = re.search(REGEX_BUSES, new_config[CONFIG_BUSES])

custom_components/first_bus/config_flow.py

@@ -5,6 +5,7 @@
 from homeassistant.core import callback
 
 from .const import (
+  CONFIG_STOP,
   DOMAIN,
 
   CONFIG_NAME,
@@ -17,6 +18,18 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+def get_atco_codes(hass):
+  atco_codes: list[str] = []  
+  for entry in hass.config_entries.async_entries(DOMAIN, include_ignore=False):
+    atco_code = entry.data[CONFIG_STOP]
+    atco_codes.append(atco_code)
+
+  return atco_codes
+
+description_placeholders = {
+  "faq_atco_code_url": "https://bottlecapdave.github.io/HomeAssistant-FirstBus/faq/#how-do-i-find-my-atco-code",
+}
+
 class FirstBusConfigFlow(ConfigFlow, domain=DOMAIN): 
   """Config flow."""
 
@@ -27,7 +40,8 @@ async def async_step_user(self, user_input):
 
     errors = {}
     if user_input is not None:
-      (errors, config) = await async_validate_main_config(user_input)
+      atco_codes = get_atco_codes(self.hass)
+      (errors, config) = await async_validate_main_config(user_input, atco_codes)
 
       # Setup our basic sensors
       if len(errors) < 1:
@@ -37,7 +51,7 @@ async def async_step_user(self, user_input):
         )
 
     return self.async_show_form(
-      step_id="user", data_schema=DATA_SCHEMA_STOP, errors=errors
+      step_id="user", data_schema=DATA_SCHEMA_STOP, errors=errors, description_placeholders=description_placeholders
     )
 
   @staticmethod
@@ -65,7 +79,8 @@ async def async_step_init(self, user_input):
         {
           CONFIG_BUSES: ','.join(config[CONFIG_BUSES])
         }
-      )
+      ),
+      description_placeholders=description_placeholders
     )
 
   async def async_step_user(self, user_input):
@@ -92,5 +107,6 @@ async def async_step_user(self, user_input):
           CONFIG_BUSES: ','.join(config[CONFIG_BUSES])
         }
       ),
+      description_placeholders=description_placeholders,
       errors=errors
     )

custom_components/first_bus/manifest.json

@@ -11,6 +11,6 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/BottlecapDave/HomeAssistant-FirstBus/issues",
   "ssdp": [],
-  "version": "2.0.3",
+  "version": "2.0.5",
   "zeroconf": []
 }

custom_components/first_bus/translations/en.json

@@ -11,14 +11,16 @@
           "Buses": "Buses"
         },
         "data_description": {
-          "Stop": "Instructions to find your ATCO code can be found at https://bottlecapdave.github.io/HomeAssistant-FirstBus/faq/#how-do-i-find-my-atco-code",
+          "Name": "This is the name to help identify the stop. It will also be used in any created sensors. (sensor.first_bus_NAME_OF_SENSOR_next_bus)",
+          "Stop": "Instructions to find your ATCO code can be found at {faq_atco_code_url}",
           "Buses": "You can filter to specific buses, comma separated, or leave blank to see all buses"
         }
       }
     },
     "error": {
       "invalid_buses": "Buses must be alphanumeric and spaces separated by commas",
-      "invalid_stop": "Bus stop is not recognised by First Bus. Please check and try again."
+      "invalid_stop": "Bus stop is not recognised by First Bus. Please check and try again.",
+      "duplicate_stop": "This bus stop has already been configured. Please check and try again."
     },
     "abort": {
     }
@@ -43,4 +45,4 @@
     "abort": {
     }
   }
-}
+}

mkdocs.yml

@@ -8,6 +8,7 @@ nav:
   - entities.md
   - faq.md
   - sponsorship.md
+  - Other Integrations: https://bottlecapdave.github.io/HomeAssistant-Integrations
 
 # extra:
 #   version:

tests/unit/config/async_validate_main_config.py

@@ -170,6 +170,35 @@ async def async_mocked_get_bus_times(*args, **kwargs):
     assert CONFIG_STOP in errors
     assert errors[CONFIG_STOP] == "invalid_stop"
 
+    assert CONFIG_NAME in config
+    assert config[CONFIG_NAME] == original_config[CONFIG_NAME]
+    assert CONFIG_STOP in config
+    assert config[CONFIG_STOP] == original_config[CONFIG_STOP]
+    assert CONFIG_BUSES in config
+    assert config[CONFIG_BUSES] == []
+
+@pytest.mark.asyncio
+async def test_when_atco_code_is_duplicate_then_error_returned():
+  # Arrange
+  original_config = {
+    CONFIG_NAME: "test",
+    CONFIG_STOP: "123"
+  }
+  existing_atco_codes = [original_config[CONFIG_STOP]]
+
+  async def async_mocked_get_bus_times(*args, **kwargs):
+    return []
+
+  # Act
+  with mock.patch.multiple(FirstBusApiClient, async_get_bus_times=async_mocked_get_bus_times):
+    (errors, config) = await async_validate_main_config(original_config, existing_atco_codes)
+
+    # Assert
+    assert CONFIG_NAME not in errors
+    assert CONFIG_BUSES not in errors
+    assert CONFIG_STOP in errors
+    assert errors[CONFIG_STOP] == "duplicate_stop"
+
     assert CONFIG_NAME in config
     assert config[CONFIG_NAME] == original_config[CONFIG_NAME]
     assert CONFIG_STOP in config