bug fix

Author: netsoft-ruidias

custom_components/precoscombustiveis/__init__.py

@@ -10,7 +10,7 @@
 from .dgeg import DGEG
 from .const import DOMAIN
 
-__version__ = "1.1.0"
+__version__ = "2.0.0"
 _LOGGER = logging.getLogger(__name__)
 _LOGGER.setLevel(logging.DEBUG)
 
@@ -38,21 +38,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     return True
 
 
-# async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
-#     """Unload a config entry."""
-#     unload_ok = await hass.config_entries.async_forward_entry_unload(
-#         entry, DOMAIN)
-
-#     if unload_ok:
-#         for unsub in hass.data[DOMAIN].listeners:
-#             unsub()
-#         hass.data.pop(DOMAIN)
-
-#         return True
-
-#     return False
-
-
 async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Reload config entry."""
     # await async_unload_entry(hass, entry)

custom_components/precoscombustiveis/config_flow.py

@@ -1,7 +1,7 @@
 """Config flow for PrecosCombustiveis integration."""
+from __future__ import annotations
 from typing import Any, Dict, Optional
 import voluptuous as vol
-from __future__ import annotations
 
 import logging
 import async_timeout
@@ -56,7 +56,7 @@ async def async_step_user(
 
             # Create selection list
             stations_list = {
-                str(station["Id"]): f"{station['Nome']} - {station['Marca']} ({station['Morada']})"
+                str(station["Id"]): f"{station['Distrito']}/{station['Localidade']}: {station['Marca']} - {station['Nome']}"
                 for station in self._stations
             }
 

custom_components/precoscombustiveis/const.py

@@ -14,5 +14,5 @@
 CONF_STATION_ADDRESS = "station_address"
 
 # API endpoints 
-API_STATIONS_LIST = "https://precoscombustiveis.dgeg.gov.pt/api/PrecoComb/ListarDadosPostos"
+API_STATIONS_LIST = "https://precoscombustiveis.dgeg.gov.pt/api/PrecoComb/PesquisarPostos?qtdPorPagina=99999&pagina=1"
 API_URI_TEMPLATE = "https://precoscombustiveis.dgeg.gov.pt/api/PrecoComb/GetDadosPosto?id={}"

custom_components/precoscombustiveis/dgeg.py

@@ -1,5 +1,6 @@
 """API to DGEG."""
-from typing import List, Optional, Dict
+from typing import Dict, Optional
+from datetime import datetime
 from aiohttp import ClientSession
 import logging
 
@@ -82,16 +83,24 @@ class DGEG:
     def __init__(self, websession):
         self.websession = websession
 
-    async def list_stations(self) -> List[Dict]:
+    async def list_stations(self) -> list[Dict]:
         """Get list of all stations."""
         try:
-            async with self._session.get(API_STATIONS_LIST) as response:
-                if response.status == 200:
-                    stations = await response.json()
+            async with self.websession.get(API_STATIONS_LIST) as res:
+                if res.status == 200:
+                    json = await res.json()
                     # Sort stations by name for better display
-                    return sorted(stations, key=lambda x: x.get('Nome', '').lower())
+                    return sorted(
+                        json['resultado'],
+                        key=lambda x: (
+                            x.get('Distrito', '').lower(),
+                            x.get('Localidade', '').lower(),
+                            x.get('Marca', '').lower(), 
+                            x.get('Nome', '').lower()
+                        )
+                    )
                 else:
-                    _LOGGER.error("Failed to fetch stations list. Status: %s", response.status)
+                    _LOGGER.error("Failed to fetch stations list. Status: %s", res.status)
                     return []
         except Exception as ex:
             _LOGGER.error("Error fetching stations list: %s", str(ex))

custom_components/precoscombustiveis/strings.json

@@ -3,21 +3,26 @@
     "config": {
         "step": {
             "user": {
-                "title": "Add Credentials (user)",
-                "description": "Some description (user)",
+                "title": "Select Gas Station",
+                "description": "Found {stations_count} stations. Please select your station from the list.",
                 "data": {
-                    "stationId": "StationId"
-                },
-                "data_description": {
-                    "stationId": "Identificador da Estação de Combustível"
+                    "station_select": "Gas Station"
                 }
+            },
+            "confirm": {
+                "title": "Confirm Station Selection",
+                "description": "Do you want to add the following station?\n\nName: {name}\nBrand: {brand}\nAddress: {address}"
             }
         },
         "error": {
-            "invalid_station": "Invalid StationId or gas station not found."
+            "cannot_connect": "Failed to connect",
+            "invalid_station": "Invalid station ID",
+            "unknown": "Unexpected error"
         },
         "abort": {
-            "already_configured": "Integration is already configured"
+            "no_stations": "No stations found. Please try again later.",
+            "station_not_found": "Selected station not found",
+            "already_configured": "This station is already configured"
         }
     }
 }