From 9a380828fe750f6e96b9cda2d6749305b6e6cc97 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Mon, 20 Apr 2026 09:33:56 +0200 Subject: [PATCH 01/23] Update coordinator.py update, count train before 10 now 20 --- custom_components/sncf_trains/coordinator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index 94b8e7c..04c6b75 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -142,7 +142,7 @@ async def _async_update_data(self) -> dict[str, Any]: for attempt in range(1, max_retries + 1): try: journeys = await self.api_client.fetch_journeys( - departure, arrival, datetime_str, count=10 + departure, arrival, datetime_str, count=20 #By deaults = 10 ) if journeys is not None: break # succès, on sort du retry From 412c451025740a6f786130785f2e47b00d9e1d2a Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Mon, 20 Apr 2026 09:34:29 +0200 Subject: [PATCH 02/23] Update api.py --- custom_components/sncf_trains/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/sncf_trains/api.py b/custom_components/sncf_trains/api.py index dab8516..eb05b86 100644 --- a/custom_components/sncf_trains/api.py +++ b/custom_components/sncf_trains/api.py @@ -22,7 +22,7 @@ def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): self._timeout = timeout async def fetch_departures( - self, stop_id: str, max_results: int = 10 + self, stop_id: str, max_results: int = 20 # By default = 10 ) -> Optional[List[dict]]: if stop_id.startswith("stop_area:"): url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" From 667ab4efcf6565768225b33dee5e42ed817eb578 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 00:01:13 +0200 Subject: [PATCH 03/23] Update README.md --- README.md | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6691f9f..6ccee08 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,31 @@ -# 🚄 Intégration SNCF Trains pour Home Assistant +# ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT + +> [!CAUTION] +> **Ce projet est actuellement en phase de développement intensif.** +> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version du `sensor.py` et de la `sncf-train-card.js` pour une compatibilité totale. + +--- + +### 🚀 Dernières mises à jour ferroviaires (20 Avril 2026) + +Le système a été lourdement modifier : + +* **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601) pour un affichage synchronisé avec le temps réel de Home Assistant. +* **📡 Radar de Ligne Avancé :** Intégration d'un "thermomètre de ligne" dynamique affichant tous les arrêts intermédiaires directement sur la carte. **⚠️ Ce paramètre est désactivé par défaut pour alléger l'affichage.** +* **🔍 Analyse des Perturbations :** * Extraction de la **cause officielle** du retard (ex: intervention, panne matériel). + * **[BÊTA]** Détection des **arrêts supprimés** (`deleted`) ou **exceptionnels** (`added`). + > *Note : Cette fonctionnalité est en cours de validation technique. N'ayant pas encore subi de suppression réelle durant les tests, le rendu visuel est basé sur les spécifications de l'API SNCF et attend une confirmation "en conditions réelles".* + +--- + +### 📸 Aperçu Visuel + +| Version Précédente (Épurée) | Nouvelle Version (Radar de Ligne) | +| :---: | :---: | +| Avant | Maintenant | + +> *Note : Le radar de ligne affiche désormais tous les arrêts intermédiaires, mais peut être désactivé dans les options pour retrouver le design minimaliste.* + ![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) ![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) From db947cd8bd0595901b4df26d01ec1412fae186cc Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 00:05:11 +0200 Subject: [PATCH 04/23] update 1 --- __init__.py | 112 +++++ __pycache__/__init__.cpython-314.pyc | Bin 0 -> 6572 bytes __pycache__/api.cpython-314.pyc | Bin 0 -> 8535 bytes __pycache__/calendar.cpython-314.pyc | Bin 0 -> 10122 bytes __pycache__/config_flow.cpython-314.pyc | Bin 0 -> 17179 bytes __pycache__/const.cpython-314.pyc | Bin 0 -> 1068 bytes __pycache__/coordinator.cpython-314.pyc | Bin 0 -> 9611 bytes __pycache__/diagnostics.cpython-314.pyc | Bin 0 -> 2247 bytes __pycache__/helpers.cpython-314.pyc | Bin 0 -> 2999 bytes __pycache__/sensor.cpython-314.pyc | Bin 0 -> 14235 bytes api.py | 119 +++++ calendar.py | 169 +++++++ config_flow.py | 305 +++++++++++++ const.py | 27 ++ coordinator.py | 183 ++++++++ diagnostics.py | 45 ++ helpers.py | 49 ++ manifest.json | 24 + sensor.py | 240 ++++++++++ strings.json | 85 ++++ tests/test_config_flow.py | 90 ++++ tests/test_coordinator.py | 78 ++++ translations/fr.json | 92 ++++ www/sncf-train-card.js | 568 ++++++++++++++++++++++++ 24 files changed, 2186 insertions(+) create mode 100644 __init__.py create mode 100644 __pycache__/__init__.cpython-314.pyc create mode 100644 __pycache__/api.cpython-314.pyc create mode 100644 __pycache__/calendar.cpython-314.pyc create mode 100644 __pycache__/config_flow.cpython-314.pyc create mode 100644 __pycache__/const.cpython-314.pyc create mode 100644 __pycache__/coordinator.cpython-314.pyc create mode 100644 __pycache__/diagnostics.cpython-314.pyc create mode 100644 __pycache__/helpers.cpython-314.pyc create mode 100644 __pycache__/sensor.cpython-314.pyc create mode 100644 api.py create mode 100644 calendar.py create mode 100644 config_flow.py create mode 100644 const.py create mode 100644 coordinator.py create mode 100644 diagnostics.py create mode 100644 helpers.py create mode 100644 manifest.json create mode 100644 sensor.py create mode 100644 strings.json create mode 100644 tests/test_config_flow.py create mode 100644 tests/test_coordinator.py create mode 100644 translations/fr.json create mode 100644 www/sncf-train-card.js diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..e74af9a --- /dev/null +++ b/__init__.py @@ -0,0 +1,112 @@ +"""The SNCF Train integration.""" + +from pathlib import Path +from types import MappingProxyType + +from homeassistant.config_entries import ConfigEntry, ConfigSubentry +from homeassistant.core import HomeAssistant +from homeassistant.helpers.entity_registry import Platform +from homeassistant.components.frontend import add_extra_js_url +from homeassistant.components.http import StaticPathConfig +from homeassistant.helpers import config_validation as cv + +from .const import ( + CONF_API_KEY, + CONF_ARRIVAL_NAME, + CONF_DEPARTURE_NAME, + CONF_FROM, + CONF_TIME_END, + CONF_TIME_START, + CONF_TO, + CONF_TRAIN_COUNT, + DOMAIN, +) +from .coordinator import SncfUpdateCoordinator + +type SncfDataConfigEntry = ConfigEntry[SncfUpdateCoordinator] + +PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.CALENDAR] +CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN) + +CARD_URL = "/sncf_trains/sncf-train-card.js" +CARD_FILE = Path(__file__).parent / "www" / "sncf-train-card.js" + + +async def async_setup(hass: HomeAssistant, config: dict) -> bool: + """Set up SNCF Trains component — register the Lovelace card.""" + await hass.http.async_register_static_paths( + [StaticPathConfig(CARD_URL, str(CARD_FILE), cache_headers=False)] + ) + add_extra_js_url(hass, CARD_URL) + return True + + +async def async_setup_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> bool: + """Set up SNCF Train as config entry.""" + coordinator = SncfUpdateCoordinator(hass, entry) + await coordinator.async_config_entry_first_refresh() + entry.runtime_data = coordinator + + entry.async_on_unload(entry.add_update_listener(async_reload_entry)) + await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) + + return True + + +async def async_unload_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> bool: + """Unload a config entry.""" + return await hass.config_entries.async_unload_platforms(entry, PLATFORMS) + + +async def async_reload_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> None: + """Reload entry if change option.""" + await hass.config_entries.async_reload(entry.entry_id) + + +async def async_migrate_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> bool: + """Migrate old config entries to move API key to options.""" + data = dict(entry.data) + options = dict(entry.options) + updated = False + + if CONF_API_KEY in options: + data.setdefault(CONF_API_KEY, options.pop(CONF_API_KEY)) + updated = True + + if updated: + time_start = options.pop(CONF_TIME_START) + time_end = options.pop(CONF_TIME_END) + train_count = options.pop(CONF_TRAIN_COUNT) + from_ = data.pop(CONF_FROM) + to_ = data.pop(CONF_TO) + dep_name = data.pop(CONF_DEPARTURE_NAME) + arr_name = data.pop(CONF_ARRIVAL_NAME) + subentry_data = MappingProxyType( + { + CONF_FROM: from_, + CONF_TO: to_, + CONF_DEPARTURE_NAME: dep_name, + CONF_ARRIVAL_NAME: arr_name, + CONF_TIME_START: time_start, + CONF_TIME_END: time_end, + CONF_TRAIN_COUNT: train_count, + } + ) + + hass.config_entries.async_update_entry( + entry, + data=data, + options=options, + unique_id="sncf_trains", + title="Trains SNCF", + ) + subentry = ConfigSubentry( + title=f"Trajet: {dep_name} → {arr_name} ({time_start} - {time_end})", + data=subentry_data, + subentry_id=f"{entry.entry_id}_MIGRATE", + subentry_type="train", + unique_id=f"{from_}_{to_}_{time_start}_{time_end}", + ) + hass.config_entries.async_add_subentry(entry, subentry) + + return True diff --git a/__pycache__/__init__.cpython-314.pyc b/__pycache__/__init__.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0b57dba9d495ecef31c48dc17ebc583847a57077 GIT binary patch literal 6572 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 LJQ5*LWdiwMe#Bv? literal 0 HcmV?d00001 diff --git a/__pycache__/api.cpython-314.pyc b/__pycache__/api.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3d213878ad9b614c670e3371e658ecc288a4da97 GIT binary patch literal 8535 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 F{6DK7We)%V literal 0 HcmV?d00001 diff --git a/__pycache__/config_flow.cpython-314.pyc b/__pycache__/config_flow.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fc9d6fb6e7f62e1f719c29539ce0dba89e399d70 GIT binary patch literal 17179 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 literal 0 HcmV?d00001 diff --git a/__pycache__/sensor.cpython-314.pyc b/__pycache__/sensor.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a1caa7304db7a3ba39f9623e30d3728f85cef463 GIT binary patch literal 14235 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 str: + """Encode the API key for Basic Auth.""" + token_str = f"{api_key}:" + return base64.b64encode(token_str.encode()).decode() + + +class SncfApiClient: + def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): + self._session = session + self._token = encode_token(api_key) + self._timeout = timeout + + async def fetch_departures( + self, stop_id: str, max_results: int = 20 #By default = 10 + ) -> Optional[List[dict]]: + if stop_id.startswith("stop_area:"): + url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" + elif stop_id.startswith("stop_point:"): + url = f"{API_BASE}/v1/coverage/sncf/stop_points/{stop_id}/departures" + else: + raise ValueError("stop_id must start with 'stop_area:' or 'stop_point:'") + + params_raw: dict[str, object] = { + "data_freshness": "realtime", + "count": max_results, + } + params: Mapping[str, str] = {k: str(v) for k, v in params_raw.items()} + + headers = {"Authorization": f"Basic {self._token}"} + + try: + async with self._session.get( + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), + ) as resp: + if resp.status == 401: + # vrai problème d'auth + raise ConfigEntryAuthFailed("Unauthorized: check your API key.") + if resp.status == 429: + # rate-limit => pas une auth failure + _LOGGER.warning("API rate limit (429) on %s with %s", url, params) + raise RuntimeError( + "SNCF API rate-limited (429)" + ) # sera géré comme non-critique + resp.raise_for_status() + data = await resp.json() + return data.get("departures", []) + except (ClientError, asyncio.TimeoutError) as err: + _LOGGER.error("Network error fetching departures from SNCF API: %s", err) + _LOGGER.debug("URL: %s, Params: %s", url, params) + return None + + async def fetch_journeys( + self, from_id: str, to_id: str, datetime_str: str, count: int = 20 + ) -> Optional[List[dict]]: + url = f"{API_BASE}/v1/coverage/sncf/journeys" + params_raw: dict[str, object] = { + "from": from_id, + "to": to_id, + "datetime": datetime_str, + "count": count, + "data_freshness": "realtime", + "datetime_represents": "departure", + } + params: Mapping[str, str] = {k: str(v) for k, v in params_raw.items()} + + headers = {"Authorization": f"Basic {self._token}"} + try: + async with self._session.get( + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), + ) as resp: + if resp.status == 401: + raise ConfigEntryAuthFailed("Unauthorized: check your API key.") + if resp.status == 429: + raise RuntimeError("Quota exceeded: 429 Too Many Requests.") + resp.raise_for_status() + data = await resp.json() + return data.get("journeys", []) + except (ClientError, asyncio.TimeoutError) as err: + _LOGGER.warning("Network error fetching journeys from SNCF API: %s", err) + return None + + async def search_stations(self, query: str) -> Optional[List[dict]]: + url = f"{API_BASE}/v1/coverage/sncf/places" + params_raw: dict[str, object] = { + "q": query, + "type[]": "stop_point", + } + params: Mapping[str, str] = {k: str(v) for k, v in params_raw.items()} + headers = {"Authorization": f"Basic {self._token}"} + try: + async with self._session.get( + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), + ) as resp: + resp.raise_for_status() + data = await resp.json() + return data.get("places", []) + except (ClientError, asyncio.TimeoutError) as err: + _LOGGER.error("Network error searching stations from SNCF API: %s", err) + return None \ No newline at end of file diff --git a/calendar.py b/calendar.py new file mode 100644 index 0000000..7a452ac --- /dev/null +++ b/calendar.py @@ -0,0 +1,169 @@ +"""Calendar for trains hours.""" + +import logging +from dataclasses import dataclass +from datetime import datetime, timedelta + +from homeassistant.components.calendar import CalendarEntity, CalendarEvent +from homeassistant.core import HomeAssistant, callback +from homeassistant.helpers.device_registry import DeviceEntryType +from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback +from homeassistant.helpers.update_coordinator import CoordinatorEntity + +from . import SncfDataConfigEntry +from .const import CONF_ARRIVAL_NAME, CONF_DEPARTURE_NAME, CONF_TRAIN_COUNT, DOMAIN +from .coordinator import SncfUpdateCoordinator +from .helpers import get_train_num, parse_datetime + +_LOGGER = logging.getLogger(__name__) + + +async def async_create_event(self, **kwargs): + raise NotImplementedError + + +async def async_delete_event(self, uid: str): + raise NotImplementedError + + +async def async_update_event(self, uid: str, event: CalendarEvent): + raise NotImplementedError + + +async def async_setup_entry( + hass: HomeAssistant, + entry: SncfDataConfigEntry, + async_add_entities: AddConfigEntryEntitiesCallback, +) -> None: + """Set up the Demo Calendar config entry.""" + coordinator: SncfUpdateCoordinator = entry.runtime_data + async_add_entities([SNCFCalendar(coordinator)], update_before_add=True) + + +@dataclass +class SNCFEventMixIn: + """Mixin for calendar event.""" + + has_delay: bool + delay: int + departure_date_time: datetime + arrival_date_time: datetime + train_num: int + + +@dataclass +class MyCalendarEvent(CalendarEvent, SNCFEventMixIn): + """A class to describe a calendar event.""" + + +class SNCFCalendar(CoordinatorEntity[SncfUpdateCoordinator], CalendarEntity): + """Representation of a Calendar element.""" + + _attr_name = "Trains" + + def __init__(self, coordinator: SncfUpdateCoordinator) -> None: + """Initialize demo calendar.""" + super().__init__(coordinator) + self._event: MyCalendarEvent | None = None + self._attr_unique_id = f"calendar_sncf_train_{coordinator.entry.entry_id}" + self._attr_device_info = { + "identifiers": {(DOMAIN, coordinator.entry.entry_id)}, + "name": "SNCF", + "manufacturer": "Master13011", + "model": "API", + "entry_type": DeviceEntryType.SERVICE, + } + + @property + def event(self) -> MyCalendarEvent | None: + """Return the current or next upcoming event.""" + if not self.available: + return None + + return self._event + + @callback + def _handle_coordinator_update(self) -> None: + """Handle updated data from the coordinator.""" + if self._fetch_journeys(): + self._event = min( + self._fetch_journeys(), + key=lambda x: abs(x.start.replace(tzinfo=None) - datetime.now()), + ) + if self._event: + self._attr_extra_state_attributes = { + "has_delay": self._event.has_delay, + "delay": self._event.delay, + "departure": self._event.departure_date_time, + "arrival": self._event.arrival_date_time, + "number": self._event.train_num, + } + self.async_write_ha_state() + + async def async_get_events( + self, _hass: HomeAssistant, start_date: datetime, end_date: datetime + ) -> list[CalendarEvent]: + """Return calendar events within a datetime range. + + This is only called when opening the calendar in the UI. + """ + if not self.available: + return [] + + return self._fetch_journeys() + + def _async_calculate_delay( + self, journey, dep_name: str, arr_name: str + ) -> tuple[bool, int, str]: + arr_dt = parse_datetime(journey.get("arrival_date_time", "")) + section = journey.get("sections", [{}])[0] + base_arr_dt = parse_datetime(section.get("base_arrival_date_time", "")) + + delay = ( + int((arr_dt - base_arr_dt).total_seconds() / 60) + if arr_dt and base_arr_dt + else 0 + ) + summary = ( + f"{dep_name} → {arr_name} - RETARD ({delay}min)" + if delay > 0 + else f"{dep_name} → {arr_name}" + ) + + return delay > 0, delay, summary + + def _fetch_journeys(self): + """Fetch journeys.""" + calendar_events = [] + for tid, journeys in self.coordinator.data.items(): + entry = self.coordinator.entry.subentries[tid] + dep_name = entry.data[CONF_DEPARTURE_NAME] + arr_name = entry.data[CONF_ARRIVAL_NAME] + display_count = min(len(journeys), entry.data[CONF_TRAIN_COUNT]) + _LOGGER.debug("%s -> %s", dep_name, arr_name) + for journey in journeys[:display_count]: + section = journey.get("sections", [{}])[0] + dep_dt = parse_datetime(journey.get("departure_date_time", "")) + arr_dt = parse_datetime(journey.get("arrival_date_time", "")) + has_delay, delay, summary = self._async_calculate_delay( + journey, dep_name, arr_name + ) + + if dep_dt and arr_dt: + calendar_events.append( + MyCalendarEvent( + summary=summary, + start=dep_dt, + end=dep_dt + timedelta(minutes=1), + description=f"Arrivée: {arr_dt}, retard: {delay} minutes", + location=str(dep_name), + uid=section.get("id"), + has_delay=has_delay, + delay=delay, + departure_date_time=dep_dt, + arrival_date_time=arr_dt, + train_num=int(get_train_num(journey)), + ) + ) + + return calendar_events diff --git a/config_flow.py b/config_flow.py new file mode 100644 index 0000000..2f2e1db --- /dev/null +++ b/config_flow.py @@ -0,0 +1,305 @@ +from typing import Any +import asyncio +from aiohttp import ClientError +import voluptuous as vol + +from homeassistant import config_entries +from homeassistant.config_entries import ( + ConfigEntry, + ConfigSubentryFlow, + OptionsFlow, + SubentryFlowResult, +) +from homeassistant.core import callback +from homeassistant.helpers.aiohttp_client import async_get_clientsession + +from .api import SncfApiClient +from .const import ( + CONF_API_KEY, + CONF_ARRIVAL_CITY, + CONF_ARRIVAL_NAME, + CONF_ARRIVAL_STATION, + CONF_DEPARTURE_CITY, + CONF_DEPARTURE_NAME, + CONF_DEPARTURE_STATION, + CONF_FROM, + CONF_TIME_END, + CONF_TIME_START, + CONF_TO, + CONF_TRAIN_COUNT, + CONF_UPDATE_INTERVAL, + CONF_OUTSIDE_INTERVAL, + CONF_SHOW_ROUTE_DETAILS, # NOUVEAU + DEFAULT_OUTSIDE_INTERVAL, + DEFAULT_TIME_END, + DEFAULT_TIME_START, + DEFAULT_TRAIN_COUNT, + DEFAULT_UPDATE_INTERVAL, + DEFAULT_SHOW_ROUTE_DETAILS, # NOUVEAU + DOMAIN, +) + + +class SncfTrainsConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): + """Handle a config flow.""" + + VERSION = 1 + MINOR_VERSION = 2 + + async def async_step_user(self, user_input: dict[str, Any] | None = None): + """Handle the initial step.""" + errors = {} + if user_input is not None: + session = async_get_clientsession(self.hass) + api = SncfApiClient(session, user_input[CONF_API_KEY]) + if not await self._validate_api_key(api): + errors["base"] = "invalid_api_key" + else: + if self.source == "user": + await self.async_set_unique_id("sncf_trains") + return self.async_create_entry(title="Trains SNCF", data=user_input) + else: + return self.async_update_reload_and_abort( + self._get_reconfigure_entry(), data=user_input + ) + + DATA_SCHEMA = vol.Schema({vol.Required(CONF_API_KEY): str}) + if self.source == "reconfigure": + entry = self._get_reconfigure_entry() + DATA_SCHEMA = self.add_suggested_values_to_schema(DATA_SCHEMA, entry.data) + + return self.async_show_form( + step_id="user", data_schema=DATA_SCHEMA, errors=errors + ) + + async def _validate_api_key(self, api: SncfApiClient): + """Check API Key.""" + try: + results = await api.search_stations("paris") + return bool(results) + except (ClientError, asyncio.TimeoutError): + return False + + @classmethod + @callback + def async_get_supported_subentry_types( + cls, config_entry: ConfigEntry + ) -> dict[str, type[ConfigSubentryFlow]]: + """Return subentries supported by this integration.""" + return { + "train": TrainSubentryFlowHandler, + } + + @staticmethod + @callback + def async_get_options_flow(config_entry: ConfigEntry): + """Return options.""" + return SncfTrainsOptionsFlowHandler() + + async_step_reconfigure = async_step_user + + +class SncfTrainsOptionsFlowHandler(OptionsFlow): + """Options flow.""" + + async def async_step_init(self, user_input: dict[str, Any] | None = None): + """Handle the initial options step.""" + if user_input is not None: + return self.async_create_entry(title="", data=user_input) + + entry = self.config_entry + + DATA_SCHEMA = vol.Schema( + { + vol.Required( + CONF_UPDATE_INTERVAL, + default=entry.options.get( + CONF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL + ), + ): int, + vol.Required( + CONF_OUTSIDE_INTERVAL, + default=entry.options.get( + CONF_OUTSIDE_INTERVAL, DEFAULT_OUTSIDE_INTERVAL + ), + ): int, + } + ) + + return self.async_show_form(step_id="init", data_schema=DATA_SCHEMA) + + +class TrainSubentryFlowHandler(ConfigSubentryFlow): + """Flow for managing trains subentries.""" + + api: SncfApiClient | None = None + departure_city: str | None = None + departure_station: str | None = None + arrival_city: str | None = None + arrival_station: str | None = None + departure_options: dict = {} + arrival_options: dict = {} + config_entry: ConfigEntry | None = None + + async def async_step_departure_city( + self, user_input: dict[str, Any] | None = None + ) -> SubentryFlowResult: + """Handle the departure city step.""" + errors = {} + if user_input is not None: + self.config_entry = self._get_entry() + api_key = self.config_entry.options.get( + "api_key" + ) or self.config_entry.data.get("api_key") + session = async_get_clientsession(self.hass) + self.api = SncfApiClient(session, api_key) + + self.departure_city = user_input[CONF_DEPARTURE_CITY] + stations = await self.api.search_stations(self.departure_city) + if not stations: + errors["base"] = "no_stations" + else: + self.departure_options = {s["id"]: s for s in stations} + return await self.async_step_departure_station() + return self.async_show_form( + step_id="departure_city", + data_schema=vol.Schema({vol.Required(CONF_DEPARTURE_CITY): str}), + errors=errors, + ) + + async def async_step_departure_station( + self, user_input: dict[str, Any] | None = None + ) -> SubentryFlowResult: + """Handle the departure station step.""" + if user_input is not None: + self.departure_station = user_input[CONF_DEPARTURE_STATION] + return await self.async_step_arrival_city() + options = { + k: f"{v['name']} ({k.split(':')[-1]})" + for k, v in self.departure_options.items() + } + return self.async_show_form( + step_id="departure_station", + data_schema=vol.Schema( + {vol.Required(CONF_DEPARTURE_STATION): vol.In(options)} + ), + ) + + async def async_step_arrival_city( + self, user_input: dict[str, Any] | None = None + ) -> SubentryFlowResult: + """Handle the arrival city step.""" + errors = {} + if user_input is not None: + self.arrival_city = user_input[CONF_ARRIVAL_CITY] + stations = await self.api.search_stations(self.arrival_city) + if not stations: + errors["base"] = "no_stations" + else: + self.arrival_options = {s["id"]: s for s in stations} + return await self.async_step_arrival_station() + return self.async_show_form( + step_id="arrival_city", + data_schema=vol.Schema({vol.Required(CONF_ARRIVAL_CITY): str}), + errors=errors, + ) + + async def async_step_arrival_station( + self, user_input: dict[str, Any] | None = None + ) -> SubentryFlowResult: + """Handle the arrival station step.""" + if user_input is not None: + self.arrival_station = user_input[CONF_ARRIVAL_STATION] + return await self.async_step_time_range() + options = { + k: f"{v['name']} ({k.split(':')[-1]})" + for k, v in self.arrival_options.items() + } + return self.async_show_form( + step_id="arrival_station", + data_schema=vol.Schema( + {vol.Required(CONF_ARRIVAL_STATION): vol.In(options)} + ), + ) + + async def async_step_time_range( + self, user_input: dict[str, Any] | None = None + ) -> SubentryFlowResult: + """Handle the time range step.""" + if user_input is not None: + dep_name = self.departure_options.get(self.departure_station, {}).get( + "name", self.departure_station + ) + arr_name = self.arrival_options.get(self.arrival_station, {}).get( + "name", self.arrival_station + ) + time_start = user_input[CONF_TIME_START] + time_end = user_input[CONF_TIME_END] + unique_id = f"{self.departure_station}_{self.arrival_station}_{time_start}_{time_end}" + + for subentry in self.config_entry.subentries.values(): + if unique_id == subentry.unique_id: + return self.async_abort(reason="already_configured_as_entry") + + return self.async_create_entry( + title=f"Trajet: {dep_name} → {arr_name} ({time_start} - {time_end})", + data={ + CONF_FROM: self.departure_station, + CONF_TO: self.arrival_station, + CONF_DEPARTURE_NAME: dep_name, + CONF_ARRIVAL_NAME: arr_name, + **user_input, + }, + unique_id=unique_id, + ) + + # NOUVEAU: On ajoute l'option booléenne + return self.async_show_form( + step_id="time_range", + data_schema=vol.Schema( + { + vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, + vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, + vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, + vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=DEFAULT_SHOW_ROUTE_DETAILS): bool, + } + ), + ) + + async def async_step_reconfigure( + self, user_input: dict[str, Any] | None = None + ) -> SubentryFlowResult: + """User flow to modify an existing entry.""" + config_subentry = self._get_reconfigure_subentry() + + if user_input is not None: + data = config_subentry.data.copy() + data.update(user_input) + + return self.async_update_and_abort( + self._get_entry(), + config_subentry, + data=data, + title=f"Trajet: {data[CONF_DEPARTURE_NAME]} → {data[CONF_ARRIVAL_NAME]} ({data[CONF_TIME_START]} - {data[CONF_TIME_END]})", + ) + + # NOUVEAU: On récupère l'ancienne valeur si elle existe + current_show_route = config_subentry.data.get(CONF_SHOW_ROUTE_DETAILS, DEFAULT_SHOW_ROUTE_DETAILS) + + DATA_SCHEMA = vol.Schema( + { + vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, + vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, + vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, + vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=current_show_route): bool, + } + ) + + return self.async_show_form( + step_id="reconfigure", + data_schema=self.add_suggested_values_to_schema( + DATA_SCHEMA, config_subentry.data + ), + ) + + async_step_user = async_step_departure_city \ No newline at end of file diff --git a/const.py b/const.py new file mode 100644 index 0000000..545f277 --- /dev/null +++ b/const.py @@ -0,0 +1,27 @@ +DOMAIN = "sncf_trains" + +CONF_API_KEY = "api_key" +CONF_UPDATE_INTERVAL = "update_interval" +CONF_OUTSIDE_INTERVAL = "outside_interval" + +DEFAULT_UPDATE_INTERVAL = 2 # minutes +DEFAULT_OUTSIDE_INTERVAL = 60 # minutes +DEFAULT_TRAIN_COUNT = 5 +DEFAULT_TIME_START = "07:00" +DEFAULT_TIME_END = "10:00" +DEFAULT_SHOW_ROUTE_DETAILS = False + +ATTRIBUTION = "Data provided by api.sncf.com" + +CONF_ARRIVAL_CITY = "arrival_city" +CONF_ARRIVAL_NAME = "arrival_name" +CONF_ARRIVAL_STATION = "arrival_station" +CONF_DEPARTURE_CITY = "departure_city" +CONF_DEPARTURE_NAME = "departure_name" +CONF_DEPARTURE_STATION = "departure_station" +CONF_FROM = "from" +CONF_TIME_END = "time_end" +CONF_TIME_START = "time_start" +CONF_TO = "to" +CONF_TRAIN_COUNT = "train_count" +CONF_SHOW_ROUTE_DETAILS = "show_route_details" # NOUVEAU \ No newline at end of file diff --git a/coordinator.py b/coordinator.py new file mode 100644 index 0000000..9297469 --- /dev/null +++ b/coordinator.py @@ -0,0 +1,183 @@ +"""Data Update Coordinator.""" + +import logging +from datetime import timedelta +from typing import Any +import asyncio +from aiohttp import ClientError +from homeassistant.config_entries import ConfigEntry +from homeassistant.core import HomeAssistant +from homeassistant.exceptions import ConfigEntryAuthFailed +from homeassistant.helpers.aiohttp_client import async_get_clientsession +from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed +from homeassistant.util import dt as dt_util + +from .api import SncfApiClient +from .const import ( + CONF_API_KEY, + CONF_FROM, + CONF_OUTSIDE_INTERVAL, + CONF_TIME_END, + CONF_TIME_START, + CONF_TO, + CONF_UPDATE_INTERVAL, + DEFAULT_OUTSIDE_INTERVAL, + DEFAULT_UPDATE_INTERVAL, +) + +_LOGGER = logging.getLogger(__name__) + + +class SncfUpdateCoordinator(DataUpdateCoordinator): + """Coordonnateur pour récupérer les données des trajets SNCF.""" + + def __init__(self, hass: HomeAssistant, entry: ConfigEntry): + """Initialisation.""" + self.entry = entry + self.api_client = None + self.update_interval_minutes = entry.options.get( + CONF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL + ) + self.outside_interval_minutes = entry.options.get( + CONF_OUTSIDE_INTERVAL, DEFAULT_OUTSIDE_INTERVAL + ) + + super().__init__( + hass, + _LOGGER, + name="SNCF Train Journeys", + update_interval=timedelta(minutes=self.update_interval_minutes), + ) + + async def _async_setup(self) -> None: + """Paramétrage du coordinateur.""" + api_key = self.entry.data[CONF_API_KEY] + + try: + session = async_get_clientsession(self.hass) + self.api_client = SncfApiClient(session, api_key) + + except Exception as err: + if "401" in str(err) or "403" in str(err): + raise ConfigEntryAuthFailed("Clé API invalide ou expirée") from err + _LOGGER.error("Erreur lors de la récupération des trajets SNCF: %s", err) + raise UpdateFailed(err) from err + + def _build_datetime_param(self, time_start, time_end) -> str: + """Construit le paramètre datetime pour l'API (ignore le passé).""" + now = dt_util.now() + h_start, m_start = map(int, time_start.split(":")) + h_end, m_end = map(int, time_end.split(":")) + + dt_start = now.replace(hour=h_start, minute=m_start, second=0, microsecond=0) + dt_end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) + + if now > dt_end: + # Si on a dépassé la fin de la plage aujourd'hui, on cherche pour demain + dt_start += timedelta(days=1) + elif now > dt_start: + # CORRECTION : Si on est PENDANT la plage horaire, on cherche à partir de MAINTENANT + # (On n'interroge plus les trains déjà passés !) + dt_start = now + + return dt_start.strftime("%Y%m%dT%H%M%S") + + def _adjust_update_interval(self, time_start, time_end) -> timedelta | None: + """Ajuste la fréquence selon la plage horaire, avec préfenêtre 1h et gestion minuit.""" + now = dt_util.now() + h_start, m_start = map(int, time_start.split(":")) + h_end, m_end = map(int, time_end.split(":")) + + start = now.replace(hour=h_start, minute=m_start, second=0, microsecond=0) + end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) + + if end <= start: + end += timedelta(days=1) + + pre_start = start - timedelta(hours=1) + + if now < pre_start: + start -= timedelta(days=1) + end -= timedelta(days=1) + pre_start -= timedelta(days=1) + + in_fast_mode = pre_start <= now <= end + + interval_minutes = ( + self.update_interval_minutes + if in_fast_mode + else self.outside_interval_minutes + ) + new_interval = timedelta(minutes=interval_minutes) + + if self.update_interval != new_interval: + _LOGGER.debug( + "Update interval: %s → %s minutes", + ( + None + if self.update_interval is None + else self.update_interval.total_seconds() / 60 + ), + interval_minutes, + ) + return new_interval + + return new_interval + + async def _async_update_data(self) -> dict[str, Any]: + """Récupère les données de l'API SNCF.""" + + if not self.entry.subentries: + _LOGGER.warning("Pas de subentries configurés") + return {} + + update_intervals = [] + trains = {} + max_retries = 3 # nombre de tentatives + retry_delay = 2 # secondes entre les tentatives + for subentry_id, entry in self.entry.subentries.items(): + _LOGGER.debug(entry.title) + departure = entry.data[CONF_FROM] + arrival = entry.data[CONF_TO] + time_start = entry.data[CONF_TIME_START] + time_end = entry.data[CONF_TIME_END] + + update_intervals.append(self._adjust_update_interval(time_start, time_end)) + datetime_str = self._build_datetime_param(time_start, time_end) + journeys = None + for attempt in range(1, max_retries + 1): + try: + journeys = await self.api_client.fetch_journeys( + departure, arrival, datetime_str, count=20 #By defaults = 10 + ) + if journeys is not None: + break # succès, on sort du retry + except (ClientError, asyncio.TimeoutError, RuntimeError) as err: + _LOGGER.warning( + "Erreur réseau lors de la récupération des trajets (tentative %d/%d) : %s", + attempt, + max_retries, + err, + ) + await asyncio.sleep(retry_delay) + + if journeys is None or not isinstance(journeys, list): + _LOGGER.error("Aucune donnée reçue de l'API SNCF pour le trajet ") + continue + + trains[subentry_id] = [ + j + for j in journeys + if isinstance(j, dict) and len(j.get("sections", [])) == 1 + ] + + if update_intervals: + new_interval = min(update_intervals) + if self.update_interval != new_interval: + self.update_interval = new_interval + _LOGGER.debug( + "Coordinator update interval set to %s minutes", + self.update_interval.total_seconds() / 60, + ) + + return trains \ No newline at end of file diff --git a/diagnostics.py b/diagnostics.py new file mode 100644 index 0000000..846d3f9 --- /dev/null +++ b/diagnostics.py @@ -0,0 +1,45 @@ +"""Diagnostics support for SNCF integration.""" + +from __future__ import annotations +from typing import Any +from homeassistant.core import HomeAssistant +from homeassistant.config_entries import ConfigEntry +from homeassistant.helpers.entity_registry import async_redact_data +from .const import DOMAIN, CONF_API_KEY + +TO_REDACT = {CONF_API_KEY} + + +async def async_get_config_entry_diagnostics( + hass: HomeAssistant, entry: ConfigEntry +) -> dict[str, Any]: + """Return diagnostics for a config entry.""" + data: dict[str, Any] = {} + + data["config_entry"] = { + "title": entry.title, + "data": async_redact_data(entry.data, TO_REDACT), + "options": async_redact_data(entry.options, TO_REDACT), + "entry_id": entry.entry_id, + "version": entry.version, + } + + coordinator = hass.data.get(DOMAIN, {}).get(entry.entry_id) + if coordinator: + data["coordinator"] = { + "departure": getattr(coordinator, "departure", None), + "arrival": getattr(coordinator, "arrival", None), + "time_start": getattr(coordinator, "time_start", None), + "time_end": getattr(coordinator, "time_end", None), + "update_interval": str(getattr(coordinator, "update_interval", None)), + "last_update_success": getattr(coordinator, "last_update_success", None), + "last_update_time": str( + getattr(coordinator, "last_update_success_time", None) + ), + "data_sample": ( + coordinator.data[:3] + if hasattr(coordinator, "data") and coordinator.data + else None + ), + } + return data diff --git a/helpers.py b/helpers.py new file mode 100644 index 0000000..a091505 --- /dev/null +++ b/helpers.py @@ -0,0 +1,49 @@ +"""Helpers for component.""" + +from datetime import datetime +from typing import Any + +from homeassistant.util import dt as dt_util + + +def parse_datetime(dt_str: str) -> datetime | None: + """Parse string to datetime.""" + if not dt_str: + return None + + try: + dt = dt_util.parse_datetime(dt_str) + return dt_util.as_local(dt) if dt else None + except (ValueError, TypeError): + return None + + +def format_time(dt_str: str) -> str: + """Format a Navitia datetime string as dd/mm/YYYY - HH:MM.""" + dt = parse_datetime(dt_str) + return dt.strftime("%d/%m/%Y - %H:%M") if dt else "N/A" + + +def get_train_num(journey: dict[str, Any]) -> str: + """Extract the commercial train number.""" + trip_num = journey.get("trip_short_name") + if trip_num: + return trip_num + + sections = journey.get("sections", []) + if sections: + infos = sections[0].get("display_informations", {}) + return infos.get("trip_short_name") or infos.get("num", "") + + return "" + + +def get_duration(journey: dict[str, Any]) -> int: + """Compute journey duration in minutes.""" + dep = parse_datetime(journey.get("departure_date_time", "")) + arr = parse_datetime(journey.get("arrival_date_time", "")) + + if dep and arr: + return int((arr - dep).total_seconds() / 60) + + return 0 diff --git a/manifest.json b/manifest.json new file mode 100644 index 0000000..cef92cd --- /dev/null +++ b/manifest.json @@ -0,0 +1,24 @@ +{ + "domain": "sncf_trains", + "name": "SNCF Trains", + "after_dependencies": [ + "http" + ], + "codeowners": [ + "@Master13011" + ], + "config_flow": true, + "dependencies": [ + "frontend" + ], + "documentation": "https://github.com/Master13011/SNCF-API-HA", + "integration_type": "service", + "iot_class": "cloud_polling", + "issue_tracker": "https://github.com/Master13011/SNCF-API-HA/issues", + "loggers": [ + "custom_components.sncf_trains" + ], + "requirements": [], + "single_config_entry": true, + "version": "1.3.0" +} diff --git a/sensor.py b/sensor.py new file mode 100644 index 0000000..3518a57 --- /dev/null +++ b/sensor.py @@ -0,0 +1,240 @@ +"""Sensors for trains hours.""" + +from typing import Any + +from homeassistant.components.sensor import SensorDeviceClass, SensorEntity +from homeassistant.core import HomeAssistant, callback +from homeassistant.helpers.device_registry import DeviceEntryType +from homeassistant.helpers.entity_platform import AddEntitiesCallback +from homeassistant.helpers.update_coordinator import CoordinatorEntity + +from . import SncfDataConfigEntry +from .const import ( + ATTRIBUTION, + CONF_ARRIVAL_NAME, + CONF_DEPARTURE_NAME, + CONF_FROM, + CONF_TO, + DOMAIN, +) +from .coordinator import SncfUpdateCoordinator +from .helpers import format_time, get_duration, get_train_num, parse_datetime + + +async def async_setup_entry( + hass: HomeAssistant, + entry: SncfDataConfigEntry, + async_add_entities: AddEntitiesCallback, +) -> None: + """Set up SNCF entities from a config entry.""" + + coordinator: SncfUpdateCoordinator = entry.runtime_data + + # Capteur global "Trajets" + async_add_entities([SncfJourneySensor(coordinator)], update_before_add=True) + + for subentry in entry.subentries.values(): + journeys = coordinator.data.get(subentry.subentry_id, []) + display_count = min(len(journeys), subentry.data.get("train_count", 0)) + sensors = [] + + # Capteurs individuels pour chaque train + for idx in range(display_count): + sensors.append(SncfTrainSensor(coordinator, subentry.subentry_id, idx)) + + # Capteur résumé ligne par ligne + sensors.append(SncfAllTrainsLineSensor(coordinator, subentry.subentry_id)) + + async_add_entities( + sensors, config_subentry_id=subentry.subentry_id, update_before_add=True + ) + + +class SncfJourneySensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): + """Main SNCF sensor: number of direct journeys & summary.""" + + _attr_has_entity_name = True + _attr_name = "Trajets" + _attr_icon = "mdi:train" + _attr_native_unit_of_measurement = "trajets" + + def __init__(self, coordinator: SncfUpdateCoordinator) -> None: + super().__init__(coordinator) + self._attr_unique_id = f"sncf_trains_{coordinator.entry.entry_id}" + self._attr_device_info = { + "identifiers": {(DOMAIN, coordinator.entry.entry_id)}, + "name": "SNCF", + "manufacturer": "Master13011", + "model": "API", + "entry_type": DeviceEntryType.SERVICE, + } + self._attr_native_value = len(coordinator.data) + + @callback + def _handle_coordinator_update(self) -> None: + self._attr_native_value = len(self.coordinator.data) + self.async_write_ha_state() + + +class SncfTrainSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): + """Sensor for an individual train.""" + + _attr_has_entity_name = True + _attr_icon = "mdi:train" + _attr_attribution = ATTRIBUTION + _attr_device_class = SensorDeviceClass.TIMESTAMP + + def __init__(self, coordinator, train_id: str, journey_id: int) -> None: + super().__init__(coordinator) + self.tid = train_id + self.jid = journey_id + entry = self.coordinator.entry.subentries[train_id] + journey = coordinator.data[train_id][journey_id] + section = journey.get("sections", [{}])[0] + departure_time = parse_datetime(section.get("base_departure_date_time", "")) + + self.departure = entry.data[CONF_FROM] + self.arrival = entry.data[CONF_TO] + + self._attr_name = f"Train {journey_id + 1}" + self._attr_unique_id = f"{entry.subentry_id}_{journey_id}" + self._attr_extra_state_attributes = self._extra_attributes(journey) + self._attr_device_info = { + "identifiers": {(DOMAIN, entry.subentry_id)}, + "name": f"SNCF {entry.data[CONF_DEPARTURE_NAME]} → {entry.data[CONF_ARRIVAL_NAME]}", + "manufacturer": "Master13011", + "model": "API", + "entry_type": DeviceEntryType.SERVICE, + } + self._attr_native_value = departure_time + + @callback + def _handle_coordinator_update(self) -> None: + journey = self.coordinator.data[self.tid][self.jid] + section = journey.get("sections", [{}])[0] + self._attr_native_value = parse_datetime(section.get("base_departure_date_time", "")) + self._attr_extra_state_attributes = self._extra_attributes(journey) + self.async_write_ha_state() + + def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: + section = journey.get("sections", [{}])[0] + + # 1. Calcul du retard + arr_dt = parse_datetime(journey.get("arrival_date_time", "")) + base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) + delay_arr = int((arr_dt - base_arr_dt).total_seconds() / 60) if arr_dt and base_arr_dt else 0 + + dep_dt = parse_datetime(journey.get("departure_date_time", "")) + base_dep_dt = parse_datetime(section.get("base_departure_date_time")) + delay_dep = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 + + delay = max(delay_arr, delay_dep) + + # 2. Détection d'annulation et Cause + status = journey.get("status", "") + section_status = section.get("status", "") + is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") + + # Extraction de la cause du retard/problème + delay_cause = section.get("cause", "") + if not delay_cause: + # On cherche dans les messages de perturbation globaux + messages = journey.get("messages", []) + if messages: + delay_cause = messages[0].get("text", "") + + # 3. Plan de vol structuré avec détection des modifications (added/deleted) + stops_schedule = [] + route_details = "" + show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) + + if show_routes: + stops_data = section.get("stop_date_times", []) + stops_list = [] + for stop in stops_data: + stop_name = stop.get("stop_point", {}).get("name", "") + # On récupère l'horaire réel + raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) + formatted_time = format_time(raw_time) if raw_time else "" + + # Détection du statut de l'arrêt + stop_effect = stop.get("stop_time_effect", "unchanged") # added, deleted, delayed, unchanged + + if stop_name and formatted_time: + prefix = "" + if stop_effect == "deleted": prefix = "[SUPPRIMÉ] " + if stop_effect == "added": prefix = "[NOUVEAU] " + + stops_list.append(f"{prefix}{stop_name} ({formatted_time})") + + just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time + stops_schedule.append({ + "name": stop_name, + "time": just_time, + "effect": stop_effect + }) + + route_details = " ➔ ".join(stops_list) + + return { + "departure_time": format_time(journey.get("departure_date_time", "")), + "arrival_time": format_time(journey.get("arrival_date_time", "")), + "base_departure_time": format_time(section.get("base_departure_date_time")), + "base_arrival_time": format_time(section.get("base_arrival_time")), + "delay_minutes": delay, + "delay_cause": delay_cause, + "duration_minutes": get_duration(journey), + "has_delay": delay > 0, + "canceled": is_canceled, + "route_details": route_details, + "stops_schedule": stops_schedule, + "direction": section.get("display_informations", {}).get("direction", ""), + "physical_mode": section.get("display_informations", {}).get("physical_mode", ""), + "train_num": get_train_num(journey), + } + + +class SncfAllTrainsLineSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): + """Sensor that aggregates all trains on a single line per attribute.""" + + _attr_has_entity_name = True + _attr_icon = "mdi:train" + _attr_attribution = ATTRIBUTION + + def __init__(self, coordinator: SncfUpdateCoordinator, train_id: str) -> None: + super().__init__(coordinator) + self.tid = train_id + self._attr_name = "Tous les trains (ligne)" + self._attr_unique_id = f"{train_id}_all_trains_line" + self._attr_device_info = { + "identifiers": {(DOMAIN, train_id)}, + "name": "SNCF", + "manufacturer": "Master13011", + "model": "API", + "entry_type": DeviceEntryType.SERVICE, + } + + @callback + def _handle_coordinator_update(self) -> None: + journeys = self.coordinator.data.get(self.tid, []) + departure_times = [] + delays = [] + overall_has_delay = False + + for journey in journeys: + section = journey.get("sections", [{}])[0] + dep_dt = parse_datetime(journey.get("departure_date_time", "")) + base_dep_dt = parse_datetime(section.get("base_departure_date_time")) + delay = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 + + departure_times.append(format_time(journey.get("departure_date_time", ""))) + delays.append(str(delay)) + if delay > 0: overall_has_delay = True + + self._attr_extra_state_attributes = { + "departure_time": "; ".join(departure_times), + "delay_minutes": "; ".join(delays), + "has_delay": overall_has_delay, + } + self._attr_native_value = len(journeys) + self.async_write_ha_state() \ No newline at end of file diff --git a/strings.json b/strings.json new file mode 100644 index 0000000..fe26c0f --- /dev/null +++ b/strings.json @@ -0,0 +1,85 @@ +{ + "config": { + "step": { + "user": { + "title": "Please set SNCF API Key" + } + }, + "error": { + "invalid_api_key": "API Key not found. Please retry." + }, + "abort": { + "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]" + } + }, + "options": { + "step": { + "init": { + "title": "Options", + "description": "Set updated and outside intervals", + "data": { + "update_interval": "Update interval (minutes)", + "outside_interval": "Outside interval (minutes)" + } + } + } + }, + "config_subentries": { + "train": { + "initiate_flow": { + "user": "Add journey", + "reconfigure": "Reconfigure a journey" + }, + "entry_type": "Train", + "step": { + "departure_city": { + "title": "Select departure city", + "data": { + "departure_city": "City name" + } + }, + "departure_station": { + "title": "Select departure station", + "data": { + "departure_station": "Station name" + } + }, + "arrival_city": { + "title": "Select arrival city", + "data": { + "departure_city": "City name" + } + }, + "arrival_station": { + "title": "Select arrival station", + "data": { + "departure_station": "Station name" + } + }, + "time_range": { + "title": "Range hours", + "data": { + "time_start": "Time start", + "time_end": "Time end", + "train_count": "Trains count" + } + }, + "reconfigure": { + "title": "Range hours", + "data": { + "time_start": "Time start", + "time_end": "Time end", + "train_count": "Trains count" + } + } + }, + "error": { + "no_stations": "No station for this city" + }, + "abort": { + "already_configured_as_entry": "Already train is configured", + "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]" + } + } + } +} \ No newline at end of file diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py new file mode 100644 index 0000000..43578bf --- /dev/null +++ b/tests/test_config_flow.py @@ -0,0 +1,90 @@ +import pytest +from unittest.mock import AsyncMock, patch + +from homeassistant import config_entries +from custom_components.sncf_trains.const import DOMAIN, CONF_API_KEY + + +@pytest.mark.asyncio +async def test_config_flow_happy_path(hass): + """Test config flow with valid API key and stations.""" + mock_api = AsyncMock() + mock_api.search_stations = AsyncMock( + side_effect=[ + [{"id": "stop_area:dep", "name": "Paris Gare de Lyon"}], # departure city + [{"id": "stop_area:arr", "name": "Lyon Part Dieu"}], # arrival city + ] + ) + + with patch( + "custom_components.sncf_trains.config_flow.SncfApiClient", return_value=mock_api + ): + # Step 1: saisie API key + result = await hass.config_entries.flow.async_init( + DOMAIN, context={"source": config_entries.SOURCE_USER} + ) + assert result["type"] == "form" + assert result["step_id"] == "user" + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {CONF_API_KEY: "valid_key"} + ) + assert result["type"] == "form" + assert result["step_id"] == "departure_city" + + # Step 2: ville départ + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {"departure_city": "Paris"} + ) + assert result["type"] == "form" + assert result["step_id"] == "departure_station" + + # Step 3: station départ + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {"departure_station": "stop_area:dep"} + ) + assert result["type"] == "form" + assert result["step_id"] == "arrival_city" + + # Step 4: ville arrivée + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {"arrival_city": "Lyon"} + ) + assert result["type"] == "form" + assert result["step_id"] == "arrival_station" + + # Step 5: station arrivée + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {"arrival_station": "stop_area:arr"} + ) + assert result["type"] == "form" + assert result["step_id"] == "time_range" + + # Step 6: plage horaire + finalisation + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {"time_start": "07:00", "time_end": "10:00"} + ) + assert result["type"] == "create_entry" + assert result["title"] == "SNCF: Paris Gare de Lyon → Lyon Part Dieu" + assert result["data"]["departure_name"] == "Paris Gare de Lyon" + + +@pytest.mark.asyncio +async def test_config_flow_invalid_api_key(hass): + """Test config flow with invalid API key.""" + mock_api = AsyncMock() + mock_api.search_stations = AsyncMock(return_value=None) + + with patch( + "custom_components.sncf_trains.config_flow.SncfApiClient", return_value=mock_api + ): + result = await hass.config_entries.flow.async_init( + DOMAIN, context={"source": config_entries.SOURCE_USER} + ) + + result = await hass.config_entries.flow.async_configure( + result["flow_id"], {CONF_API_KEY: "bad_key"} + ) + + assert result["type"] == "form" + assert result["errors"]["base"] == "invalid_api_key" diff --git a/tests/test_coordinator.py b/tests/test_coordinator.py new file mode 100644 index 0000000..1e233f1 --- /dev/null +++ b/tests/test_coordinator.py @@ -0,0 +1,78 @@ +import pytest +from unittest.mock import AsyncMock +from datetime import timedelta +from homeassistant.helpers.update_coordinator import UpdateFailed + +from custom_components.sncf_trains.coordinator import SncfUpdateCoordinator + + +@pytest.mark.asyncio +async def test_coordinator_success(hass): + """Test coordinator fetches journeys successfully.""" + mock_api = AsyncMock() + mock_api.fetch_journeys = AsyncMock(return_value=[{"id": "j1"}]) + + coordinator = SncfUpdateCoordinator( + hass=hass, + api_client=mock_api, + departure="stop_area:dep", + arrival="stop_area:arr", + time_start="06:00", + time_end="09:00", + update_interval=5, + outside_interval=30, + ) + + data = await coordinator._async_update_data() + assert data == [{"id": "j1"}] + mock_api.fetch_journeys.assert_called_once() + assert isinstance(coordinator.update_interval, timedelta) + + +@pytest.mark.asyncio +async def test_coordinator_api_failure(hass): + """Test coordinator raises UpdateFailed when API fails.""" + mock_api = AsyncMock() + mock_api.fetch_journeys = AsyncMock(side_effect=Exception("API error")) + + coordinator = SncfUpdateCoordinator( + hass=hass, + api_client=mock_api, + departure="stop_area:dep", + arrival="stop_area:arr", + time_start="06:00", + time_end="09:00", + ) + + with pytest.raises(UpdateFailed): + await coordinator._async_update_data() + + +@pytest.mark.asyncio +async def test_coordinator_adjust_interval(hass): + """Test that update interval adjusts inside and outside time range.""" + + mock_api = AsyncMock() + mock_api.fetch_journeys = AsyncMock(return_value=[{"id": "j1"}]) + + coordinator = SncfUpdateCoordinator( + hass=hass, + api_client=mock_api, + departure="stop_area:dep", + arrival="stop_area:arr", + time_start="00:00", + time_end="23:59", + update_interval=5, + outside_interval=30, + ) + + # Forcing inside time range (always true here) + await coordinator._async_update_data() + assert coordinator.update_interval == timedelta(minutes=5) + + # Fake outside range by setting opposite times + coordinator.time_start = "23:59" + coordinator.time_end = "00:00" + + await coordinator._async_update_data() + assert coordinator.update_interval == timedelta(minutes=30) diff --git a/translations/fr.json b/translations/fr.json new file mode 100644 index 0000000..9b73d42 --- /dev/null +++ b/translations/fr.json @@ -0,0 +1,92 @@ +{ + "title": "Trains SNCF", + "config": { + "step": { + "user": { + "title": "Clé API SNCF", + "description": "Entrez votre clé API SNCF pour commencer.", + "data": { + "api_key": "Clé API" + } + } + }, + "error": { + "invalid_api_key": "Clé API invalide. Veuillez vérifier et réessayer." + }, + "abort": { + "reconfigure_successful": "Compose reconfiguré avec succès" + } + }, + "options": { + "step": { + "init": { + "title": "Options", + "description": "Définissez les intervalles de mise à jour.", + "data": { + "update_interval": "Intervalle pendant la plage horaire (minutes)", + "outside_interval": "Intervalle en dehors de la plage horaire (minutes)" + } + } + } + }, + "config_subentries": { + "train": { + "initiate_flow": { + "user": "Ajouter un trajet", + "reconfigure": "Reconfigurer un trajet" + }, + "entry_type": "Train", + "step": { + "departure_city": { + "title": "Choisissez la ville de départ", + "data": { + "departure_city": "Nom de la ville" + } + }, + "departure_station": { + "title": "Choisissez la gare de départ", + "data": { + "departure_station": "Nom de la gare" + } + }, + "arrival_city": { + "title": "Choisissez la ville d'arrivée", + "data": { + "arrival_city": "Nom de la ville" + } + }, + "arrival_station": { + "title": "Choisissez la gare d'arrivée", + "data": { + "arrival_station": "Nom de la gare" + } + }, + "time_range": { + "title": "Choisissez la plage horaire", + "data": { + "time_start": "Heure de départ", + "time_end": "Heure d'arrivé", + "train_count": "Nombre de trains", + "show_route_details": "Afficher les arrêts intermédiaires" + } + }, + "reconfigure": { + "title": "Choisissez la plage horaire", + "data": { + "time_start": "Heure de départ", + "time_end": "Heure d'arrivé", + "train_count": "Nombre de trains", + "show_route_details": "Afficher les arrêts intermédiaires" + } + } + }, + "error": { + "no_stations": "Aucune gare trouvée pour cette ville." + }, + "abort": { + "already_configured_as_entry": "Ce trajet est déjà configuré.", + "reconfigure_successful": "Trajet reconfiguré avec succès" + } + } + } +} \ No newline at end of file diff --git a/www/sncf-train-card.js b/www/sncf-train-card.js new file mode 100644 index 0000000..cf4ad81 --- /dev/null +++ b/www/sncf-train-card.js @@ -0,0 +1,568 @@ +// Ajouter au registre des cartes personnalisées +window.customCards = window.customCards || []; +window.customCards.push({ + type: 'sncf-train-card', + name: 'SNCF Train Card', + preview: true, + description: 'Carte personnalisée animée pour afficher les trains SNCF avec radar de ligne.' +}); + +// --- CLASSE DE L'ÉDITEUR VISUEL --- +class SncfTrainCardEditor extends HTMLElement { + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + } + + setConfig(config) { + this._config = { ...config }; + this.render(); + } + + render() { + if (!this._config) return; + + this.shadowRoot.innerHTML = ` +
+
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
+
+ + + `; + + // Écouteurs d'événements pour mettre à jour la config en direct + this.shadowRoot.querySelectorAll('input').forEach(input => { + input.addEventListener('change', this.valueChanged.bind(this)); + if (input.type === 'text' || input.type === 'number') { + input.addEventListener('input', this.valueChanged.bind(this)); // Pour mise à jour fluide + } + }); + } + + valueChanged(ev) { + if (!this._config || !this.hass) return; + const target = ev.target; + let value = target.type === 'checkbox' ? target.checked : target.value; + + if (target.type === 'number') { + value = Number(value); + } + + if (this._config[target.id] === value) return; + + this._config = { ...this._config, [target.id]: value }; + + const event = new CustomEvent('config-changed', { + detail: { config: this._config }, + bubbles: true, + composed: true, + }); + this.dispatchEvent(event); + } +} + +customElements.define('sncf-train-card-editor', SncfTrainCardEditor); + + +// --- CLASSE DE LA CARTE PRINCIPALE --- +class SncfTrainCard extends HTMLElement { + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + this.updateInterval = null; + this.lastTrainSignature = null; + this._lastRenderTime = 0; + } + + // Lier l'éditeur à la carte + static getConfigElement() { + return document.createElement("sncf-train-card-editor"); + } + + static getStubConfig() { + return { + title: "Trains SNCF", + device_id: "", + train_lines: 3, + animation_duration: 30, + show_route_details: true + }; + } + + setConfig(config) { + if (!config.device_id) { + throw new Error('Vous devez définir le device_id'); + } + + const previousDeviceId = this.config ? this.config.device_id : null; + const deviceIdChanged = previousDeviceId && previousDeviceId !== config.device_id; + + this.config = { + device_id: config.device_id, + train_lines: config.train_lines !== undefined ? config.train_lines : 3, + title: config.title || 'Trains SNCF', + train_emoji: config.train_emoji || '🚅', + train_emoji_axial_symmetry: config.train_emoji_axial_symmetry !== false, + train_station_emoji: config.train_station_emoji || '🚉', + animation_duration: config.animation_duration || 30, + update_interval: config.update_interval || 30000, + show_route_details: config.show_route_details !== undefined ? config.show_route_details : false, + ...config + }; + + if (deviceIdChanged) { + this.stopUpdateTimer(); + this.startUpdateTimer(); + } + + this.render(); + } + + set hass(hass) { + const previousHass = this._hass; + this._hass = hass; + + if (this.config && previousHass) { + this.checkForTrainUpdates(previousHass, hass); + } else { + this.render(); + } + } + + async checkForTrainUpdates(previousHass, currentHass) { + try { + const currentTrains = await this.getTrainEntities(); + const currentSignature = this.createTrainSignature(currentTrains); + + if (currentSignature !== this.lastTrainSignature) { + this.lastTrainSignature = currentSignature; + this.render(); + } + } catch (error) { + this.render(); + } + } + + createTrainSignature(trains) { + return trains.map(train => + `${train.entity_id}:${train.attributes.departure_time}:${train.attributes.delay_minutes || 0}:${train.attributes.has_delay || false}` + ).join('|'); + } + + connectedCallback() { + this.startUpdateTimer(); + } + + disconnectedCallback() { + this.stopUpdateTimer(); + } + + startUpdateTimer() { + this.stopUpdateTimer(); + this.updateInterval = setInterval(async () => { + if (this._hass) { + this._lastRenderTime = 0; + await this.render(); + } + }, this.config.update_interval); + } + + stopUpdateTimer() { + if (this.updateInterval) { + clearInterval(this.updateInterval); + this.updateInterval = null; + } + } + + async getTrainEntities() { + if (!this._hass) return []; + + try { + const allEntityRegistry = await this._hass.callWS({ + type: 'config/entity_registry/list' + }); + + const deviceEntities = allEntityRegistry.filter(entityInfo => + entityInfo.device_id === this.config.device_id + ); + + if (!deviceEntities || deviceEntities.length === 0) return []; + + const trainEntities = deviceEntities + .filter(entityInfo => entityInfo.entity_id.includes('train')) + .map(entityInfo => this._hass.states[entityInfo.entity_id]) + .filter(entity => entity && entity.attributes && entity.attributes.departure_time); + + const currentTime = new Date(); + const upcomingTrains = trainEntities.filter(entity => { + const departureTime = this.parseTime(entity.attributes.departure_time); + return departureTime >= currentTime; + }); + + return upcomingTrains + .sort((a, b) => this.parseTime(a.attributes.departure_time) - this.parseTime(b.attributes.departure_time)) + .slice(0, this.config.train_lines); + + } catch (error) { + return []; + } + } + + parseTime(departureTime) { + if (!departureTime) return new Date(0); + + if (departureTime.includes('/') && departureTime.includes(' - ')) { + const parts = departureTime.split(' - '); + if (parts.length === 2) { + const dateComponents = parts[0].split('/'); + if (dateComponents.length === 3) { + const day = parseInt(dateComponents[0]); + const month = parseInt(dateComponents[1]) - 1; + const year = parseInt(dateComponents[2]); + + const timeComponents = parts[1].split(':'); + if (timeComponents.length === 2) { + const hour = parseInt(timeComponents[0]); + const minute = parseInt(timeComponents[1]); + return new Date(year, month, day, hour, minute); + } + } + } + } + return new Date(departureTime); + } + + calculateTrainPosition(departureTime, currentTime) { + if (!departureTime) return -10; + const departure = this.parseTime(departureTime); + if (isNaN(departure.getTime())) return -10; + + const now = currentTime || new Date(); + const diffMinutes = (departure - now) / (1000 * 60); + const maxMinutes = this.config.animation_duration; + + if (diffMinutes > maxMinutes) return -10; + if (diffMinutes <= 0) return 100; + + return ((maxMinutes - diffMinutes) / maxMinutes) * 100; + } + + formatTime(timeString) { + if (!timeString) return 'N/A'; + const time = this.parseTime(timeString); + if (isNaN(time.getTime())) return 'Format invalide'; + return time.toLocaleTimeString('fr-FR', { hour: '2-digit', minute: '2-digit' }); + } + + calculateRealArrivalTime(departureTime, delayMinutes) { + if (!departureTime || !delayMinutes || delayMinutes === 0) return null; + const originalTime = this.parseTime(departureTime); + const realTime = new Date(originalTime.getTime() + (delayMinutes * 60000)); + return realTime.toLocaleTimeString('fr-FR', { hour: '2-digit', minute: '2-digit' }); + } + + getTrainColor(delayMinutes, hasDelay) { + if (!hasDelay || delayMinutes === 0) return '#4caf50'; + return '#f44336'; + } + + async render() { + if (!this._hass || !this.config) return; + + const now = Date.now(); + if (now - this._lastRenderTime < 1000) return; + this._lastRenderTime = now; + + const trains = await this.getTrainEntities(); + + if (trains.length === 0) { + this.shadowRoot.innerHTML = ` +
Aucun train trouvé pour ce device_id.
 + `; + return; + } + + const currentTime = new Date(); + const trainLinesHTML = this.renderTrainLines(trains, currentTime); + + this.shadowRoot.innerHTML = ` + + + +
+
${this.config.title}
+ ${trainLinesHTML} +
+ + `; + } + + renderTrainLines(trains, currentTime) { + return trains.map((train) => { + const position = this.calculateTrainPosition(train.attributes.departure_time, currentTime); + const delayMinutes = train.attributes.delay_minutes || 0; + const hasDelay = train.attributes.has_delay || false; + const trainColor = this.getTrainColor(delayMinutes, hasDelay); + const formattedTime = this.formatTime(train.attributes.departure_time); + const realArrivalTime = this.calculateRealArrivalTime(train.attributes.departure_time, delayMinutes); + + // Extraction du plan de vol (tableau) + const stopsSchedule = train.attributes.stops_schedule || []; + + // Construction de la barre graphique "Métro" + let timelineHTML = ''; + if (this.config.show_route_details && stopsSchedule.length > 0) { + const stopsHTML = stopsSchedule.map(stop => ` +
+
+
${stop.time}
+
${stop.name}
+
+ `).join(''); + + timelineHTML = ` +
+
+
+ ${stopsHTML} +
+
+ `; + } + + return ` +
+
+
+ ${position >= 0 && position <= 100 ? ` +
+ ${this.config.train_emoji} +
+ ` : ''} +
+ +
+
${this.config.train_station_emoji}
+
+
+ ${hasDelay && realArrivalTime ? ` +
${formattedTime}
+
${realArrivalTime}
+ ` : `
${formattedTime}
`} +
+
+ ${hasDelay ? `+${delayMinutes}min` : 'À l\'heure'} +
+
+
+
+ + ${timelineHTML} + +
+ `; + }).join(''); + } +} + +customElements.define('sncf-train-card', SncfTrainCard); \ No newline at end of file From 8575c75cbe24cd3370c4f24e9725a84715aa2e0f Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 00:08:20 +0200 Subject: [PATCH 05/23] alpha --- .github/workflows/lint.yml | 42 ------------------- .github/workflows/release.yaml | 35 ---------------- .github/workflows/validate-for-hacs.yml | 19 --------- .github/workflows/validate-with-hassfest.yml | 16 ------- __pycache__/__init__.cpython-314.pyc | Bin 6572 -> 0 bytes __pycache__/api.cpython-314.pyc | Bin 8535 -> 0 bytes __pycache__/calendar.cpython-314.pyc | Bin 10122 -> 0 bytes __pycache__/config_flow.cpython-314.pyc | Bin 17179 -> 0 bytes __pycache__/const.cpython-314.pyc | Bin 1068 -> 0 bytes __pycache__/coordinator.cpython-314.pyc | Bin 9611 -> 0 bytes __pycache__/diagnostics.cpython-314.pyc | Bin 2247 -> 0 bytes __pycache__/helpers.cpython-314.pyc | Bin 2999 -> 0 bytes __pycache__/sensor.cpython-314.pyc | Bin 14235 -> 0 bytes 13 files changed, 112 deletions(-) delete mode 100644 .github/workflows/lint.yml delete mode 100644 .github/workflows/release.yaml delete mode 100644 .github/workflows/validate-for-hacs.yml delete mode 100644 .github/workflows/validate-with-hassfest.yml delete mode 100644 __pycache__/__init__.cpython-314.pyc delete mode 100644 __pycache__/api.cpython-314.pyc delete mode 100644 __pycache__/calendar.cpython-314.pyc delete mode 100644 __pycache__/config_flow.cpython-314.pyc delete mode 100644 __pycache__/const.cpython-314.pyc delete mode 100644 __pycache__/coordinator.cpython-314.pyc delete mode 100644 __pycache__/diagnostics.cpython-314.pyc delete mode 100644 __pycache__/helpers.cpython-314.pyc delete mode 100644 __pycache__/sensor.cpython-314.pyc diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index e6f56e6..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: "Lint" - -on: - push: - branches: - - "main" - pull_request: - branches: - - "main" - -jobs: - ruff: - name: "Ruff" - runs-on: "ubuntu-latest" - steps: - - name: "Checkout the repository" - uses: "actions/checkout@v6.0.1" - - - name: "Set up Python" - uses: actions/setup-python@v6.1.0 - with: - python-version: "3.13" - cache: "pip" - - - name: "Install requirements" - run: python3 -m pip install -r requirements.txt types-pytz - - - name: "Lint" - run: python3 -m ruff check . - - - name: "Format" - run: python3 -m ruff format . - - - name: "Run Black" - run: black --check . - - - name: "Run Mypy" - run: | - mypy . || echo "Mypy finished with errors but continuing" - - - name: "Pylint" - run: pylint custom_components || true diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 2da9b2f..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: "Release" - -on: - release: - types: - - "published" - -permissions: {} - -jobs: - release: - name: "Release" - runs-on: "ubuntu-latest" - permissions: - contents: write - steps: - - name: "Checkout the repository" - uses: "actions/checkout@v6.0.1" - - - name: "Adjust version number" - shell: "bash" - run: | - yq -i -o json '.version="${{ github.event.release.tag_name }}"' \ - "${{ github.workspace }}/custom_components/sncf_trains/manifest.json" - - - name: "ZIP the integration directory" - shell: "bash" - run: | - cd "${{ github.workspace }}/custom_components/sncf_trains" - zip sncf_trains_ha.zip -r ./ - - - name: "Upload the ZIP file to the release" - uses: softprops/action-gh-release@v2.5.0 - with: - files: ${{ github.workspace }}/custom_components/sncf_trains/sncf_trains_ha.zip diff --git a/.github/workflows/validate-for-hacs.yml b/.github/workflows/validate-for-hacs.yml deleted file mode 100644 index 4d9e6d6..0000000 --- a/.github/workflows/validate-for-hacs.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Validate for HACS - -on: - push: - branches: - - "main" - pull_request: - branches: - - "main" - -jobs: - validate-hacs: - runs-on: "ubuntu-latest" - steps: - - uses: "actions/checkout@v6" - - name: HACS validation - uses: "hacs/action@main" - with: - category: "integration" diff --git a/.github/workflows/validate-with-hassfest.yml b/.github/workflows/validate-with-hassfest.yml deleted file mode 100644 index 2770d1a..0000000 --- a/.github/workflows/validate-with-hassfest.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Validate with hassfest - -on: - push: - branches: - - "main" - pull_request: - branches: - - "main" - -jobs: - validate-hassfest: - runs-on: "ubuntu-latest" - steps: - - uses: "actions/checkout@v6" - - uses: "home-assistant/actions/hassfest@master" diff --git a/__pycache__/__init__.cpython-314.pyc b/__pycache__/__init__.cpython-314.pyc deleted file mode 100644 index 0b57dba9d495ecef31c48dc17ebc583847a57077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6572 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 LJQ5*LWdiwMe#Bv? diff --git a/__pycache__/api.cpython-314.pyc b/__pycache__/api.cpython-314.pyc deleted file mode 100644 index 3d213878ad9b614c670e3371e658ecc288a4da97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8535 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 F{6DK7We)%V diff --git a/__pycache__/config_flow.cpython-314.pyc b/__pycache__/config_flow.cpython-314.pyc deleted file mode 100644 index fc9d6fb6e7f62e1f719c29539ce0dba89e399d70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17179 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 diff --git a/__pycache__/sensor.cpython-314.pyc b/__pycache__/sensor.cpython-314.pyc deleted file mode 100644 index a1caa7304db7a3ba39f9623e30d3728f85cef463..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14235 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 Date: Tue, 21 Apr 2026 00:47:39 +0200 Subject: [PATCH 06/23] alpha01 --- LICENSE | 661 ----------------------------------------- README.md | 237 --------------- __init__.py | 112 ------- api.py | 119 -------- calendar.py | 169 ----------- config_flow.py | 305 ------------------- const.py | 27 -- coordinator.py | 183 ------------ diagnostics.py | 45 --- exemple_automatisation | 164 ---------- exemple_dashboard | 44 --- hacs.json | 9 - helpers.py | 49 --- manifest.json | 24 -- requirements.txt | 9 - sensor.py | 240 --------------- strings.json | 85 ------ 17 files changed, 2482 deletions(-) delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 __init__.py delete mode 100644 api.py delete mode 100644 calendar.py delete mode 100644 config_flow.py delete mode 100644 const.py delete mode 100644 coordinator.py delete mode 100644 diagnostics.py delete mode 100644 exemple_automatisation delete mode 100644 exemple_dashboard delete mode 100644 hacs.json delete mode 100644 helpers.py delete mode 100644 manifest.json delete mode 100644 requirements.txt delete mode 100644 sensor.py delete mode 100644 strings.json diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0ad25db..0000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/README.md b/README.md deleted file mode 100644 index 6ccee08..0000000 --- a/README.md +++ /dev/null @@ -1,237 +0,0 @@ -# ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT - -> [!CAUTION] -> **Ce projet est actuellement en phase de développement intensif.** -> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version du `sensor.py` et de la `sncf-train-card.js` pour une compatibilité totale. - ---- - -### 🚀 Dernières mises à jour ferroviaires (20 Avril 2026) - -Le système a été lourdement modifier : - -* **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601) pour un affichage synchronisé avec le temps réel de Home Assistant. -* **📡 Radar de Ligne Avancé :** Intégration d'un "thermomètre de ligne" dynamique affichant tous les arrêts intermédiaires directement sur la carte. **⚠️ Ce paramètre est désactivé par défaut pour alléger l'affichage.** -* **🔍 Analyse des Perturbations :** * Extraction de la **cause officielle** du retard (ex: intervention, panne matériel). - * **[BÊTA]** Détection des **arrêts supprimés** (`deleted`) ou **exceptionnels** (`added`). - > *Note : Cette fonctionnalité est en cours de validation technique. N'ayant pas encore subi de suppression réelle durant les tests, le rendu visuel est basé sur les spécifications de l'API SNCF et attend une confirmation "en conditions réelles".* - ---- - -### 📸 Aperçu Visuel - -| Version Précédente (Épurée) | Nouvelle Version (Radar de Ligne) | -| :---: | :---: | -| Avant | Maintenant | - -> *Note : Le radar de ligne affiche désormais tous les arrêts intermédiaires, mais peut être désactivé dans les options pour retrouver le design minimaliste.* - - -![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) -![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) -![Licence MIT](https://img.shields.io/badge/Licence-MIT-green) - -Suivez les horaires des trains SNCF entre deux gares dans Home Assistant, grâce à l’API officielle [SNCF](https://www.digital.sncf.com/startup/api). -Départ / arrivée, retards, durée, mode (TER…), tout est intégré dans une interface configurable et traduite. - -> ⚠️ Ne prend pas en compte les trains supprimés. - ---- - -## 📦 Installation - -### 1. Via HACS (recommandé) - -> Nécessite HACS installé dans Home Assistant - -1. Aller dans **HACS** -2. Chercher **SNCF Trains** -3. Installer puis redémarrer Home Assistant - -### 2. Manuel (sans HACS) - -1. Télécharger le contenu du dépôt -2. Copier le dossier `sncf_trains` dans `config/custom_components/` -3. Redémarrer Home Assistant - ---- - -## ⚙️ Configuration - -1. Aller dans **Paramètres → Appareils & services → Ajouter une intégration** -2. Rechercher **SNCF Trains** -3. Suivre les étapes : - - Clé API SNCF -4. Ajouter un trajet : - - Ville et gare de départ - - Ville et gare d'arrivée - - Plage horaire à surveiller - -Plusieurs trajets peuvent être configurés séparément. - ---- - -## 🧩 Options dynamiques - -### Intégration principale (Configurer) - -- ⏱ Intervalle de mise à jour **pendant** la plage horaire -- 🕰 Intervalle **hors** plage horaire - -### Par trajet (Reconfigurer un trajet) - -- 🚆 Nombre de trains affichés -- 🕗 Heures de début et fin de surveillance - -✅ Aucun redémarrage requis. Les modifications sont appliquées dynamiquement. - ---- - -## 🔐 Clé API SNCF - -Obtenez votre clé ici : [https://www.digital.sncf.com/startup/api](https://www.digital.sncf.com/startup/api) - -1. Créez un compte ou connectez-vous -2. Générez une clé API gratuite -3. Utilisez-la lors de la configuration (limite de 5 000 requêtes par jour) - -> Pour changer de clé, cliquer sur **Reconfigurer** dans l'intégration. - ---- - -## ⚙️ Variables de l'intégration - -| Nom | Description | -|-----|-------------| -| `update_interval` | Intervalle de mise à jour **pendant** la plage horaire (défaut : 2 min) | -| `outside_interval` | Intervalle **hors** plage horaire (défaut : 60 min) | -| `train_count` | Nombre de trains à afficher | -| `time_start` / `time_end` | Plage horaire de surveillance (ex. : `06:00` → `09:00`) | - -> 🕑 L'intervalle actif s'active automatiquement **2h avant** le début de plage. - ---- - -## 📊 Capteurs créés - -- `sensor.sncf__` — capteur principal du trajet -- `sensor.sncf_train_X__` — capteur par train -- `calendar.trains` — calendrier des prochains départs -- `sensor.sncf_tous_les_trains_ligne_X` - -### Attributs du capteur principal - -- Nombre de trajets -- Informations les inervalles - -### Capteurs secondaires (enfants) pour chaque train - -- Heure de départ (`device_class: timestamp`) -- Heure d’arrivée -- Retard estimé -- Durée totale (`duration_minutes`) -- Mode, direction, numéro - ---- - -## 🎨 Carte Lovelace — SNCF Train Card - -La carte `sncf-train-card` est **automatiquement disponible** dans le sélecteur de cartes dès l'installation de l'intégration. - -### Ajouter la carte - -Dans un tableau de bord, cliquer sur **+ Ajouter une carte** → chercher **SNCF Train Card**. - -Ou en YAML : - -```yaml -type: custom:sncf-train-card -device_id: VOTRE_DEVICE_ID -``` - -### 🔍 Trouver le `device_id` - -Le `device_id` correspond à l'appareil créé lors de la configuration du trajet. - -1. Aller dans **Paramètres → Appareils & services → SNCF Trains** -2. Cliquer sur le trajet souhaité -3. L'URL contient l'identifiant : `.../config/devices/device/XXXX` - -> ![Exemple d'identifiant](./assets/device_id_url.png) - -### ⚙️ Paramètres de la carte - -| Paramètre | Type | Défaut | Description | -|-----------|------|--------|-------------| -| `device_id` | `string` | **obligatoire** | Identifiant de l'appareil SNCF (voir ci-dessus) | -| `title` | `string` | `'Trains SNCF'` | Titre affiché en haut de la carte | -| `train_lines` | `number` | `3` | Nombre de trains affichés simultanément | -| `train_emoji` | `string` | `'🚅'` | Emoji du train animé sur la barre de progression | -| `train_emoji_axial_symmetry` | `boolean` | `true` | Retourne l'emoji (à utiliser selon son sens) | -| `train_station_emoji` | `string` | `'🚉'` | Emoji affiché à côté des gares | -| `animation_duration` | `number` | `30` | Nombre de minutes avant l'arrivée en gare à partir duquel l'animation du train se déclenche (ex : `30` = animation active dans les 30 dernières minutes, `60` = dans la dernière heure) | -| `update_interval` | `number` | `30000` | Intervalle de rafraîchissement de la carte en **millisecondes** | - -### Exemple complet - -```yaml -type: custom:sncf-train-card -device_id: abc123def456 -title: "Paris → Lyon" -train_lines: 4 -train_emoji: "🚆" -train_emoji_axial_symmetry: true -train_station_emoji: "🏙️" -animation_duration: 45 -update_interval: 60000 -``` - -### Exemple d'affichage - -![Exemple d'affichage](./assets/card_example.png) - ---- - -## 📸 Aperçus - -**Carte capteur :** - -sensor - -**Détails du prochain train :** - -image - -**Dashboard Lovelace :** - -dashboard - ---- - -## 🛠 Développement - -Compatible avec Home Assistant `2025.8+`. - -Structure : -- `__init__.py` : enregistrement de l'intégration et de la carte Lovelace -- `calendar.py` : calendrier -- `config_flow.py` : assistant UI de configuration -- `options_flow.py` : formulaire d’options dynamiques -- `sensor.py` : entités de capteurs -- `coordinator.py` : logique de récupération intelligente -- `translations/fr.json` : interface en français -- `manifest.json` : métadonnées et dépendances -- `www/sncf-train-card.js` : carte Lovelace personnalisée - ---- - -## 👨‍💻 Auteur - -Développé par [Master13011](https://github.com/Master13011) -Contributions bienvenues via **Pull Request** ou **Issues** - ---- - -## 📄 Licence - -Code open-source sous licence **MIT** diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e74af9a..0000000 --- a/__init__.py +++ /dev/null @@ -1,112 +0,0 @@ -"""The SNCF Train integration.""" - -from pathlib import Path -from types import MappingProxyType - -from homeassistant.config_entries import ConfigEntry, ConfigSubentry -from homeassistant.core import HomeAssistant -from homeassistant.helpers.entity_registry import Platform -from homeassistant.components.frontend import add_extra_js_url -from homeassistant.components.http import StaticPathConfig -from homeassistant.helpers import config_validation as cv - -from .const import ( - CONF_API_KEY, - CONF_ARRIVAL_NAME, - CONF_DEPARTURE_NAME, - CONF_FROM, - CONF_TIME_END, - CONF_TIME_START, - CONF_TO, - CONF_TRAIN_COUNT, - DOMAIN, -) -from .coordinator import SncfUpdateCoordinator - -type SncfDataConfigEntry = ConfigEntry[SncfUpdateCoordinator] - -PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.CALENDAR] -CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN) - -CARD_URL = "/sncf_trains/sncf-train-card.js" -CARD_FILE = Path(__file__).parent / "www" / "sncf-train-card.js" - - -async def async_setup(hass: HomeAssistant, config: dict) -> bool: - """Set up SNCF Trains component — register the Lovelace card.""" - await hass.http.async_register_static_paths( - [StaticPathConfig(CARD_URL, str(CARD_FILE), cache_headers=False)] - ) - add_extra_js_url(hass, CARD_URL) - return True - - -async def async_setup_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> bool: - """Set up SNCF Train as config entry.""" - coordinator = SncfUpdateCoordinator(hass, entry) - await coordinator.async_config_entry_first_refresh() - entry.runtime_data = coordinator - - entry.async_on_unload(entry.add_update_listener(async_reload_entry)) - await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) - - return True - - -async def async_unload_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> bool: - """Unload a config entry.""" - return await hass.config_entries.async_unload_platforms(entry, PLATFORMS) - - -async def async_reload_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> None: - """Reload entry if change option.""" - await hass.config_entries.async_reload(entry.entry_id) - - -async def async_migrate_entry(hass: HomeAssistant, entry: SncfDataConfigEntry) -> bool: - """Migrate old config entries to move API key to options.""" - data = dict(entry.data) - options = dict(entry.options) - updated = False - - if CONF_API_KEY in options: - data.setdefault(CONF_API_KEY, options.pop(CONF_API_KEY)) - updated = True - - if updated: - time_start = options.pop(CONF_TIME_START) - time_end = options.pop(CONF_TIME_END) - train_count = options.pop(CONF_TRAIN_COUNT) - from_ = data.pop(CONF_FROM) - to_ = data.pop(CONF_TO) - dep_name = data.pop(CONF_DEPARTURE_NAME) - arr_name = data.pop(CONF_ARRIVAL_NAME) - subentry_data = MappingProxyType( - { - CONF_FROM: from_, - CONF_TO: to_, - CONF_DEPARTURE_NAME: dep_name, - CONF_ARRIVAL_NAME: arr_name, - CONF_TIME_START: time_start, - CONF_TIME_END: time_end, - CONF_TRAIN_COUNT: train_count, - } - ) - - hass.config_entries.async_update_entry( - entry, - data=data, - options=options, - unique_id="sncf_trains", - title="Trains SNCF", - ) - subentry = ConfigSubentry( - title=f"Trajet: {dep_name} → {arr_name} ({time_start} - {time_end})", - data=subentry_data, - subentry_id=f"{entry.entry_id}_MIGRATE", - subentry_type="train", - unique_id=f"{from_}_{to_}_{time_start}_{time_end}", - ) - hass.config_entries.async_add_subentry(entry, subentry) - - return True diff --git a/api.py b/api.py deleted file mode 100644 index 9e8e191..0000000 --- a/api.py +++ /dev/null @@ -1,119 +0,0 @@ -import base64 -import logging -from aiohttp import ClientSession, ClientTimeout, ClientError -from typing import List, Optional, Mapping -from homeassistant.exceptions import ConfigEntryAuthFailed -import asyncio - -API_BASE = "https://api.sncf.com" -_LOGGER = logging.getLogger(__name__) - - -def encode_token(api_key: str) -> str: - """Encode the API key for Basic Auth.""" - token_str = f"{api_key}:" - return base64.b64encode(token_str.encode()).decode() - - -class SncfApiClient: - def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): - self._session = session - self._token = encode_token(api_key) - self._timeout = timeout - - async def fetch_departures( - self, stop_id: str, max_results: int = 20 #By default = 10 - ) -> Optional[List[dict]]: - if stop_id.startswith("stop_area:"): - url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" - elif stop_id.startswith("stop_point:"): - url = f"{API_BASE}/v1/coverage/sncf/stop_points/{stop_id}/departures" - else: - raise ValueError("stop_id must start with 'stop_area:' or 'stop_point:'") - - params_raw: dict[str, object] = { - "data_freshness": "realtime", - "count": max_results, - } - params: Mapping[str, str] = {k: str(v) for k, v in params_raw.items()} - - headers = {"Authorization": f"Basic {self._token}"} - - try: - async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), - ) as resp: - if resp.status == 401: - # vrai problème d'auth - raise ConfigEntryAuthFailed("Unauthorized: check your API key.") - if resp.status == 429: - # rate-limit => pas une auth failure - _LOGGER.warning("API rate limit (429) on %s with %s", url, params) - raise RuntimeError( - "SNCF API rate-limited (429)" - ) # sera géré comme non-critique - resp.raise_for_status() - data = await resp.json() - return data.get("departures", []) - except (ClientError, asyncio.TimeoutError) as err: - _LOGGER.error("Network error fetching departures from SNCF API: %s", err) - _LOGGER.debug("URL: %s, Params: %s", url, params) - return None - - async def fetch_journeys( - self, from_id: str, to_id: str, datetime_str: str, count: int = 20 - ) -> Optional[List[dict]]: - url = f"{API_BASE}/v1/coverage/sncf/journeys" - params_raw: dict[str, object] = { - "from": from_id, - "to": to_id, - "datetime": datetime_str, - "count": count, - "data_freshness": "realtime", - "datetime_represents": "departure", - } - params: Mapping[str, str] = {k: str(v) for k, v in params_raw.items()} - - headers = {"Authorization": f"Basic {self._token}"} - try: - async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), - ) as resp: - if resp.status == 401: - raise ConfigEntryAuthFailed("Unauthorized: check your API key.") - if resp.status == 429: - raise RuntimeError("Quota exceeded: 429 Too Many Requests.") - resp.raise_for_status() - data = await resp.json() - return data.get("journeys", []) - except (ClientError, asyncio.TimeoutError) as err: - _LOGGER.warning("Network error fetching journeys from SNCF API: %s", err) - return None - - async def search_stations(self, query: str) -> Optional[List[dict]]: - url = f"{API_BASE}/v1/coverage/sncf/places" - params_raw: dict[str, object] = { - "q": query, - "type[]": "stop_point", - } - params: Mapping[str, str] = {k: str(v) for k, v in params_raw.items()} - headers = {"Authorization": f"Basic {self._token}"} - try: - async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), - ) as resp: - resp.raise_for_status() - data = await resp.json() - return data.get("places", []) - except (ClientError, asyncio.TimeoutError) as err: - _LOGGER.error("Network error searching stations from SNCF API: %s", err) - return None \ No newline at end of file diff --git a/calendar.py b/calendar.py deleted file mode 100644 index 7a452ac..0000000 --- a/calendar.py +++ /dev/null @@ -1,169 +0,0 @@ -"""Calendar for trains hours.""" - -import logging -from dataclasses import dataclass -from datetime import datetime, timedelta - -from homeassistant.components.calendar import CalendarEntity, CalendarEvent -from homeassistant.core import HomeAssistant, callback -from homeassistant.helpers.device_registry import DeviceEntryType -from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from homeassistant.helpers.update_coordinator import CoordinatorEntity - -from . import SncfDataConfigEntry -from .const import CONF_ARRIVAL_NAME, CONF_DEPARTURE_NAME, CONF_TRAIN_COUNT, DOMAIN -from .coordinator import SncfUpdateCoordinator -from .helpers import get_train_num, parse_datetime - -_LOGGER = logging.getLogger(__name__) - - -async def async_create_event(self, **kwargs): - raise NotImplementedError - - -async def async_delete_event(self, uid: str): - raise NotImplementedError - - -async def async_update_event(self, uid: str, event: CalendarEvent): - raise NotImplementedError - - -async def async_setup_entry( - hass: HomeAssistant, - entry: SncfDataConfigEntry, - async_add_entities: AddConfigEntryEntitiesCallback, -) -> None: - """Set up the Demo Calendar config entry.""" - coordinator: SncfUpdateCoordinator = entry.runtime_data - async_add_entities([SNCFCalendar(coordinator)], update_before_add=True) - - -@dataclass -class SNCFEventMixIn: - """Mixin for calendar event.""" - - has_delay: bool - delay: int - departure_date_time: datetime - arrival_date_time: datetime - train_num: int - - -@dataclass -class MyCalendarEvent(CalendarEvent, SNCFEventMixIn): - """A class to describe a calendar event.""" - - -class SNCFCalendar(CoordinatorEntity[SncfUpdateCoordinator], CalendarEntity): - """Representation of a Calendar element.""" - - _attr_name = "Trains" - - def __init__(self, coordinator: SncfUpdateCoordinator) -> None: - """Initialize demo calendar.""" - super().__init__(coordinator) - self._event: MyCalendarEvent | None = None - self._attr_unique_id = f"calendar_sncf_train_{coordinator.entry.entry_id}" - self._attr_device_info = { - "identifiers": {(DOMAIN, coordinator.entry.entry_id)}, - "name": "SNCF", - "manufacturer": "Master13011", - "model": "API", - "entry_type": DeviceEntryType.SERVICE, - } - - @property - def event(self) -> MyCalendarEvent | None: - """Return the current or next upcoming event.""" - if not self.available: - return None - - return self._event - - @callback - def _handle_coordinator_update(self) -> None: - """Handle updated data from the coordinator.""" - if self._fetch_journeys(): - self._event = min( - self._fetch_journeys(), - key=lambda x: abs(x.start.replace(tzinfo=None) - datetime.now()), - ) - if self._event: - self._attr_extra_state_attributes = { - "has_delay": self._event.has_delay, - "delay": self._event.delay, - "departure": self._event.departure_date_time, - "arrival": self._event.arrival_date_time, - "number": self._event.train_num, - } - self.async_write_ha_state() - - async def async_get_events( - self, _hass: HomeAssistant, start_date: datetime, end_date: datetime - ) -> list[CalendarEvent]: - """Return calendar events within a datetime range. - - This is only called when opening the calendar in the UI. - """ - if not self.available: - return [] - - return self._fetch_journeys() - - def _async_calculate_delay( - self, journey, dep_name: str, arr_name: str - ) -> tuple[bool, int, str]: - arr_dt = parse_datetime(journey.get("arrival_date_time", "")) - section = journey.get("sections", [{}])[0] - base_arr_dt = parse_datetime(section.get("base_arrival_date_time", "")) - - delay = ( - int((arr_dt - base_arr_dt).total_seconds() / 60) - if arr_dt and base_arr_dt - else 0 - ) - summary = ( - f"{dep_name} → {arr_name} - RETARD ({delay}min)" - if delay > 0 - else f"{dep_name} → {arr_name}" - ) - - return delay > 0, delay, summary - - def _fetch_journeys(self): - """Fetch journeys.""" - calendar_events = [] - for tid, journeys in self.coordinator.data.items(): - entry = self.coordinator.entry.subentries[tid] - dep_name = entry.data[CONF_DEPARTURE_NAME] - arr_name = entry.data[CONF_ARRIVAL_NAME] - display_count = min(len(journeys), entry.data[CONF_TRAIN_COUNT]) - _LOGGER.debug("%s -> %s", dep_name, arr_name) - for journey in journeys[:display_count]: - section = journey.get("sections", [{}])[0] - dep_dt = parse_datetime(journey.get("departure_date_time", "")) - arr_dt = parse_datetime(journey.get("arrival_date_time", "")) - has_delay, delay, summary = self._async_calculate_delay( - journey, dep_name, arr_name - ) - - if dep_dt and arr_dt: - calendar_events.append( - MyCalendarEvent( - summary=summary, - start=dep_dt, - end=dep_dt + timedelta(minutes=1), - description=f"Arrivée: {arr_dt}, retard: {delay} minutes", - location=str(dep_name), - uid=section.get("id"), - has_delay=has_delay, - delay=delay, - departure_date_time=dep_dt, - arrival_date_time=arr_dt, - train_num=int(get_train_num(journey)), - ) - ) - - return calendar_events diff --git a/config_flow.py b/config_flow.py deleted file mode 100644 index 2f2e1db..0000000 --- a/config_flow.py +++ /dev/null @@ -1,305 +0,0 @@ -from typing import Any -import asyncio -from aiohttp import ClientError -import voluptuous as vol - -from homeassistant import config_entries -from homeassistant.config_entries import ( - ConfigEntry, - ConfigSubentryFlow, - OptionsFlow, - SubentryFlowResult, -) -from homeassistant.core import callback -from homeassistant.helpers.aiohttp_client import async_get_clientsession - -from .api import SncfApiClient -from .const import ( - CONF_API_KEY, - CONF_ARRIVAL_CITY, - CONF_ARRIVAL_NAME, - CONF_ARRIVAL_STATION, - CONF_DEPARTURE_CITY, - CONF_DEPARTURE_NAME, - CONF_DEPARTURE_STATION, - CONF_FROM, - CONF_TIME_END, - CONF_TIME_START, - CONF_TO, - CONF_TRAIN_COUNT, - CONF_UPDATE_INTERVAL, - CONF_OUTSIDE_INTERVAL, - CONF_SHOW_ROUTE_DETAILS, # NOUVEAU - DEFAULT_OUTSIDE_INTERVAL, - DEFAULT_TIME_END, - DEFAULT_TIME_START, - DEFAULT_TRAIN_COUNT, - DEFAULT_UPDATE_INTERVAL, - DEFAULT_SHOW_ROUTE_DETAILS, # NOUVEAU - DOMAIN, -) - - -class SncfTrainsConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): - """Handle a config flow.""" - - VERSION = 1 - MINOR_VERSION = 2 - - async def async_step_user(self, user_input: dict[str, Any] | None = None): - """Handle the initial step.""" - errors = {} - if user_input is not None: - session = async_get_clientsession(self.hass) - api = SncfApiClient(session, user_input[CONF_API_KEY]) - if not await self._validate_api_key(api): - errors["base"] = "invalid_api_key" - else: - if self.source == "user": - await self.async_set_unique_id("sncf_trains") - return self.async_create_entry(title="Trains SNCF", data=user_input) - else: - return self.async_update_reload_and_abort( - self._get_reconfigure_entry(), data=user_input - ) - - DATA_SCHEMA = vol.Schema({vol.Required(CONF_API_KEY): str}) - if self.source == "reconfigure": - entry = self._get_reconfigure_entry() - DATA_SCHEMA = self.add_suggested_values_to_schema(DATA_SCHEMA, entry.data) - - return self.async_show_form( - step_id="user", data_schema=DATA_SCHEMA, errors=errors - ) - - async def _validate_api_key(self, api: SncfApiClient): - """Check API Key.""" - try: - results = await api.search_stations("paris") - return bool(results) - except (ClientError, asyncio.TimeoutError): - return False - - @classmethod - @callback - def async_get_supported_subentry_types( - cls, config_entry: ConfigEntry - ) -> dict[str, type[ConfigSubentryFlow]]: - """Return subentries supported by this integration.""" - return { - "train": TrainSubentryFlowHandler, - } - - @staticmethod - @callback - def async_get_options_flow(config_entry: ConfigEntry): - """Return options.""" - return SncfTrainsOptionsFlowHandler() - - async_step_reconfigure = async_step_user - - -class SncfTrainsOptionsFlowHandler(OptionsFlow): - """Options flow.""" - - async def async_step_init(self, user_input: dict[str, Any] | None = None): - """Handle the initial options step.""" - if user_input is not None: - return self.async_create_entry(title="", data=user_input) - - entry = self.config_entry - - DATA_SCHEMA = vol.Schema( - { - vol.Required( - CONF_UPDATE_INTERVAL, - default=entry.options.get( - CONF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL - ), - ): int, - vol.Required( - CONF_OUTSIDE_INTERVAL, - default=entry.options.get( - CONF_OUTSIDE_INTERVAL, DEFAULT_OUTSIDE_INTERVAL - ), - ): int, - } - ) - - return self.async_show_form(step_id="init", data_schema=DATA_SCHEMA) - - -class TrainSubentryFlowHandler(ConfigSubentryFlow): - """Flow for managing trains subentries.""" - - api: SncfApiClient | None = None - departure_city: str | None = None - departure_station: str | None = None - arrival_city: str | None = None - arrival_station: str | None = None - departure_options: dict = {} - arrival_options: dict = {} - config_entry: ConfigEntry | None = None - - async def async_step_departure_city( - self, user_input: dict[str, Any] | None = None - ) -> SubentryFlowResult: - """Handle the departure city step.""" - errors = {} - if user_input is not None: - self.config_entry = self._get_entry() - api_key = self.config_entry.options.get( - "api_key" - ) or self.config_entry.data.get("api_key") - session = async_get_clientsession(self.hass) - self.api = SncfApiClient(session, api_key) - - self.departure_city = user_input[CONF_DEPARTURE_CITY] - stations = await self.api.search_stations(self.departure_city) - if not stations: - errors["base"] = "no_stations" - else: - self.departure_options = {s["id"]: s for s in stations} - return await self.async_step_departure_station() - return self.async_show_form( - step_id="departure_city", - data_schema=vol.Schema({vol.Required(CONF_DEPARTURE_CITY): str}), - errors=errors, - ) - - async def async_step_departure_station( - self, user_input: dict[str, Any] | None = None - ) -> SubentryFlowResult: - """Handle the departure station step.""" - if user_input is not None: - self.departure_station = user_input[CONF_DEPARTURE_STATION] - return await self.async_step_arrival_city() - options = { - k: f"{v['name']} ({k.split(':')[-1]})" - for k, v in self.departure_options.items() - } - return self.async_show_form( - step_id="departure_station", - data_schema=vol.Schema( - {vol.Required(CONF_DEPARTURE_STATION): vol.In(options)} - ), - ) - - async def async_step_arrival_city( - self, user_input: dict[str, Any] | None = None - ) -> SubentryFlowResult: - """Handle the arrival city step.""" - errors = {} - if user_input is not None: - self.arrival_city = user_input[CONF_ARRIVAL_CITY] - stations = await self.api.search_stations(self.arrival_city) - if not stations: - errors["base"] = "no_stations" - else: - self.arrival_options = {s["id"]: s for s in stations} - return await self.async_step_arrival_station() - return self.async_show_form( - step_id="arrival_city", - data_schema=vol.Schema({vol.Required(CONF_ARRIVAL_CITY): str}), - errors=errors, - ) - - async def async_step_arrival_station( - self, user_input: dict[str, Any] | None = None - ) -> SubentryFlowResult: - """Handle the arrival station step.""" - if user_input is not None: - self.arrival_station = user_input[CONF_ARRIVAL_STATION] - return await self.async_step_time_range() - options = { - k: f"{v['name']} ({k.split(':')[-1]})" - for k, v in self.arrival_options.items() - } - return self.async_show_form( - step_id="arrival_station", - data_schema=vol.Schema( - {vol.Required(CONF_ARRIVAL_STATION): vol.In(options)} - ), - ) - - async def async_step_time_range( - self, user_input: dict[str, Any] | None = None - ) -> SubentryFlowResult: - """Handle the time range step.""" - if user_input is not None: - dep_name = self.departure_options.get(self.departure_station, {}).get( - "name", self.departure_station - ) - arr_name = self.arrival_options.get(self.arrival_station, {}).get( - "name", self.arrival_station - ) - time_start = user_input[CONF_TIME_START] - time_end = user_input[CONF_TIME_END] - unique_id = f"{self.departure_station}_{self.arrival_station}_{time_start}_{time_end}" - - for subentry in self.config_entry.subentries.values(): - if unique_id == subentry.unique_id: - return self.async_abort(reason="already_configured_as_entry") - - return self.async_create_entry( - title=f"Trajet: {dep_name} → {arr_name} ({time_start} - {time_end})", - data={ - CONF_FROM: self.departure_station, - CONF_TO: self.arrival_station, - CONF_DEPARTURE_NAME: dep_name, - CONF_ARRIVAL_NAME: arr_name, - **user_input, - }, - unique_id=unique_id, - ) - - # NOUVEAU: On ajoute l'option booléenne - return self.async_show_form( - step_id="time_range", - data_schema=vol.Schema( - { - vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, - vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, - vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, - vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=DEFAULT_SHOW_ROUTE_DETAILS): bool, - } - ), - ) - - async def async_step_reconfigure( - self, user_input: dict[str, Any] | None = None - ) -> SubentryFlowResult: - """User flow to modify an existing entry.""" - config_subentry = self._get_reconfigure_subentry() - - if user_input is not None: - data = config_subentry.data.copy() - data.update(user_input) - - return self.async_update_and_abort( - self._get_entry(), - config_subentry, - data=data, - title=f"Trajet: {data[CONF_DEPARTURE_NAME]} → {data[CONF_ARRIVAL_NAME]} ({data[CONF_TIME_START]} - {data[CONF_TIME_END]})", - ) - - # NOUVEAU: On récupère l'ancienne valeur si elle existe - current_show_route = config_subentry.data.get(CONF_SHOW_ROUTE_DETAILS, DEFAULT_SHOW_ROUTE_DETAILS) - - DATA_SCHEMA = vol.Schema( - { - vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, - vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, - vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, - vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=current_show_route): bool, - } - ) - - return self.async_show_form( - step_id="reconfigure", - data_schema=self.add_suggested_values_to_schema( - DATA_SCHEMA, config_subentry.data - ), - ) - - async_step_user = async_step_departure_city \ No newline at end of file diff --git a/const.py b/const.py deleted file mode 100644 index 545f277..0000000 --- a/const.py +++ /dev/null @@ -1,27 +0,0 @@ -DOMAIN = "sncf_trains" - -CONF_API_KEY = "api_key" -CONF_UPDATE_INTERVAL = "update_interval" -CONF_OUTSIDE_INTERVAL = "outside_interval" - -DEFAULT_UPDATE_INTERVAL = 2 # minutes -DEFAULT_OUTSIDE_INTERVAL = 60 # minutes -DEFAULT_TRAIN_COUNT = 5 -DEFAULT_TIME_START = "07:00" -DEFAULT_TIME_END = "10:00" -DEFAULT_SHOW_ROUTE_DETAILS = False - -ATTRIBUTION = "Data provided by api.sncf.com" - -CONF_ARRIVAL_CITY = "arrival_city" -CONF_ARRIVAL_NAME = "arrival_name" -CONF_ARRIVAL_STATION = "arrival_station" -CONF_DEPARTURE_CITY = "departure_city" -CONF_DEPARTURE_NAME = "departure_name" -CONF_DEPARTURE_STATION = "departure_station" -CONF_FROM = "from" -CONF_TIME_END = "time_end" -CONF_TIME_START = "time_start" -CONF_TO = "to" -CONF_TRAIN_COUNT = "train_count" -CONF_SHOW_ROUTE_DETAILS = "show_route_details" # NOUVEAU \ No newline at end of file diff --git a/coordinator.py b/coordinator.py deleted file mode 100644 index 9297469..0000000 --- a/coordinator.py +++ /dev/null @@ -1,183 +0,0 @@ -"""Data Update Coordinator.""" - -import logging -from datetime import timedelta -from typing import Any -import asyncio -from aiohttp import ClientError -from homeassistant.config_entries import ConfigEntry -from homeassistant.core import HomeAssistant -from homeassistant.exceptions import ConfigEntryAuthFailed -from homeassistant.helpers.aiohttp_client import async_get_clientsession -from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed -from homeassistant.util import dt as dt_util - -from .api import SncfApiClient -from .const import ( - CONF_API_KEY, - CONF_FROM, - CONF_OUTSIDE_INTERVAL, - CONF_TIME_END, - CONF_TIME_START, - CONF_TO, - CONF_UPDATE_INTERVAL, - DEFAULT_OUTSIDE_INTERVAL, - DEFAULT_UPDATE_INTERVAL, -) - -_LOGGER = logging.getLogger(__name__) - - -class SncfUpdateCoordinator(DataUpdateCoordinator): - """Coordonnateur pour récupérer les données des trajets SNCF.""" - - def __init__(self, hass: HomeAssistant, entry: ConfigEntry): - """Initialisation.""" - self.entry = entry - self.api_client = None - self.update_interval_minutes = entry.options.get( - CONF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL - ) - self.outside_interval_minutes = entry.options.get( - CONF_OUTSIDE_INTERVAL, DEFAULT_OUTSIDE_INTERVAL - ) - - super().__init__( - hass, - _LOGGER, - name="SNCF Train Journeys", - update_interval=timedelta(minutes=self.update_interval_minutes), - ) - - async def _async_setup(self) -> None: - """Paramétrage du coordinateur.""" - api_key = self.entry.data[CONF_API_KEY] - - try: - session = async_get_clientsession(self.hass) - self.api_client = SncfApiClient(session, api_key) - - except Exception as err: - if "401" in str(err) or "403" in str(err): - raise ConfigEntryAuthFailed("Clé API invalide ou expirée") from err - _LOGGER.error("Erreur lors de la récupération des trajets SNCF: %s", err) - raise UpdateFailed(err) from err - - def _build_datetime_param(self, time_start, time_end) -> str: - """Construit le paramètre datetime pour l'API (ignore le passé).""" - now = dt_util.now() - h_start, m_start = map(int, time_start.split(":")) - h_end, m_end = map(int, time_end.split(":")) - - dt_start = now.replace(hour=h_start, minute=m_start, second=0, microsecond=0) - dt_end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) - - if now > dt_end: - # Si on a dépassé la fin de la plage aujourd'hui, on cherche pour demain - dt_start += timedelta(days=1) - elif now > dt_start: - # CORRECTION : Si on est PENDANT la plage horaire, on cherche à partir de MAINTENANT - # (On n'interroge plus les trains déjà passés !) - dt_start = now - - return dt_start.strftime("%Y%m%dT%H%M%S") - - def _adjust_update_interval(self, time_start, time_end) -> timedelta | None: - """Ajuste la fréquence selon la plage horaire, avec préfenêtre 1h et gestion minuit.""" - now = dt_util.now() - h_start, m_start = map(int, time_start.split(":")) - h_end, m_end = map(int, time_end.split(":")) - - start = now.replace(hour=h_start, minute=m_start, second=0, microsecond=0) - end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) - - if end <= start: - end += timedelta(days=1) - - pre_start = start - timedelta(hours=1) - - if now < pre_start: - start -= timedelta(days=1) - end -= timedelta(days=1) - pre_start -= timedelta(days=1) - - in_fast_mode = pre_start <= now <= end - - interval_minutes = ( - self.update_interval_minutes - if in_fast_mode - else self.outside_interval_minutes - ) - new_interval = timedelta(minutes=interval_minutes) - - if self.update_interval != new_interval: - _LOGGER.debug( - "Update interval: %s → %s minutes", - ( - None - if self.update_interval is None - else self.update_interval.total_seconds() / 60 - ), - interval_minutes, - ) - return new_interval - - return new_interval - - async def _async_update_data(self) -> dict[str, Any]: - """Récupère les données de l'API SNCF.""" - - if not self.entry.subentries: - _LOGGER.warning("Pas de subentries configurés") - return {} - - update_intervals = [] - trains = {} - max_retries = 3 # nombre de tentatives - retry_delay = 2 # secondes entre les tentatives - for subentry_id, entry in self.entry.subentries.items(): - _LOGGER.debug(entry.title) - departure = entry.data[CONF_FROM] - arrival = entry.data[CONF_TO] - time_start = entry.data[CONF_TIME_START] - time_end = entry.data[CONF_TIME_END] - - update_intervals.append(self._adjust_update_interval(time_start, time_end)) - datetime_str = self._build_datetime_param(time_start, time_end) - journeys = None - for attempt in range(1, max_retries + 1): - try: - journeys = await self.api_client.fetch_journeys( - departure, arrival, datetime_str, count=20 #By defaults = 10 - ) - if journeys is not None: - break # succès, on sort du retry - except (ClientError, asyncio.TimeoutError, RuntimeError) as err: - _LOGGER.warning( - "Erreur réseau lors de la récupération des trajets (tentative %d/%d) : %s", - attempt, - max_retries, - err, - ) - await asyncio.sleep(retry_delay) - - if journeys is None or not isinstance(journeys, list): - _LOGGER.error("Aucune donnée reçue de l'API SNCF pour le trajet ") - continue - - trains[subentry_id] = [ - j - for j in journeys - if isinstance(j, dict) and len(j.get("sections", [])) == 1 - ] - - if update_intervals: - new_interval = min(update_intervals) - if self.update_interval != new_interval: - self.update_interval = new_interval - _LOGGER.debug( - "Coordinator update interval set to %s minutes", - self.update_interval.total_seconds() / 60, - ) - - return trains \ No newline at end of file diff --git a/diagnostics.py b/diagnostics.py deleted file mode 100644 index 846d3f9..0000000 --- a/diagnostics.py +++ /dev/null @@ -1,45 +0,0 @@ -"""Diagnostics support for SNCF integration.""" - -from __future__ import annotations -from typing import Any -from homeassistant.core import HomeAssistant -from homeassistant.config_entries import ConfigEntry -from homeassistant.helpers.entity_registry import async_redact_data -from .const import DOMAIN, CONF_API_KEY - -TO_REDACT = {CONF_API_KEY} - - -async def async_get_config_entry_diagnostics( - hass: HomeAssistant, entry: ConfigEntry -) -> dict[str, Any]: - """Return diagnostics for a config entry.""" - data: dict[str, Any] = {} - - data["config_entry"] = { - "title": entry.title, - "data": async_redact_data(entry.data, TO_REDACT), - "options": async_redact_data(entry.options, TO_REDACT), - "entry_id": entry.entry_id, - "version": entry.version, - } - - coordinator = hass.data.get(DOMAIN, {}).get(entry.entry_id) - if coordinator: - data["coordinator"] = { - "departure": getattr(coordinator, "departure", None), - "arrival": getattr(coordinator, "arrival", None), - "time_start": getattr(coordinator, "time_start", None), - "time_end": getattr(coordinator, "time_end", None), - "update_interval": str(getattr(coordinator, "update_interval", None)), - "last_update_success": getattr(coordinator, "last_update_success", None), - "last_update_time": str( - getattr(coordinator, "last_update_success_time", None) - ), - "data_sample": ( - coordinator.data[:3] - if hasattr(coordinator, "data") and coordinator.data - else None - ), - } - return data diff --git a/exemple_automatisation b/exemple_automatisation deleted file mode 100644 index e708fd2..0000000 --- a/exemple_automatisation +++ /dev/null @@ -1,164 +0,0 @@ -alias: Alerte Trains SNCF -description: "" -triggers: - - trigger: state - entity_id: - - sensor.sncf_tous_les_trains_ligne - - sensor.sncf_tous_les_trains_ligne_2 -conditions: - - condition: template - value_template: | - {{ state_attr('sensor.sncf_tous_les_trains_ligne', 'has_delay') == true - or state_attr('sensor.sncf_tous_les_trains_ligne_2', 'has_delay') == true }} -actions: - - choose: - - conditions: - - condition: or - conditions: - - condition: template - value_template: | - {% set dep = state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', - 'departure_time' - ).split(' - ')[1] %} - {% set base = state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', - 'base_departure_time' - ).split(' - ')[1] %} - - {{ dep != base }} - - condition: state - entity_id: >- - sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2 - attribute: has_delay - state: "true" - sequence: - - data: - title: Train en retard ou supprimé - message: | - Le train de {{ - state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', - 'base_departure_time' - ).split(' - ')[1] - }} n'est pas à l'heure. - Départ prévu : {{ - state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', - 'departure_time' - ).split(' - ')[1] - }} - action: notify.notify - - conditions: - - condition: or - conditions: - - condition: template - value_template: | - {% set dep = state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', - 'departure_time' - ).split(' - ')[1] %} - {% set base = state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', - 'base_departure_time' - ).split(' - ')[1] %} - - {{ dep != base }} - - condition: state - entity_id: >- - sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3 - attribute: has_delay - state: "true" - sequence: - - data: - title: Train en retard ou supprimé - message: | - Le train de {{ - state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', - 'base_departure_time' - ).split(' - ')[1] - }} n'est pas à l'heure. - Départ prévu : {{ - state_attr( - 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', - 'departure_time' - ).split(' - ')[1] - }} - action: notify.notify - - conditions: - - condition: or - conditions: - - condition: template - value_template: | - {% set dep = state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', - 'departure_time' - ).split(' - ')[1] %} - {% set base = state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', - 'base_departure_time' - ).split(' - ')[1] %} - - {{ dep != base }} - - condition: state - entity_id: >- - sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2 - attribute: has_delay - state: - - "true" - sequence: - - data: - title: Train en retard ou supprimé - message: | - Le train de {{ - state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', - 'base_departure_time' - ).split(' - ')[1] - }} n'est pas à l'heure. - Départ prévu : {{ - state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', - 'departure_time' - ).split(' - ')[1] - }} - action: notify.notify - - conditions: - - condition: or - conditions: - - condition: template - value_template: | - {% set dep = state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', - 'departure_time' - ).split(' - ')[1] %} - {% set base = state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', - 'base_departure_time' - ).split(' - ')[1] %} - - {{ dep != base }} - - condition: state - entity_id: >- - sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3 - attribute: has_delay - state: - - "true" - sequence: - - data: - title: Train en retard ou supprimé - message: | - Le train de {{ - state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', - 'base_departure_time' - ).split(' - ')[1] - }} n'est pas à l'heure. - Départ prévu : {{ - state_attr( - 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', - 'departure_time' - ).split(' - ')[1] - }} - action: notify.notify diff --git a/exemple_dashboard b/exemple_dashboard deleted file mode 100644 index cb28888..0000000 --- a/exemple_dashboard +++ /dev/null @@ -1,44 +0,0 @@ -type: markdown -content: | - ### 🚄 Départs XX → XX - {% for train in [ - 'sensor.sncf_train_1_XX', - 'sensor.sncf_train_2_XX', - 'sensor.sncf_train_3_XX', - 'sensor.sncf_train_4_XX' - ] %} - {% set t = state_attr(train, 'departure_time') %} - {% set b = state_attr(train, 'base_departure_time') %} - {% set r = state_attr(train, 'delay_minutes') | int(0) %} - {% set name = state_attr(train, 'direction') | default("Inconnu") %} - - {% set t_short = (t.split(' - ')[0][:5] ~ ' - ' ~ t.split(' - ')[1]) if t else '??/?? - ??:??' %} - {% set b_short = (b.split(' - ')[0][:5] ~ ' - ' ~ b.split(' - ')[1]) if b else '??/?? - ??:??' %} - {% set s = "" ~ b_short ~ " " ~ t_short if r > 0 else t_short %} - {% set st = "🚨 Retard: " ~ r ~ " min" if r > 0 else "✅ À l'heure" %} - - **{{ s }} - {{ name }} - {{ st }}** - {% endfor %} - - ### 🚄 Départs XX → XX - {% for train in [ - 'sensor.sncf_train_1_XX', - 'sensor.sncf_train_2_XX', - 'sensor.sncf_train_3_XX', - 'sensor.sncf_train_4_XX' - ] %} - {% set t = state_attr(train, 'departure_time') %} - {% set b = state_attr(train, 'base_departure_time') %} - {% set r = state_attr(train, 'delay_minutes') | int(0) %} - {% set name = state_attr(train, 'direction') | default("Inconnu") %} - - {% set t_short = (t.split(' - ')[0][:5] ~ ' - ' ~ t.split(' - ')[1]) if t else '??/?? - ??:??' %} - {% set b_short = (b.split(' - ')[0][:5] ~ ' - ' ~ b.split(' - ')[1]) if b else '??/?? - ??:??' %} - {% set s = "" ~ b_short ~ " " ~ t_short if r > 0 else t_short %} - {% set st = "🚨 Retard: " ~ r ~ " min" if r > 0 else "✅ À l'heure" %} - - **{{ s }} - {{ name }} - {{ st }}** - {% endfor %} -grid_options: - columns: 18 - rows: auto diff --git a/hacs.json b/hacs.json deleted file mode 100644 index 4a45753..0000000 --- a/hacs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SNCF Trains HA", - "country": "FR", - "render_readme": true, - "homeassistant": "2025.8.2", - "zip_release": true, - "filename": "sncf_trains_ha.zip", - "content_in_root": false -} diff --git a/helpers.py b/helpers.py deleted file mode 100644 index a091505..0000000 --- a/helpers.py +++ /dev/null @@ -1,49 +0,0 @@ -"""Helpers for component.""" - -from datetime import datetime -from typing import Any - -from homeassistant.util import dt as dt_util - - -def parse_datetime(dt_str: str) -> datetime | None: - """Parse string to datetime.""" - if not dt_str: - return None - - try: - dt = dt_util.parse_datetime(dt_str) - return dt_util.as_local(dt) if dt else None - except (ValueError, TypeError): - return None - - -def format_time(dt_str: str) -> str: - """Format a Navitia datetime string as dd/mm/YYYY - HH:MM.""" - dt = parse_datetime(dt_str) - return dt.strftime("%d/%m/%Y - %H:%M") if dt else "N/A" - - -def get_train_num(journey: dict[str, Any]) -> str: - """Extract the commercial train number.""" - trip_num = journey.get("trip_short_name") - if trip_num: - return trip_num - - sections = journey.get("sections", []) - if sections: - infos = sections[0].get("display_informations", {}) - return infos.get("trip_short_name") or infos.get("num", "") - - return "" - - -def get_duration(journey: dict[str, Any]) -> int: - """Compute journey duration in minutes.""" - dep = parse_datetime(journey.get("departure_date_time", "")) - arr = parse_datetime(journey.get("arrival_date_time", "")) - - if dep and arr: - return int((arr - dep).total_seconds() / 60) - - return 0 diff --git a/manifest.json b/manifest.json deleted file mode 100644 index cef92cd..0000000 --- a/manifest.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "domain": "sncf_trains", - "name": "SNCF Trains", - "after_dependencies": [ - "http" - ], - "codeowners": [ - "@Master13011" - ], - "config_flow": true, - "dependencies": [ - "frontend" - ], - "documentation": "https://github.com/Master13011/SNCF-API-HA", - "integration_type": "service", - "iot_class": "cloud_polling", - "issue_tracker": "https://github.com/Master13011/SNCF-API-HA/issues", - "loggers": [ - "custom_components.sncf_trains" - ], - "requirements": [], - "single_config_entry": true, - "version": "1.3.0" -} diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9296c2c..0000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -colorlog -homeassistant -pip -ruff -pytest-asyncio -pytest -black -mypy -pylint \ No newline at end of file diff --git a/sensor.py b/sensor.py deleted file mode 100644 index 3518a57..0000000 --- a/sensor.py +++ /dev/null @@ -1,240 +0,0 @@ -"""Sensors for trains hours.""" - -from typing import Any - -from homeassistant.components.sensor import SensorDeviceClass, SensorEntity -from homeassistant.core import HomeAssistant, callback -from homeassistant.helpers.device_registry import DeviceEntryType -from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.helpers.update_coordinator import CoordinatorEntity - -from . import SncfDataConfigEntry -from .const import ( - ATTRIBUTION, - CONF_ARRIVAL_NAME, - CONF_DEPARTURE_NAME, - CONF_FROM, - CONF_TO, - DOMAIN, -) -from .coordinator import SncfUpdateCoordinator -from .helpers import format_time, get_duration, get_train_num, parse_datetime - - -async def async_setup_entry( - hass: HomeAssistant, - entry: SncfDataConfigEntry, - async_add_entities: AddEntitiesCallback, -) -> None: - """Set up SNCF entities from a config entry.""" - - coordinator: SncfUpdateCoordinator = entry.runtime_data - - # Capteur global "Trajets" - async_add_entities([SncfJourneySensor(coordinator)], update_before_add=True) - - for subentry in entry.subentries.values(): - journeys = coordinator.data.get(subentry.subentry_id, []) - display_count = min(len(journeys), subentry.data.get("train_count", 0)) - sensors = [] - - # Capteurs individuels pour chaque train - for idx in range(display_count): - sensors.append(SncfTrainSensor(coordinator, subentry.subentry_id, idx)) - - # Capteur résumé ligne par ligne - sensors.append(SncfAllTrainsLineSensor(coordinator, subentry.subentry_id)) - - async_add_entities( - sensors, config_subentry_id=subentry.subentry_id, update_before_add=True - ) - - -class SncfJourneySensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): - """Main SNCF sensor: number of direct journeys & summary.""" - - _attr_has_entity_name = True - _attr_name = "Trajets" - _attr_icon = "mdi:train" - _attr_native_unit_of_measurement = "trajets" - - def __init__(self, coordinator: SncfUpdateCoordinator) -> None: - super().__init__(coordinator) - self._attr_unique_id = f"sncf_trains_{coordinator.entry.entry_id}" - self._attr_device_info = { - "identifiers": {(DOMAIN, coordinator.entry.entry_id)}, - "name": "SNCF", - "manufacturer": "Master13011", - "model": "API", - "entry_type": DeviceEntryType.SERVICE, - } - self._attr_native_value = len(coordinator.data) - - @callback - def _handle_coordinator_update(self) -> None: - self._attr_native_value = len(self.coordinator.data) - self.async_write_ha_state() - - -class SncfTrainSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): - """Sensor for an individual train.""" - - _attr_has_entity_name = True - _attr_icon = "mdi:train" - _attr_attribution = ATTRIBUTION - _attr_device_class = SensorDeviceClass.TIMESTAMP - - def __init__(self, coordinator, train_id: str, journey_id: int) -> None: - super().__init__(coordinator) - self.tid = train_id - self.jid = journey_id - entry = self.coordinator.entry.subentries[train_id] - journey = coordinator.data[train_id][journey_id] - section = journey.get("sections", [{}])[0] - departure_time = parse_datetime(section.get("base_departure_date_time", "")) - - self.departure = entry.data[CONF_FROM] - self.arrival = entry.data[CONF_TO] - - self._attr_name = f"Train {journey_id + 1}" - self._attr_unique_id = f"{entry.subentry_id}_{journey_id}" - self._attr_extra_state_attributes = self._extra_attributes(journey) - self._attr_device_info = { - "identifiers": {(DOMAIN, entry.subentry_id)}, - "name": f"SNCF {entry.data[CONF_DEPARTURE_NAME]} → {entry.data[CONF_ARRIVAL_NAME]}", - "manufacturer": "Master13011", - "model": "API", - "entry_type": DeviceEntryType.SERVICE, - } - self._attr_native_value = departure_time - - @callback - def _handle_coordinator_update(self) -> None: - journey = self.coordinator.data[self.tid][self.jid] - section = journey.get("sections", [{}])[0] - self._attr_native_value = parse_datetime(section.get("base_departure_date_time", "")) - self._attr_extra_state_attributes = self._extra_attributes(journey) - self.async_write_ha_state() - - def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: - section = journey.get("sections", [{}])[0] - - # 1. Calcul du retard - arr_dt = parse_datetime(journey.get("arrival_date_time", "")) - base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) - delay_arr = int((arr_dt - base_arr_dt).total_seconds() / 60) if arr_dt and base_arr_dt else 0 - - dep_dt = parse_datetime(journey.get("departure_date_time", "")) - base_dep_dt = parse_datetime(section.get("base_departure_date_time")) - delay_dep = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 - - delay = max(delay_arr, delay_dep) - - # 2. Détection d'annulation et Cause - status = journey.get("status", "") - section_status = section.get("status", "") - is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") - - # Extraction de la cause du retard/problème - delay_cause = section.get("cause", "") - if not delay_cause: - # On cherche dans les messages de perturbation globaux - messages = journey.get("messages", []) - if messages: - delay_cause = messages[0].get("text", "") - - # 3. Plan de vol structuré avec détection des modifications (added/deleted) - stops_schedule = [] - route_details = "" - show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) - - if show_routes: - stops_data = section.get("stop_date_times", []) - stops_list = [] - for stop in stops_data: - stop_name = stop.get("stop_point", {}).get("name", "") - # On récupère l'horaire réel - raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) - formatted_time = format_time(raw_time) if raw_time else "" - - # Détection du statut de l'arrêt - stop_effect = stop.get("stop_time_effect", "unchanged") # added, deleted, delayed, unchanged - - if stop_name and formatted_time: - prefix = "" - if stop_effect == "deleted": prefix = "[SUPPRIMÉ] " - if stop_effect == "added": prefix = "[NOUVEAU] " - - stops_list.append(f"{prefix}{stop_name} ({formatted_time})") - - just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time - stops_schedule.append({ - "name": stop_name, - "time": just_time, - "effect": stop_effect - }) - - route_details = " ➔ ".join(stops_list) - - return { - "departure_time": format_time(journey.get("departure_date_time", "")), - "arrival_time": format_time(journey.get("arrival_date_time", "")), - "base_departure_time": format_time(section.get("base_departure_date_time")), - "base_arrival_time": format_time(section.get("base_arrival_time")), - "delay_minutes": delay, - "delay_cause": delay_cause, - "duration_minutes": get_duration(journey), - "has_delay": delay > 0, - "canceled": is_canceled, - "route_details": route_details, - "stops_schedule": stops_schedule, - "direction": section.get("display_informations", {}).get("direction", ""), - "physical_mode": section.get("display_informations", {}).get("physical_mode", ""), - "train_num": get_train_num(journey), - } - - -class SncfAllTrainsLineSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): - """Sensor that aggregates all trains on a single line per attribute.""" - - _attr_has_entity_name = True - _attr_icon = "mdi:train" - _attr_attribution = ATTRIBUTION - - def __init__(self, coordinator: SncfUpdateCoordinator, train_id: str) -> None: - super().__init__(coordinator) - self.tid = train_id - self._attr_name = "Tous les trains (ligne)" - self._attr_unique_id = f"{train_id}_all_trains_line" - self._attr_device_info = { - "identifiers": {(DOMAIN, train_id)}, - "name": "SNCF", - "manufacturer": "Master13011", - "model": "API", - "entry_type": DeviceEntryType.SERVICE, - } - - @callback - def _handle_coordinator_update(self) -> None: - journeys = self.coordinator.data.get(self.tid, []) - departure_times = [] - delays = [] - overall_has_delay = False - - for journey in journeys: - section = journey.get("sections", [{}])[0] - dep_dt = parse_datetime(journey.get("departure_date_time", "")) - base_dep_dt = parse_datetime(section.get("base_departure_date_time")) - delay = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 - - departure_times.append(format_time(journey.get("departure_date_time", ""))) - delays.append(str(delay)) - if delay > 0: overall_has_delay = True - - self._attr_extra_state_attributes = { - "departure_time": "; ".join(departure_times), - "delay_minutes": "; ".join(delays), - "has_delay": overall_has_delay, - } - self._attr_native_value = len(journeys) - self.async_write_ha_state() \ No newline at end of file diff --git a/strings.json b/strings.json deleted file mode 100644 index fe26c0f..0000000 --- a/strings.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "config": { - "step": { - "user": { - "title": "Please set SNCF API Key" - } - }, - "error": { - "invalid_api_key": "API Key not found. Please retry." - }, - "abort": { - "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]" - } - }, - "options": { - "step": { - "init": { - "title": "Options", - "description": "Set updated and outside intervals", - "data": { - "update_interval": "Update interval (minutes)", - "outside_interval": "Outside interval (minutes)" - } - } - } - }, - "config_subentries": { - "train": { - "initiate_flow": { - "user": "Add journey", - "reconfigure": "Reconfigure a journey" - }, - "entry_type": "Train", - "step": { - "departure_city": { - "title": "Select departure city", - "data": { - "departure_city": "City name" - } - }, - "departure_station": { - "title": "Select departure station", - "data": { - "departure_station": "Station name" - } - }, - "arrival_city": { - "title": "Select arrival city", - "data": { - "departure_city": "City name" - } - }, - "arrival_station": { - "title": "Select arrival station", - "data": { - "departure_station": "Station name" - } - }, - "time_range": { - "title": "Range hours", - "data": { - "time_start": "Time start", - "time_end": "Time end", - "train_count": "Trains count" - } - }, - "reconfigure": { - "title": "Range hours", - "data": { - "time_start": "Time start", - "time_end": "Time end", - "train_count": "Trains count" - } - } - }, - "error": { - "no_stations": "No station for this city" - }, - "abort": { - "already_configured_as_entry": "Already train is configured", - "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]" - } - } - } -} \ No newline at end of file From ebd5279c5d333d5a60b9890056a09e38836531ea Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 00:48:25 +0200 Subject: [PATCH 07/23] alpha02 --- custom_components/sncf_trains/api.py | 6 +- custom_components/sncf_trains/config_flow.py | 11 +- custom_components/sncf_trains/const.py | 2 + custom_components/sncf_trains/coordinator.py | 12 +- custom_components/sncf_trains/manifest.json | 12 +- custom_components/sncf_trains/sensor.py | 129 ++-- .../sncf_trains/translations/fr.json | 6 +- .../sncf_trains/www/sncf-train-card.js | 659 +++++------------- 8 files changed, 271 insertions(+), 566 deletions(-) diff --git a/custom_components/sncf_trains/api.py b/custom_components/sncf_trains/api.py index eb05b86..9e8e191 100644 --- a/custom_components/sncf_trains/api.py +++ b/custom_components/sncf_trains/api.py @@ -22,7 +22,7 @@ def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): self._timeout = timeout async def fetch_departures( - self, stop_id: str, max_results: int = 20 # By default = 10 + self, stop_id: str, max_results: int = 20 #By default = 10 ) -> Optional[List[dict]]: if stop_id.startswith("stop_area:"): url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" @@ -64,7 +64,7 @@ async def fetch_departures( return None async def fetch_journeys( - self, from_id: str, to_id: str, datetime_str: str, count: int = 5 + self, from_id: str, to_id: str, datetime_str: str, count: int = 20 ) -> Optional[List[dict]]: url = f"{API_BASE}/v1/coverage/sncf/journeys" params_raw: dict[str, object] = { @@ -116,4 +116,4 @@ async def search_stations(self, query: str) -> Optional[List[dict]]: return data.get("places", []) except (ClientError, asyncio.TimeoutError) as err: _LOGGER.error("Network error searching stations from SNCF API: %s", err) - return None + return None \ No newline at end of file diff --git a/custom_components/sncf_trains/config_flow.py b/custom_components/sncf_trains/config_flow.py index 3014b36..2f2e1db 100644 --- a/custom_components/sncf_trains/config_flow.py +++ b/custom_components/sncf_trains/config_flow.py @@ -29,11 +29,13 @@ CONF_TRAIN_COUNT, CONF_UPDATE_INTERVAL, CONF_OUTSIDE_INTERVAL, + CONF_SHOW_ROUTE_DETAILS, # NOUVEAU DEFAULT_OUTSIDE_INTERVAL, DEFAULT_TIME_END, DEFAULT_TIME_START, DEFAULT_TRAIN_COUNT, DEFAULT_UPDATE_INTERVAL, + DEFAULT_SHOW_ROUTE_DETAILS, # NOUVEAU DOMAIN, ) @@ -250,6 +252,8 @@ async def async_step_time_range( }, unique_id=unique_id, ) + + # NOUVEAU: On ajoute l'option booléenne return self.async_show_form( step_id="time_range", data_schema=vol.Schema( @@ -257,6 +261,7 @@ async def async_step_time_range( vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, + vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=DEFAULT_SHOW_ROUTE_DETAILS): bool, } ), ) @@ -278,11 +283,15 @@ async def async_step_reconfigure( title=f"Trajet: {data[CONF_DEPARTURE_NAME]} → {data[CONF_ARRIVAL_NAME]} ({data[CONF_TIME_START]} - {data[CONF_TIME_END]})", ) + # NOUVEAU: On récupère l'ancienne valeur si elle existe + current_show_route = config_subentry.data.get(CONF_SHOW_ROUTE_DETAILS, DEFAULT_SHOW_ROUTE_DETAILS) + DATA_SCHEMA = vol.Schema( { vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, + vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=current_show_route): bool, } ) @@ -293,4 +302,4 @@ async def async_step_reconfigure( ), ) - async_step_user = async_step_departure_city + async_step_user = async_step_departure_city \ No newline at end of file diff --git a/custom_components/sncf_trains/const.py b/custom_components/sncf_trains/const.py index 74a05e1..545f277 100644 --- a/custom_components/sncf_trains/const.py +++ b/custom_components/sncf_trains/const.py @@ -9,6 +9,7 @@ DEFAULT_TRAIN_COUNT = 5 DEFAULT_TIME_START = "07:00" DEFAULT_TIME_END = "10:00" +DEFAULT_SHOW_ROUTE_DETAILS = False ATTRIBUTION = "Data provided by api.sncf.com" @@ -23,3 +24,4 @@ CONF_TIME_START = "time_start" CONF_TO = "to" CONF_TRAIN_COUNT = "train_count" +CONF_SHOW_ROUTE_DETAILS = "show_route_details" # NOUVEAU \ No newline at end of file diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index 04c6b75..91d64a2 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -64,15 +64,21 @@ async def _async_setup(self) -> None: raise UpdateFailed(err) from err def _build_datetime_param(self, time_start, time_end) -> str: - """Construit le paramètre datetime pour l'API.""" + """Construit le paramètre datetime pour l'API (ignore le passé).""" now = dt_util.now() h_start, m_start = map(int, time_start.split(":")) h_end, m_end = map(int, time_end.split(":")) + dt_start = now.replace(hour=h_start, minute=m_start, second=0, microsecond=0) dt_end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) if now > dt_end: + # Si on a dépassé la fin de la plage aujourd'hui, on cherche pour demain dt_start += timedelta(days=1) + elif now > dt_start: + # CORRECTION : Si on est PENDANT la plage horaire, on cherche à partir de MAINTENANT + # (On n'interroge plus les trains déjà passés !) + dt_start = now return dt_start.strftime("%Y%m%dT%H%M%S") @@ -142,7 +148,7 @@ async def _async_update_data(self) -> dict[str, Any]: for attempt in range(1, max_retries + 1): try: journeys = await self.api_client.fetch_journeys( - departure, arrival, datetime_str, count=20 #By deaults = 10 + departure, arrival, datetime_str, count=20 #By defaults = 10 ) if journeys is not None: break # succès, on sort du retry @@ -174,4 +180,4 @@ async def _async_update_data(self) -> dict[str, Any]: self.update_interval.total_seconds() / 60, ) - return trains + return trains \ No newline at end of file diff --git a/custom_components/sncf_trains/manifest.json b/custom_components/sncf_trains/manifest.json index a89ef6b..cef92cd 100644 --- a/custom_components/sncf_trains/manifest.json +++ b/custom_components/sncf_trains/manifest.json @@ -1,12 +1,16 @@ { "domain": "sncf_trains", "name": "SNCF Trains", - "after_dependencies": ["http"], + "after_dependencies": [ + "http" + ], "codeowners": [ "@Master13011" ], "config_flow": true, - "dependencies": ["frontend"], + "dependencies": [ + "frontend" + ], "documentation": "https://github.com/Master13011/SNCF-API-HA", "integration_type": "service", "iot_class": "cloud_polling", @@ -16,5 +20,5 @@ ], "requirements": [], "single_config_entry": true, - "version": "1.0.0" -} \ No newline at end of file + "version": "1.3.0" +} diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index 78adfc7..3518a57 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -45,15 +45,11 @@ async def async_setup_entry( # Capteur résumé ligne par ligne sensors.append(SncfAllTrainsLineSensor(coordinator, subentry.subentry_id)) - # Ajouter tous les capteurs de cette subentry au même niveau async_add_entities( sensors, config_subentry_id=subentry.subentry_id, update_before_add=True ) -# --- Sensor Classes --- - - class SncfJourneySensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): """Main SNCF sensor: number of direct journeys & summary.""" @@ -63,7 +59,6 @@ class SncfJourneySensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): _attr_native_unit_of_measurement = "trajets" def __init__(self, coordinator: SncfUpdateCoordinator) -> None: - """Initialize.""" super().__init__(coordinator) self._attr_unique_id = f"sncf_trains_{coordinator.entry.entry_id}" self._attr_device_info = { @@ -74,19 +69,10 @@ def __init__(self, coordinator: SncfUpdateCoordinator) -> None: "entry_type": DeviceEntryType.SERVICE, } self._attr_native_value = len(coordinator.data) - self._attr_extra_state_attributes = { - "update_interval": coordinator.update_interval_minutes, - "outside_interval": coordinator.outside_interval_minutes, - } @callback def _handle_coordinator_update(self) -> None: - """Handle updated data from the coordinator.""" self._attr_native_value = len(self.coordinator.data) - self._attr_extra_state_attributes = { - "update_interval": self.coordinator.update_interval_minutes, - "outside_interval": self.coordinator.outside_interval_minutes, - } self.async_write_ha_state() @@ -99,7 +85,6 @@ class SncfTrainSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): _attr_device_class = SensorDeviceClass.TIMESTAMP def __init__(self, coordinator, train_id: str, journey_id: int) -> None: - """Initialize the sensor.""" super().__init__(coordinator) self.tid = train_id self.jid = journey_id @@ -107,9 +92,7 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: journey = coordinator.data[train_id][journey_id] section = journey.get("sections", [{}])[0] departure_time = parse_datetime(section.get("base_departure_date_time", "")) - dep_name = entry.data[CONF_DEPARTURE_NAME] - arr_name = entry.data[CONF_ARRIVAL_NAME] - + self.departure = entry.data[CONF_FROM] self.arrival = entry.data[CONF_TO] @@ -118,7 +101,7 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: self._attr_extra_state_attributes = self._extra_attributes(journey) self._attr_device_info = { "identifiers": {(DOMAIN, entry.subentry_id)}, - "name": f"SNCF {dep_name} → {arr_name}", + "name": f"SNCF {entry.data[CONF_DEPARTURE_NAME]} → {entry.data[CONF_ARRIVAL_NAME]}", "manufacturer": "Master13011", "model": "API", "entry_type": DeviceEntryType.SERVICE, @@ -127,42 +110,86 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: @callback def _handle_coordinator_update(self) -> None: - """Handle updated data from the coordinator.""" journey = self.coordinator.data[self.tid][self.jid] section = journey.get("sections", [{}])[0] - self._attr_native_value = parse_datetime( - section.get("base_departure_date_time", "") - ) + self._attr_native_value = parse_datetime(section.get("base_departure_date_time", "")) self._attr_extra_state_attributes = self._extra_attributes(journey) self.async_write_ha_state() def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: - """Extra attributes.""" section = journey.get("sections", [{}])[0] + + # 1. Calcul du retard arr_dt = parse_datetime(journey.get("arrival_date_time", "")) base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) - delay = ( - int((arr_dt - base_arr_dt).total_seconds() / 60) - if arr_dt and base_arr_dt - else 0 - ) + delay_arr = int((arr_dt - base_arr_dt).total_seconds() / 60) if arr_dt and base_arr_dt else 0 + + dep_dt = parse_datetime(journey.get("departure_date_time", "")) + base_dep_dt = parse_datetime(section.get("base_departure_date_time")) + delay_dep = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 + + delay = max(delay_arr, delay_dep) + + # 2. Détection d'annulation et Cause + status = journey.get("status", "") + section_status = section.get("status", "") + is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") + + # Extraction de la cause du retard/problème + delay_cause = section.get("cause", "") + if not delay_cause: + # On cherche dans les messages de perturbation globaux + messages = journey.get("messages", []) + if messages: + delay_cause = messages[0].get("text", "") + + # 3. Plan de vol structuré avec détection des modifications (added/deleted) + stops_schedule = [] + route_details = "" + show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) + + if show_routes: + stops_data = section.get("stop_date_times", []) + stops_list = [] + for stop in stops_data: + stop_name = stop.get("stop_point", {}).get("name", "") + # On récupère l'horaire réel + raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) + formatted_time = format_time(raw_time) if raw_time else "" + + # Détection du statut de l'arrêt + stop_effect = stop.get("stop_time_effect", "unchanged") # added, deleted, delayed, unchanged + + if stop_name and formatted_time: + prefix = "" + if stop_effect == "deleted": prefix = "[SUPPRIMÉ] " + if stop_effect == "added": prefix = "[NOUVEAU] " + + stops_list.append(f"{prefix}{stop_name} ({formatted_time})") + + just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time + stops_schedule.append({ + "name": stop_name, + "time": just_time, + "effect": stop_effect + }) + + route_details = " ➔ ".join(stops_list) + return { "departure_time": format_time(journey.get("departure_date_time", "")), "arrival_time": format_time(journey.get("arrival_date_time", "")), "base_departure_time": format_time(section.get("base_departure_date_time")), - "base_arrival_time": format_time(section.get("base_arrival_date_time")), + "base_arrival_time": format_time(section.get("base_arrival_time")), "delay_minutes": delay, + "delay_cause": delay_cause, "duration_minutes": get_duration(journey), "has_delay": delay > 0, - "departure_stop_id": self.departure, - "arrival_stop_id": self.arrival, + "canceled": is_canceled, + "route_details": route_details, + "stops_schedule": stops_schedule, "direction": section.get("display_informations", {}).get("direction", ""), - "physical_mode": section.get("display_informations", {}).get( - "physical_mode", "" - ), - "commercial_mode": section.get("display_informations", {}).get( - "commercial_mode", "" - ), + "physical_mode": section.get("display_informations", {}).get("physical_mode", ""), "train_num": get_train_num(journey), } @@ -175,7 +202,6 @@ class SncfAllTrainsLineSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEn _attr_attribution = ATTRIBUTION def __init__(self, coordinator: SncfUpdateCoordinator, train_id: str) -> None: - """Initialize the line sensor.""" super().__init__(coordinator) self.tid = train_id self._attr_name = "Tous les trains (ligne)" @@ -190,40 +216,25 @@ def __init__(self, coordinator: SncfUpdateCoordinator, train_id: str) -> None: @callback def _handle_coordinator_update(self) -> None: - """Update all trains values on a single line.""" journeys = self.coordinator.data.get(self.tid, []) departure_times = [] - base_departure_times = [] delays = [] overall_has_delay = False for journey in journeys: section = journey.get("sections", [{}])[0] - arr_dt = parse_datetime(journey.get("arrival_date_time", "")) - base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) - delay = ( - int((arr_dt - base_arr_dt).total_seconds() / 60) - if arr_dt and base_arr_dt - else 0 - ) + dep_dt = parse_datetime(journey.get("departure_date_time", "")) + base_dep_dt = parse_datetime(section.get("base_departure_date_time")) + delay = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 departure_times.append(format_time(journey.get("departure_date_time", ""))) - base_departure_times.append( - format_time(section.get("base_departure_date_time")) - ) delays.append(str(delay)) - - if delay > 0: - overall_has_delay = True + if delay > 0: overall_has_delay = True self._attr_extra_state_attributes = { "departure_time": "; ".join(departure_times), - "base_departure_time": "; ".join(base_departure_times), "delay_minutes": "; ".join(delays), "has_delay": overall_has_delay, } - - # On peut mettre un "native_value" arbitraire, par exemple le nombre de trains self._attr_native_value = len(journeys) - - self.async_write_ha_state() + self.async_write_ha_state() \ No newline at end of file diff --git a/custom_components/sncf_trains/translations/fr.json b/custom_components/sncf_trains/translations/fr.json index ece14a1..9b73d42 100644 --- a/custom_components/sncf_trains/translations/fr.json +++ b/custom_components/sncf_trains/translations/fr.json @@ -66,7 +66,8 @@ "data": { "time_start": "Heure de départ", "time_end": "Heure d'arrivé", - "train_count": "Nombre de trains" + "train_count": "Nombre de trains", + "show_route_details": "Afficher les arrêts intermédiaires" } }, "reconfigure": { @@ -74,7 +75,8 @@ "data": { "time_start": "Heure de départ", "time_end": "Heure d'arrivé", - "train_count": "Nombre de trains" + "train_count": "Nombre de trains", + "show_route_details": "Afficher les arrêts intermédiaires" } } }, diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index 5e27af0..094a97c 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -1,513 +1,184 @@ // Ajouter au registre des cartes personnalisées -(window.customCards = window.customCards || []).push({ +window.customCards = window.customCards || []; +window.customCards.push({ type: 'sncf-train-card', name: 'SNCF Train Card', - description: 'Carte personnalisée animée pour afficher les trains SNCF en temps réel' + preview: true, + description: 'V3.3 - Radar de ligne avec badges textuels et alertes Orange/Rouge.' }); -class SncfTrainCard extends HTMLElement { - constructor() { - super(); - this.attachShadow({ mode: 'open' }); - this.updateInterval = null; - this.lastTrainSignature = null; - this._lastRenderTime = 0; - } - - setConfig(config) { - if (!config.device_id) { - throw new Error('You need to define device_id'); - } - - const previousDeviceId = this.config ? this.config.device_id : null; - const deviceIdChanged = previousDeviceId && previousDeviceId !== config.device_id; - - this.config = { - device_id: config.device_id, - train_lines: config.train_lines || 3, - title: config.title || 'Trains SNCF', - train_emoji: config.train_emoji || '🚅', - train_emoji_axial_symmetry: config.train_emoji_axial_symmetry || true, - train_station_emoji: config.train_station_emoji || '🚉', - animation_duration: config.animation_duration || 30, - update_interval: config.update_interval || 30000, - ...config - }; - - // Forcer la mise à jour immédiate si device_id a changé - if (deviceIdChanged) { - this.stopUpdateTimer(); - this.startUpdateTimer(); - } - - // Toujours forcer un nouveau rendu - this.render(); - } - - set hass(hass) { - const previousHass = this._hass; - this._hass = hass; - - // Vérifier si les données des trains ont changé - if (this.config && previousHass) { - this.checkForTrainUpdates(previousHass, hass); - } else { - this.render(); - } - } - - async checkForTrainUpdates(previousHass, currentHass) { - try { - // Récupérer les entités actuelles - const currentTrains = await this.getTrainEntities(); - - // Créer une signature des données actuelles - const currentSignature = this.createTrainSignature(currentTrains); - - // Comparer avec la signature précédente - if (currentSignature !== this.lastTrainSignature) { - this.lastTrainSignature = currentSignature; - this.render(); - } - } catch (error) { - // En cas d'erreur, faire un rendu quand même - this.render(); - } - } - - createTrainSignature(trains) { - return trains.map(train => - `${train.entity_id}:${train.attributes.departure_time}:${train.attributes.delay_minutes || 0}:${train.attributes.has_delay || false}` - ).join('|'); - } - - connectedCallback() { - this.startUpdateTimer(); - } - - disconnectedCallback() { - this.stopUpdateTimer(); +// --- CLASSE DE L'ÉDITEUR VISUEL --- +class SncfTrainCardEditor extends HTMLElement { + constructor() { super(); this.attachShadow({ mode: 'open' }); } + setConfig(config) { this._config = { ...config }; this.render(); } + render() { + if (!this._config) return; + this.shadowRoot.innerHTML = ` +
+
+
+
+
+
+
+
+
+
+
+
+
+ `; + this.shadowRoot.querySelectorAll('input').forEach(input => { + input.addEventListener('change', this.valueChanged.bind(this)); + }); } - - startUpdateTimer() { - this.stopUpdateTimer(); - this.updateInterval = setInterval(async () => { - if (this._hass) { - // Force un nouveau rendu à intervalles réguliers pour capturer les changements - this._lastRenderTime = 0; // Reset du throttle - await this.render(); - } - }, this.config.update_interval); + valueChanged(ev) { + const target = ev.target; + let value = target.type === 'checkbox' ? target.checked : (target.type === 'number' ? Number(target.value) : target.value); + this._config = { ...this._config, [target.id]: value }; + this.dispatchEvent(new CustomEvent('config-changed', { detail: { config: this._config }, bubbles: true, composed: true })); } +} +customElements.define('sncf-train-card-editor', SncfTrainCardEditor); - stopUpdateTimer() { - if (this.updateInterval) { - clearInterval(this.updateInterval); - this.updateInterval = null; - } - } +// --- CLASSE DE LA CARTE PRINCIPALE --- +class SncfTrainCard extends HTMLElement { + constructor() { super(); this.attachShadow({ mode: 'open' }); } + static getConfigElement() { return document.createElement("sncf-train-card-editor"); } + setConfig(config) { this.config = { title: "Trains SNCF", train_emoji: "🚅", train_station_emoji: "🚉", animation_duration: 30, use_real_duration: true, speed_factor: 2, ...config }; } + set hass(hass) { this._hass = hass; this.render(); } async getTrainEntities() { - if (!this._hass) return []; - + if (!this._hass || !this.config.device_id) return []; try { - // Utiliser l'API Home Assistant pour récupérer toutes les entités - const allEntityRegistry = await this._hass.callWS({ - type: 'config/entity_registry/list' - }); - - // Filtrer les entités par device_id - const deviceEntities = allEntityRegistry.filter(entityInfo => - entityInfo.device_id === this.config.device_id - ); - - if (!deviceEntities || deviceEntities.length === 0) { - console.warn('⚠️ Aucune entité trouvée pour ce device_id dans le registre'); - return []; - } - - // Récupérer les états des entités train trouvées avec données fraîches - const trainEntities = deviceEntities - .filter(entityInfo => entityInfo.entity_id.includes('train')) - .map(entityInfo => { - // Forcer la récupération de l'état frais - const freshState = this._hass.states[entityInfo.entity_id]; - return freshState; - }) - .filter(entity => entity && entity.attributes && entity.attributes.departure_time); - - // Filtrer les trains qui ne sont pas encore passés + const allReg = await this._hass.callWS({ type: 'config/entity_registry/list' }); + const deviceEntities = allReg.filter(e => e.device_id === this.config.device_id); + const trainEntities = deviceEntities.filter(e => e.entity_id.includes('train')) + .map(e => this._hass.states[e.entity_id]).filter(e => e && e.attributes && e.attributes.departure_time); + const now = new Date(); + return trainEntities.filter(e => this.parseTime(e.attributes.departure_time) >= now) + .sort((a, b) => this.parseTime(a.attributes.departure_time) - this.parseTime(b.attributes.departure_time)) + .slice(0, this.config.train_lines || 3); + } catch (e) { return []; } + } + + parseTime(t) { + if (!t || !t.includes(' - ')) return new Date(t || 0); + const p = t.split(' - '), d = p[0].split('/'), h = p[1].split(':'); + return new Date(d[2], d[1]-1, d[0], h[0], h[1]); + } + + render() { + if (!this._hass || !this.config) return; + this.getTrainEntities().then(trains => { const currentTime = new Date(); - const upcomingTrains = trainEntities.filter(entity => { - const departureTime = this.parseTime(entity.attributes.departure_time); - return departureTime >= currentTime; - }); - - const sortedEntities = upcomingTrains - .sort((a, b) => { - const aTime = this.parseTime(a.attributes.departure_time); - const bTime = this.parseTime(b.attributes.departure_time); - return aTime - bTime; - }) - .slice(0, this.config.train_lines); - - return sortedEntities; - - } catch (error) { - console.error('❌ Erreur lors de la récupération via API:', error); - return []; - } - } - - // Méthode pour parser correctement le format SNCF - parseTime(departureTime) { - if (!departureTime) { - return new Date(0); - } - - // Format SNCF: "19/11/2025 - 08:20" - if (departureTime.includes('/') && departureTime.includes(' - ')) { - const parts = departureTime.split(' - '); - if (parts.length === 2) { - const datePart = parts[0]; // "19/11/2025" - const timePart = parts[1]; // "08:20" - - const dateComponents = datePart.split('/'); - if (dateComponents.length === 3) { - const day = parseInt(dateComponents[0]); - const month = parseInt(dateComponents[1]) - 1; // Mois 0-indexé - const year = parseInt(dateComponents[2]); - - const timeComponents = timePart.split(':'); - if (timeComponents.length === 2) { - const hour = parseInt(timeComponents[0]); - const minute = parseInt(timeComponents[1]); - - return new Date(year, month, day, hour, minute); - } - } - } - } - - // Fallback vers Date classique - return new Date(departureTime); - } - - calculateTrainPosition(departureTime, currentTime) { - if (!departureTime) { - return -10; - } - - const departure = this.parseTime(departureTime); - - if (isNaN(departure.getTime())) { - return -10; - } - - const now = currentTime || new Date(); - const diffMinutes = (departure - now) / (1000 * 60); - - // Train apparaît 30 minutes avant l'heure - const maxMinutes = this.config.animation_duration; - - if (diffMinutes > maxMinutes) { - return -10; // Hors de la barre - } - if (diffMinutes <= 0) { - return 100; // Arrivé à la gare - } - - // Position sur la barre (0% = gauche, 100% = droite) - return ((maxMinutes - diffMinutes) / maxMinutes) * 100; - } - - formatTime(timeString) { - if (!timeString) { - return 'N/A'; - } - - const time = this.parseTime(timeString); - - if (isNaN(time.getTime())) { - return 'Format invalide'; - } - - const result = time.toLocaleTimeString('fr-FR', { - hour: '2-digit', - minute: '2-digit' - }); - - return result; - } - - calculateRealArrivalTime(departureTime, delayMinutes) { - if (!departureTime || !delayMinutes || delayMinutes === 0) { - return null; - } - - const originalTime = this.parseTime(departureTime); - const realTime = new Date(originalTime.getTime() + (delayMinutes * 60000)); // Ajouter les minutes de retard - - return realTime.toLocaleTimeString('fr-FR', { - hour: '2-digit', - minute: '2-digit' - }); - } - - getTrainColor(delayMinutes, hasDelay) { - if (!hasDelay || delayMinutes === 0) return '#4caf50'; // Vert à l'heure - return '#f44336'; // Rouge en retard (peu importe le nombre de minutes) - } - - async render() { - if (!this._hass || !this.config) { - return; - } - - // Éviter les rendus trop fréquents (max 1 par seconde) - const now = Date.now(); - if (now - this._lastRenderTime < 1000) { - return; - } - this._lastRenderTime = now; - - const trains = await this.getTrainEntities(); - - if (trains.length === 0) { - this.shadowRoot.innerHTML = ` - -
-
Aucun train trouvé pour ce device. Vérifiez la configuration.
-
- - `; - return; - } - - const currentTime = new Date(); - - const trainLinesHTML = this.renderTrainLines(trains, currentTime); - this.shadowRoot.innerHTML = ` - - - -
-
-
${this.config.title}
-
- - ${trainLinesHTML} - -
- - `; - } - - renderTrainLines(trains, currentTime) { - return trains.map((train, index) => { - const position = this.calculateTrainPosition(train.attributes.departure_time, currentTime); - const delayMinutes = train.attributes.delay_minutes || 0; - const hasDelay = train.attributes.has_delay || false; - const trainColor = this.getTrainColor(delayMinutes, hasDelay); - const formattedTime = this.formatTime(train.attributes.departure_time); - const realArrivalTime = this.calculateRealArrivalTime(train.attributes.departure_time, delayMinutes); - - const html = ` -
-
- ${position >= 0 && position <= 100 ? ` -
- ${this.config.train_emoji} -
- ` : ` - - `} -
- -
-
${this.config.train_station_emoji}
-
-
- ${hasDelay && realArrivalTime ? ` -
${formattedTime}
-
${realArrivalTime}
- ` : ` -
${formattedTime}
- `} + const trainLinesHTML = trains.map(train => { + const attrs = train.attributes; + const dep = this.parseTime(attrs.departure_time); + const diff = (dep - currentTime) / 60000; + const max = this.config.animation_duration || 30; + const pos = diff > max ? -10 : (diff <= 0 ? 100 : ((max - diff) / max) * 100); + const hasDelay = attrs.has_delay || false; + const isCanceled = attrs.canceled || false; + + let animDur = this.config.use_real_duration && attrs.duration_minutes ? + attrs.duration_minutes * (this.config.speed_factor || 2) : this.config.animation_duration; + + let timelineHTML = ''; + if (this.config.show_route_details && attrs.stops_schedule) { + timelineHTML = `
` + + attrs.stops_schedule.map(s => { + let statusBadge = ""; + if (s.effect === 'deleted') statusBadge = ' SUPPRIMÉ'; + else if (s.effect === 'added') statusBadge = ' RAJOUTÉ'; + + return ` +
+
+
${s.time}
+
+ ${s.name}${statusBadge} +
+
`; + }).join('') + `
`; + } + + const timeOnly = (t) => t ? t.split(' - ')[1] : "--:--"; + + return ` +
+
+
+
+ ${isCanceled ? '❌' : this.config.train_emoji} +
-
- ${hasDelay ? `+${delayMinutes}min` : 'À l\'heure'} +
+
${this.config.train_station_emoji}
+
+
${hasDelay ? `${timeOnly(attrs.base_departure_time)}${timeOnly(attrs.departure_time)}` : timeOnly(attrs.departure_time)}
+
+ ${isCanceled ? 'ANNULÉ' : (hasDelay ? `+${attrs.delay_minutes}min` : 'À l\'heure')} +
+ ${attrs.delay_cause ? `
${attrs.delay_cause}
` : ''} +
-
-
- `; - - return html; - }).join(''); - } + ${timelineHTML} +
`; + }).join(''); - getCardSize() { - return Math.max(3, this.config.train_lines + 1); + this.shadowRoot.innerHTML = ` + +
${this.config.title}
${trainLinesHTML}`; + }); } } - -// Définir l'élément custom customElements.define('sncf-train-card', SncfTrainCard); \ No newline at end of file From ef4bfccf17850a744f2c62f2816aace8ab3b8102 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 00:57:28 +0200 Subject: [PATCH 08/23] Create README.md --- README.md | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 237 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6ccee08 --- /dev/null +++ b/README.md @@ -0,0 +1,237 @@ +# ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT + +> [!CAUTION] +> **Ce projet est actuellement en phase de développement intensif.** +> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version du `sensor.py` et de la `sncf-train-card.js` pour une compatibilité totale. + +--- + +### 🚀 Dernières mises à jour ferroviaires (20 Avril 2026) + +Le système a été lourdement modifier : + +* **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601) pour un affichage synchronisé avec le temps réel de Home Assistant. +* **📡 Radar de Ligne Avancé :** Intégration d'un "thermomètre de ligne" dynamique affichant tous les arrêts intermédiaires directement sur la carte. **⚠️ Ce paramètre est désactivé par défaut pour alléger l'affichage.** +* **🔍 Analyse des Perturbations :** * Extraction de la **cause officielle** du retard (ex: intervention, panne matériel). + * **[BÊTA]** Détection des **arrêts supprimés** (`deleted`) ou **exceptionnels** (`added`). + > *Note : Cette fonctionnalité est en cours de validation technique. N'ayant pas encore subi de suppression réelle durant les tests, le rendu visuel est basé sur les spécifications de l'API SNCF et attend une confirmation "en conditions réelles".* + +--- + +### 📸 Aperçu Visuel + +| Version Précédente (Épurée) | Nouvelle Version (Radar de Ligne) | +| :---: | :---: | +| Avant | Maintenant | + +> *Note : Le radar de ligne affiche désormais tous les arrêts intermédiaires, mais peut être désactivé dans les options pour retrouver le design minimaliste.* + + +![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) +![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) +![Licence MIT](https://img.shields.io/badge/Licence-MIT-green) + +Suivez les horaires des trains SNCF entre deux gares dans Home Assistant, grâce à l’API officielle [SNCF](https://www.digital.sncf.com/startup/api). +Départ / arrivée, retards, durée, mode (TER…), tout est intégré dans une interface configurable et traduite. + +> ⚠️ Ne prend pas en compte les trains supprimés. + +--- + +## 📦 Installation + +### 1. Via HACS (recommandé) + +> Nécessite HACS installé dans Home Assistant + +1. Aller dans **HACS** +2. Chercher **SNCF Trains** +3. Installer puis redémarrer Home Assistant + +### 2. Manuel (sans HACS) + +1. Télécharger le contenu du dépôt +2. Copier le dossier `sncf_trains` dans `config/custom_components/` +3. Redémarrer Home Assistant + +--- + +## ⚙️ Configuration + +1. Aller dans **Paramètres → Appareils & services → Ajouter une intégration** +2. Rechercher **SNCF Trains** +3. Suivre les étapes : + - Clé API SNCF +4. Ajouter un trajet : + - Ville et gare de départ + - Ville et gare d'arrivée + - Plage horaire à surveiller + +Plusieurs trajets peuvent être configurés séparément. + +--- + +## 🧩 Options dynamiques + +### Intégration principale (Configurer) + +- ⏱ Intervalle de mise à jour **pendant** la plage horaire +- 🕰 Intervalle **hors** plage horaire + +### Par trajet (Reconfigurer un trajet) + +- 🚆 Nombre de trains affichés +- 🕗 Heures de début et fin de surveillance + +✅ Aucun redémarrage requis. Les modifications sont appliquées dynamiquement. + +--- + +## 🔐 Clé API SNCF + +Obtenez votre clé ici : [https://www.digital.sncf.com/startup/api](https://www.digital.sncf.com/startup/api) + +1. Créez un compte ou connectez-vous +2. Générez une clé API gratuite +3. Utilisez-la lors de la configuration (limite de 5 000 requêtes par jour) + +> Pour changer de clé, cliquer sur **Reconfigurer** dans l'intégration. + +--- + +## ⚙️ Variables de l'intégration + +| Nom | Description | +|-----|-------------| +| `update_interval` | Intervalle de mise à jour **pendant** la plage horaire (défaut : 2 min) | +| `outside_interval` | Intervalle **hors** plage horaire (défaut : 60 min) | +| `train_count` | Nombre de trains à afficher | +| `time_start` / `time_end` | Plage horaire de surveillance (ex. : `06:00` → `09:00`) | + +> 🕑 L'intervalle actif s'active automatiquement **2h avant** le début de plage. + +--- + +## 📊 Capteurs créés + +- `sensor.sncf__` — capteur principal du trajet +- `sensor.sncf_train_X__` — capteur par train +- `calendar.trains` — calendrier des prochains départs +- `sensor.sncf_tous_les_trains_ligne_X` + +### Attributs du capteur principal + +- Nombre de trajets +- Informations les inervalles + +### Capteurs secondaires (enfants) pour chaque train + +- Heure de départ (`device_class: timestamp`) +- Heure d’arrivée +- Retard estimé +- Durée totale (`duration_minutes`) +- Mode, direction, numéro + +--- + +## 🎨 Carte Lovelace — SNCF Train Card + +La carte `sncf-train-card` est **automatiquement disponible** dans le sélecteur de cartes dès l'installation de l'intégration. + +### Ajouter la carte + +Dans un tableau de bord, cliquer sur **+ Ajouter une carte** → chercher **SNCF Train Card**. + +Ou en YAML : + +```yaml +type: custom:sncf-train-card +device_id: VOTRE_DEVICE_ID +``` + +### 🔍 Trouver le `device_id` + +Le `device_id` correspond à l'appareil créé lors de la configuration du trajet. + +1. Aller dans **Paramètres → Appareils & services → SNCF Trains** +2. Cliquer sur le trajet souhaité +3. L'URL contient l'identifiant : `.../config/devices/device/XXXX` + +> ![Exemple d'identifiant](./assets/device_id_url.png) + +### ⚙️ Paramètres de la carte + +| Paramètre | Type | Défaut | Description | +|-----------|------|--------|-------------| +| `device_id` | `string` | **obligatoire** | Identifiant de l'appareil SNCF (voir ci-dessus) | +| `title` | `string` | `'Trains SNCF'` | Titre affiché en haut de la carte | +| `train_lines` | `number` | `3` | Nombre de trains affichés simultanément | +| `train_emoji` | `string` | `'🚅'` | Emoji du train animé sur la barre de progression | +| `train_emoji_axial_symmetry` | `boolean` | `true` | Retourne l'emoji (à utiliser selon son sens) | +| `train_station_emoji` | `string` | `'🚉'` | Emoji affiché à côté des gares | +| `animation_duration` | `number` | `30` | Nombre de minutes avant l'arrivée en gare à partir duquel l'animation du train se déclenche (ex : `30` = animation active dans les 30 dernières minutes, `60` = dans la dernière heure) | +| `update_interval` | `number` | `30000` | Intervalle de rafraîchissement de la carte en **millisecondes** | + +### Exemple complet + +```yaml +type: custom:sncf-train-card +device_id: abc123def456 +title: "Paris → Lyon" +train_lines: 4 +train_emoji: "🚆" +train_emoji_axial_symmetry: true +train_station_emoji: "🏙️" +animation_duration: 45 +update_interval: 60000 +``` + +### Exemple d'affichage + +![Exemple d'affichage](./assets/card_example.png) + +--- + +## 📸 Aperçus + +**Carte capteur :** + +sensor + +**Détails du prochain train :** + +image + +**Dashboard Lovelace :** + +dashboard + +--- + +## 🛠 Développement + +Compatible avec Home Assistant `2025.8+`. + +Structure : +- `__init__.py` : enregistrement de l'intégration et de la carte Lovelace +- `calendar.py` : calendrier +- `config_flow.py` : assistant UI de configuration +- `options_flow.py` : formulaire d’options dynamiques +- `sensor.py` : entités de capteurs +- `coordinator.py` : logique de récupération intelligente +- `translations/fr.json` : interface en français +- `manifest.json` : métadonnées et dépendances +- `www/sncf-train-card.js` : carte Lovelace personnalisée + +--- + +## 👨‍💻 Auteur + +Développé par [Master13011](https://github.com/Master13011) +Contributions bienvenues via **Pull Request** ou **Issues** + +--- + +## 📄 Licence + +Code open-source sous licence **MIT** From 7846bc178750eb221968e4bb1101c1d93572940c Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 01:04:25 +0200 Subject: [PATCH 09/23] Update README.md --- README.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6ccee08..3a77fd0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT +# 🚄 Intégration SNCF Trains pour Home Assistant > [!CAUTION] > **Ce projet est actuellement en phase de développement intensif.** @@ -6,15 +7,16 @@ --- -### 🚀 Dernières mises à jour ferroviaires (20 Avril 2026) +### 🚀 Dernières mises à jour ferroviaires (Avril 2026) -Le système a été lourdement modifier : +Le système a été lourdement modifié pour offrir une précision de niveau "PC de Crise SNCF" : -* **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601) pour un affichage synchronisé avec le temps réel de Home Assistant. -* **📡 Radar de Ligne Avancé :** Intégration d'un "thermomètre de ligne" dynamique affichant tous les arrêts intermédiaires directement sur la carte. **⚠️ Ce paramètre est désactivé par défaut pour alléger l'affichage.** -* **🔍 Analyse des Perturbations :** * Extraction de la **cause officielle** du retard (ex: intervention, panne matériel). - * **[BÊTA]** Détection des **arrêts supprimés** (`deleted`) ou **exceptionnels** (`added`). - > *Note : Cette fonctionnalité est en cours de validation technique. N'ayant pas encore subi de suppression réelle durant les tests, le rendu visuel est basé sur les spécifications de l'API SNCF et attend une confirmation "en conditions réelles".* +* **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601). +* **📡 Radar de Ligne (V3.3) :** Intégration d'un "thermomètre de ligne" dynamique avec détection des **badges d'arrêts supprimés** ou **exceptionnels**. ⚠️ *Ce paramètre est désactivé par défaut.* +* **🎭 Moteur d'Animation Dynamique :** Possibilité de synchroniser la vitesse de l'emoji train sur la durée réelle du trajet (`duration_minutes`). +* **🔍 Analyse des Perturbations :** * Extraction de la **cause officielle** du retard (ex: Panne de signalisation, Défaut d'alimentation). + * Gestion visuelle des **Annulations** (croix rouge et rail d'alerte). + * Code couleur intelligent : **Orange** pour les retards, **Rouge** pour les suppressions. --- @@ -22,7 +24,8 @@ Le système a été lourdement modifier : | Version Précédente (Épurée) | Nouvelle Version (Radar de Ligne) | | :---: | :---: | -| Avant | Maintenant | +| Avant | Maintenant | + > *Note : Le radar de ligne affiche désormais tous les arrêts intermédiaires, mais peut être désactivé dans les options pour retrouver le design minimaliste.* From 199d04f990fd76e572db82ee446dc7ea08a295ca Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 08:45:23 +0200 Subject: [PATCH 10/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a77fd0..47e0b9e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ### 🚀 Dernières mises à jour ferroviaires (Avril 2026) -Le système a été lourdement modifié pour offrir une précision de niveau "PC de Crise SNCF" : +Le système a été lourdement modifié : * **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601). * **📡 Radar de Ligne (V3.3) :** Intégration d'un "thermomètre de ligne" dynamique avec détection des **badges d'arrêts supprimés** ou **exceptionnels**. ⚠️ *Ce paramètre est désactivé par défaut.* From 2847ca7a9a4ac3643610697e9566c79a20c52927 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 09:47:55 +0200 Subject: [PATCH 11/23] Rajout des fichiers manquans Rajout des fichiers manquant. --- .github/workflows/lint.yml | 42 ++ .github/workflows/release.yaml | 35 + .github/workflows/validate-for-hacs.yml | 19 + .github/workflows/validate-with-hassfest.yml | 16 + LICENSE | 661 +++++++++++++++++++ exemple_automatisation | 164 +++++ exemple_dashboard | 44 ++ hacs.json | 9 + requirements.txt | 9 + 9 files changed, 999 insertions(+) create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/release.yaml create mode 100644 .github/workflows/validate-for-hacs.yml create mode 100644 .github/workflows/validate-with-hassfest.yml create mode 100644 LICENSE create mode 100644 exemple_automatisation create mode 100644 exemple_dashboard create mode 100644 hacs.json create mode 100644 requirements.txt diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..e6f56e6 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,42 @@ +name: "Lint" + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + +jobs: + ruff: + name: "Ruff" + runs-on: "ubuntu-latest" + steps: + - name: "Checkout the repository" + uses: "actions/checkout@v6.0.1" + + - name: "Set up Python" + uses: actions/setup-python@v6.1.0 + with: + python-version: "3.13" + cache: "pip" + + - name: "Install requirements" + run: python3 -m pip install -r requirements.txt types-pytz + + - name: "Lint" + run: python3 -m ruff check . + + - name: "Format" + run: python3 -m ruff format . + + - name: "Run Black" + run: black --check . + + - name: "Run Mypy" + run: | + mypy . || echo "Mypy finished with errors but continuing" + + - name: "Pylint" + run: pylint custom_components || true diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..2da9b2f --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,35 @@ +name: "Release" + +on: + release: + types: + - "published" + +permissions: {} + +jobs: + release: + name: "Release" + runs-on: "ubuntu-latest" + permissions: + contents: write + steps: + - name: "Checkout the repository" + uses: "actions/checkout@v6.0.1" + + - name: "Adjust version number" + shell: "bash" + run: | + yq -i -o json '.version="${{ github.event.release.tag_name }}"' \ + "${{ github.workspace }}/custom_components/sncf_trains/manifest.json" + + - name: "ZIP the integration directory" + shell: "bash" + run: | + cd "${{ github.workspace }}/custom_components/sncf_trains" + zip sncf_trains_ha.zip -r ./ + + - name: "Upload the ZIP file to the release" + uses: softprops/action-gh-release@v2.5.0 + with: + files: ${{ github.workspace }}/custom_components/sncf_trains/sncf_trains_ha.zip diff --git a/.github/workflows/validate-for-hacs.yml b/.github/workflows/validate-for-hacs.yml new file mode 100644 index 0000000..4d9e6d6 --- /dev/null +++ b/.github/workflows/validate-for-hacs.yml @@ -0,0 +1,19 @@ +name: Validate for HACS + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + +jobs: + validate-hacs: + runs-on: "ubuntu-latest" + steps: + - uses: "actions/checkout@v6" + - name: HACS validation + uses: "hacs/action@main" + with: + category: "integration" diff --git a/.github/workflows/validate-with-hassfest.yml b/.github/workflows/validate-with-hassfest.yml new file mode 100644 index 0000000..2770d1a --- /dev/null +++ b/.github/workflows/validate-with-hassfest.yml @@ -0,0 +1,16 @@ +name: Validate with hassfest + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + +jobs: + validate-hassfest: + runs-on: "ubuntu-latest" + steps: + - uses: "actions/checkout@v6" + - uses: "home-assistant/actions/hassfest@master" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0ad25db --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/exemple_automatisation b/exemple_automatisation new file mode 100644 index 0000000..e708fd2 --- /dev/null +++ b/exemple_automatisation @@ -0,0 +1,164 @@ +alias: Alerte Trains SNCF +description: "" +triggers: + - trigger: state + entity_id: + - sensor.sncf_tous_les_trains_ligne + - sensor.sncf_tous_les_trains_ligne_2 +conditions: + - condition: template + value_template: | + {{ state_attr('sensor.sncf_tous_les_trains_ligne', 'has_delay') == true + or state_attr('sensor.sncf_tous_les_trains_ligne_2', 'has_delay') == true }} +actions: + - choose: + - conditions: + - condition: or + conditions: + - condition: template + value_template: | + {% set dep = state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', + 'departure_time' + ).split(' - ')[1] %} + {% set base = state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', + 'base_departure_time' + ).split(' - ')[1] %} + + {{ dep != base }} + - condition: state + entity_id: >- + sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2 + attribute: has_delay + state: "true" + sequence: + - data: + title: Train en retard ou supprimé + message: | + Le train de {{ + state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', + 'base_departure_time' + ).split(' - ')[1] + }} n'est pas à l'heure. + Départ prévu : {{ + state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_2', + 'departure_time' + ).split(' - ')[1] + }} + action: notify.notify + - conditions: + - condition: or + conditions: + - condition: template + value_template: | + {% set dep = state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', + 'departure_time' + ).split(' - ')[1] %} + {% set base = state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', + 'base_departure_time' + ).split(' - ')[1] %} + + {{ dep != base }} + - condition: state + entity_id: >- + sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3 + attribute: has_delay + state: "true" + sequence: + - data: + title: Train en retard ou supprimé + message: | + Le train de {{ + state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', + 'base_departure_time' + ).split(' - ')[1] + }} n'est pas à l'heure. + Départ prévu : {{ + state_attr( + 'sensor.sncf_nice_riquier_nice_monaco_monte_carlo_monaco_train_3', + 'departure_time' + ).split(' - ')[1] + }} + action: notify.notify + - conditions: + - condition: or + conditions: + - condition: template + value_template: | + {% set dep = state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', + 'departure_time' + ).split(' - ')[1] %} + {% set base = state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', + 'base_departure_time' + ).split(' - ')[1] %} + + {{ dep != base }} + - condition: state + entity_id: >- + sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2 + attribute: has_delay + state: + - "true" + sequence: + - data: + title: Train en retard ou supprimé + message: | + Le train de {{ + state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', + 'base_departure_time' + ).split(' - ')[1] + }} n'est pas à l'heure. + Départ prévu : {{ + state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_2', + 'departure_time' + ).split(' - ')[1] + }} + action: notify.notify + - conditions: + - condition: or + conditions: + - condition: template + value_template: | + {% set dep = state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', + 'departure_time' + ).split(' - ')[1] %} + {% set base = state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', + 'base_departure_time' + ).split(' - ')[1] %} + + {{ dep != base }} + - condition: state + entity_id: >- + sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3 + attribute: has_delay + state: + - "true" + sequence: + - data: + title: Train en retard ou supprimé + message: | + Le train de {{ + state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', + 'base_departure_time' + ).split(' - ')[1] + }} n'est pas à l'heure. + Départ prévu : {{ + state_attr( + 'sensor.sncf_monaco_monte_carlo_monaco_nice_riquier_nice_train_3', + 'departure_time' + ).split(' - ')[1] + }} + action: notify.notify diff --git a/exemple_dashboard b/exemple_dashboard new file mode 100644 index 0000000..cb28888 --- /dev/null +++ b/exemple_dashboard @@ -0,0 +1,44 @@ +type: markdown +content: | + ### 🚄 Départs XX → XX + {% for train in [ + 'sensor.sncf_train_1_XX', + 'sensor.sncf_train_2_XX', + 'sensor.sncf_train_3_XX', + 'sensor.sncf_train_4_XX' + ] %} + {% set t = state_attr(train, 'departure_time') %} + {% set b = state_attr(train, 'base_departure_time') %} + {% set r = state_attr(train, 'delay_minutes') | int(0) %} + {% set name = state_attr(train, 'direction') | default("Inconnu") %} + + {% set t_short = (t.split(' - ')[0][:5] ~ ' - ' ~ t.split(' - ')[1]) if t else '??/?? - ??:??' %} + {% set b_short = (b.split(' - ')[0][:5] ~ ' - ' ~ b.split(' - ')[1]) if b else '??/?? - ??:??' %} + {% set s = "" ~ b_short ~ " " ~ t_short if r > 0 else t_short %} + {% set st = "🚨 Retard: " ~ r ~ " min" if r > 0 else "✅ À l'heure" %} + + **{{ s }} - {{ name }} - {{ st }}** + {% endfor %} + + ### 🚄 Départs XX → XX + {% for train in [ + 'sensor.sncf_train_1_XX', + 'sensor.sncf_train_2_XX', + 'sensor.sncf_train_3_XX', + 'sensor.sncf_train_4_XX' + ] %} + {% set t = state_attr(train, 'departure_time') %} + {% set b = state_attr(train, 'base_departure_time') %} + {% set r = state_attr(train, 'delay_minutes') | int(0) %} + {% set name = state_attr(train, 'direction') | default("Inconnu") %} + + {% set t_short = (t.split(' - ')[0][:5] ~ ' - ' ~ t.split(' - ')[1]) if t else '??/?? - ??:??' %} + {% set b_short = (b.split(' - ')[0][:5] ~ ' - ' ~ b.split(' - ')[1]) if b else '??/?? - ??:??' %} + {% set s = "" ~ b_short ~ " " ~ t_short if r > 0 else t_short %} + {% set st = "🚨 Retard: " ~ r ~ " min" if r > 0 else "✅ À l'heure" %} + + **{{ s }} - {{ name }} - {{ st }}** + {% endfor %} +grid_options: + columns: 18 + rows: auto diff --git a/hacs.json b/hacs.json new file mode 100644 index 0000000..4a45753 --- /dev/null +++ b/hacs.json @@ -0,0 +1,9 @@ +{ + "name": "SNCF Trains HA", + "country": "FR", + "render_readme": true, + "homeassistant": "2025.8.2", + "zip_release": true, + "filename": "sncf_trains_ha.zip", + "content_in_root": false +} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..9296c2c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,9 @@ +colorlog +homeassistant +pip +ruff +pytest-asyncio +pytest +black +mypy +pylint \ No newline at end of file From c8cfe51963a4f2c0adb1405794359f066c4795f3 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Tue, 21 Apr 2026 15:40:30 +0200 Subject: [PATCH 12/23] Update sensor.py for Lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit correction apporté pour la vérification : Lint --- custom_components/sncf_trains/sensor.py | 89 +++++++++++++++++-------- 1 file changed, 60 insertions(+), 29 deletions(-) diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index 3518a57..8111908 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -92,7 +92,7 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: journey = coordinator.data[train_id][journey_id] section = journey.get("sections", [{}])[0] departure_time = parse_datetime(section.get("base_departure_date_time", "")) - + self.departure = entry.data[CONF_FROM] self.arrival = entry.data[CONF_TO] @@ -118,23 +118,23 @@ def _handle_coordinator_update(self) -> None: def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: section = journey.get("sections", [{}])[0] - + # 1. Calcul du retard arr_dt = parse_datetime(journey.get("arrival_date_time", "")) base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) delay_arr = int((arr_dt - base_arr_dt).total_seconds() / 60) if arr_dt and base_arr_dt else 0 - + dep_dt = parse_datetime(journey.get("departure_date_time", "")) base_dep_dt = parse_datetime(section.get("base_departure_date_time")) delay_dep = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 - + delay = max(delay_arr, delay_dep) - + # 2. Détection d'annulation et Cause status = journey.get("status", "") section_status = section.get("status", "") is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") - + # Extraction de la cause du retard/problème delay_cause = section.get("cause", "") if not delay_cause: @@ -143,36 +143,66 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: if messages: delay_cause = messages[0].get("text", "") - # 3. Plan de vol structuré avec détection des modifications (added/deleted) + # 3. Plan de vol structuré (V3.5 Precision Radar) stops_schedule = [] route_details = "" show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) - + if show_routes: - stops_data = section.get("stop_date_times", []) + impacted_stops = section.get("impacted_stops", []) stops_list = [] - for stop in stops_data: - stop_name = stop.get("stop_point", {}).get("name", "") - # On récupère l'horaire réel - raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) - formatted_time = format_time(raw_time) if raw_time else "" - - # Détection du statut de l'arrêt - stop_effect = stop.get("stop_time_effect", "unchanged") # added, deleted, delayed, unchanged - - if stop_name and formatted_time: + + # Si on a des données temps réel (JSON de ce midi) + if impacted_stops: + for stop in impacted_stops: + stop_name = stop.get("stop_point", {}).get("name", "") + # Heures brutes pour comparaison + b_raw = stop.get("base_departure_time") or stop.get("base_arrival_time") + a_raw = stop.get("amended_departure_time") or stop.get("amended_arrival_time") + + # Formatage HH:MM + b_time = f"{b_raw[:2]}:{b_raw[2:4]}" if b_raw and len(b_raw) >= 4 else "" + a_time = f"{a_raw[:2]}:{a_raw[2:4]}" if a_raw and len(a_raw) >= 4 else "" + + stop_effect = stop.get("stop_time_effect", "unchanged") prefix = "" - if stop_effect == "deleted": prefix = "[SUPPRIMÉ] " - if stop_effect == "added": prefix = "[NOUVEAU] " - - stops_list.append(f"{prefix}{stop_name} ({formatted_time})") - - just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time + if stop_effect == "deleted": + prefix = "[SUPPRIMÉ] " + if stop_effect == "added": + prefix = "[NOUVEAU] " + + stops_list.append(f"{prefix}{stop_name} ({a_time if a_time else b_time})") stops_schedule.append({ - "name": stop_name, - "time": just_time, + "name": stop_name, + "base_time": b_time, + "amended_time": a_time if a_time != b_time else None, "effect": stop_effect }) + else: + # Plan de vol classique + stops_data = section.get("stop_date_times", []) + for stop in stops_data: + stop_name = stop.get("stop_point", {}).get("name", "") + raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) + formatted_time = format_time(raw_time) if raw_time else "" + stop_effect = stop.get("stop_time_effect", "unchanged") + + if stop_name and formatted_time: + prefix = "" + if stop_effect == "deleted": + prefix = "[SUPPRIMÉ] " + if stop_effect == "added": + prefix = "[NOUVEAU] " + + stops_list.append(f"{prefix}{stop_name} ({formatted_time})") + just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time + stops_schedule.append({ + "name": stop_name, + "time": just_time, # Pour compatibilité V1 + "base_time": just_time, + "amended_time": None, + "effect": stop_effect + }) route_details = " ➔ ".join(stops_list) @@ -184,7 +214,7 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: "delay_minutes": delay, "delay_cause": delay_cause, "duration_minutes": get_duration(journey), - "has_delay": delay > 0, + "has_delay": (delay > 0 or len(delay_cause) > 0), "canceled": is_canceled, "route_details": route_details, "stops_schedule": stops_schedule, @@ -229,7 +259,8 @@ def _handle_coordinator_update(self) -> None: departure_times.append(format_time(journey.get("departure_date_time", ""))) delays.append(str(delay)) - if delay > 0: overall_has_delay = True + if delay > 0: + overall_has_delay = True self._attr_extra_state_attributes = { "departure_time": "; ".join(departure_times), From 88e23299760f4c0d84a498fc36678f2e996df360 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Thu, 23 Apr 2026 08:44:18 +0200 Subject: [PATCH 13/23] Version alpha0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quelque changement suplémentaire, surtout sur la carte ou j'ai corrigé le bug de l'émoji qui était affiché en permanance --- custom_components/sncf_trains/coordinator.py | 77 +-- custom_components/sncf_trains/manifest.json | 2 +- custom_components/sncf_trains/sensor.py | 62 +- custom_components/sncf_trains/strings.json | 16 +- .../sncf_trains/translations/fr.json | 6 +- .../sncf_trains/www/sncf-train-card.js | 281 ++++++--- translations/fr.json | 92 --- www/sncf-train-card.js | 568 ------------------ 8 files changed, 281 insertions(+), 823 deletions(-) delete mode 100644 translations/fr.json delete mode 100644 www/sncf-train-card.js diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index 91d64a2..d01faaa 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -1,10 +1,11 @@ -"""Data Update Coordinator.""" +"""Data Update Coordinator for SNCF integration.""" import logging from datetime import timedelta from typing import Any import asyncio from aiohttp import ClientError + from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed @@ -32,7 +33,7 @@ class SncfUpdateCoordinator(DataUpdateCoordinator): """Coordonnateur pour récupérer les données des trajets SNCF.""" def __init__(self, hass: HomeAssistant, entry: ConfigEntry): - """Initialisation.""" + """Initialisation du coordinateur.""" self.entry = entry self.api_client = None self.update_interval_minutes = entry.options.get( @@ -50,21 +51,18 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry): ) async def _async_setup(self) -> None: - """Paramétrage du coordinateur.""" + """Paramétrage du client API au démarrage.""" api_key = self.entry.data[CONF_API_KEY] try: session = async_get_clientsession(self.hass) self.api_client = SncfApiClient(session, api_key) - except Exception as err: - if "401" in str(err) or "403" in str(err): - raise ConfigEntryAuthFailed("Clé API invalide ou expirée") from err - _LOGGER.error("Erreur lors de la récupération des trajets SNCF: %s", err) + _LOGGER.error("Erreur d'initialisation API SNCF: %s", err) raise UpdateFailed(err) from err - def _build_datetime_param(self, time_start, time_end) -> str: - """Construit le paramètre datetime pour l'API (ignore le passé).""" + def _build_datetime_param(self, time_start: str, time_end: str) -> str: + """Construit le paramètre datetime pour l'API en ignorant le passé.""" now = dt_util.now() h_start, m_start = map(int, time_start.split(":")) h_end, m_end = map(int, time_end.split(":")) @@ -73,17 +71,16 @@ def _build_datetime_param(self, time_start, time_end) -> str: dt_end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) if now > dt_end: - # Si on a dépassé la fin de la plage aujourd'hui, on cherche pour demain + # Si la plage est finie pour aujourd'hui, on vise demain dt_start += timedelta(days=1) elif now > dt_start: - # CORRECTION : Si on est PENDANT la plage horaire, on cherche à partir de MAINTENANT - # (On n'interroge plus les trains déjà passés !) + # Si on est dans la plage, on commence à "maintenant" dt_start = now return dt_start.strftime("%Y%m%dT%H%M%S") - def _adjust_update_interval(self, time_start, time_end) -> timedelta | None: - """Ajuste la fréquence selon la plage horaire, avec préfenêtre 1h et gestion minuit.""" + def _adjust_update_interval(self, time_start: str, time_end: str) -> timedelta: + """Calcule l'intervalle approprié (Actif vs Éco).""" now = dt_util.now() h_start, m_start = map(int, time_start.split(":")) h_end, m_end = map(int, time_end.split(":")) @@ -94,6 +91,7 @@ def _adjust_update_interval(self, time_start, time_end) -> timedelta | None: if end <= start: end += timedelta(days=1) + # Fenêtre d'activation 1h avant le début de la plage pre_start = start - timedelta(hours=1) if now < pre_start: @@ -108,76 +106,55 @@ def _adjust_update_interval(self, time_start, time_end) -> timedelta | None: if in_fast_mode else self.outside_interval_minutes ) - new_interval = timedelta(minutes=interval_minutes) - - if self.update_interval != new_interval: - _LOGGER.debug( - "Update interval: %s → %s minutes", - ( - None - if self.update_interval is None - else self.update_interval.total_seconds() / 60 - ), - interval_minutes, - ) - return new_interval - - return new_interval + return timedelta(minutes=interval_minutes) async def _async_update_data(self) -> dict[str, Any]: - """Récupère les données de l'API SNCF.""" - + """Récupère les données depuis l'API SNCF.""" if not self.entry.subentries: - _LOGGER.warning("Pas de subentries configurés") return {} update_intervals = [] trains = {} - max_retries = 3 # nombre de tentatives - retry_delay = 2 # secondes entre les tentatives + max_retries = 3 + retry_delay = 2 + for subentry_id, entry in self.entry.subentries.items(): - _LOGGER.debug(entry.title) departure = entry.data[CONF_FROM] arrival = entry.data[CONF_TO] time_start = entry.data[CONF_TIME_START] time_end = entry.data[CONF_TIME_END] + # On récupère le nombre de trains souhaité par l'utilisateur + train_count = entry.data.get("train_count", 10) update_intervals.append(self._adjust_update_interval(time_start, time_end)) datetime_str = self._build_datetime_param(time_start, time_end) + journeys = None for attempt in range(1, max_retries + 1): try: journeys = await self.api_client.fetch_journeys( - departure, arrival, datetime_str, count=20 #By defaults = 10 + departure, arrival, datetime_str, count=train_count ) if journeys is not None: - break # succès, on sort du retry + break except (ClientError, asyncio.TimeoutError, RuntimeError) as err: - _LOGGER.warning( - "Erreur réseau lors de la récupération des trajets (tentative %d/%d) : %s", - attempt, - max_retries, - err, - ) + _LOGGER.warning("Tentative %d/%d échouée: %s", attempt, max_retries, err) await asyncio.sleep(retry_delay) if journeys is None or not isinstance(journeys, list): - _LOGGER.error("Aucune donnée reçue de l'API SNCF pour le trajet ") continue + # Filtrage des trajets directs uniquement trains[subentry_id] = [ - j - for j in journeys + j for j in journeys if isinstance(j, dict) and len(j.get("sections", [])) == 1 ] + # Mise à jour de l'intervalle global du coordinateur (le plus petit des trajets) if update_intervals: new_interval = min(update_intervals) if self.update_interval != new_interval: self.update_interval = new_interval - _LOGGER.debug( - "Coordinator update interval set to %s minutes", - self.update_interval.total_seconds() / 60, - ) + _LOGGER.debug("Nouvel intervalle de mise à jour: %s min", new_interval.total_seconds() / 60) return trains \ No newline at end of file diff --git a/custom_components/sncf_trains/manifest.json b/custom_components/sncf_trains/manifest.json index cef92cd..3ed24ae 100644 --- a/custom_components/sncf_trains/manifest.json +++ b/custom_components/sncf_trains/manifest.json @@ -20,5 +20,5 @@ ], "requirements": [], "single_config_entry": true, - "version": "1.3.0" + "version": "1.0.0" } diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index 8111908..da7d40b 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -35,6 +35,7 @@ async def async_setup_entry( for subentry in entry.subentries.values(): journeys = coordinator.data.get(subentry.subentry_id, []) + # Dynamisme : on crée autant de capteurs que demandé dans la config display_count = min(len(journeys), subentry.data.get("train_count", 0)) sensors = [] @@ -117,33 +118,39 @@ def _handle_coordinator_update(self) -> None: self.async_write_ha_state() def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: + """Calcul des attributs détaillés pour chaque train.""" section = journey.get("sections", [{}])[0] - # 1. Calcul du retard - arr_dt = parse_datetime(journey.get("arrival_date_time", "")) - base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) - delay_arr = int((arr_dt - base_arr_dt).total_seconds() / 60) if arr_dt and base_arr_dt else 0 - - dep_dt = parse_datetime(journey.get("departure_date_time", "")) - base_dep_dt = parse_datetime(section.get("base_departure_date_time")) - delay_dep = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 - - delay = max(delay_arr, delay_dep) - - # 2. Détection d'annulation et Cause + # 1. Gestion des dates avec fallback (Double Miroir pour le développeur) + base_dep_raw = section.get("base_departure_date_time") + base_arr_raw = section.get("base_arrival_time") or section.get("base_arrival_date_time") + + real_dep_raw = journey.get("departure_date_time") or base_dep_raw + real_arr_raw = journey.get("arrival_date_time") or base_arr_raw + + # Formatage final (Zéro n/a ici) + arrival_time = format_time(real_arr_raw) + departure_time = format_time(real_dep_raw) + + # 2. Calcul du retard (minutes) + arr_dt = parse_datetime(real_arr_raw) + base_arr_dt = parse_datetime(base_arr_raw) + delay = 0 + if arr_dt and base_arr_dt: + delay = int((arr_dt - base_arr_dt).total_seconds() / 60) + + # 3. Détection d'annulation et Cause status = journey.get("status", "") section_status = section.get("status", "") is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") - # Extraction de la cause du retard/problème delay_cause = section.get("cause", "") if not delay_cause: - # On cherche dans les messages de perturbation globaux messages = journey.get("messages", []) if messages: delay_cause = messages[0].get("text", "") - # 3. Plan de vol structuré (V3.5 Precision Radar) + # 4. Plan de vol structuré (Precision Radar) stops_schedule = [] route_details = "" show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) @@ -152,15 +159,12 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: impacted_stops = section.get("impacted_stops", []) stops_list = [] - # Si on a des données temps réel (JSON de ce midi) if impacted_stops: for stop in impacted_stops: stop_name = stop.get("stop_point", {}).get("name", "") - # Heures brutes pour comparaison b_raw = stop.get("base_departure_time") or stop.get("base_arrival_time") a_raw = stop.get("amended_departure_time") or stop.get("amended_arrival_time") - # Formatage HH:MM b_time = f"{b_raw[:2]}:{b_raw[2:4]}" if b_raw and len(b_raw) >= 4 else "" a_time = f"{a_raw[:2]}:{a_raw[2:4]}" if a_raw and len(a_raw) >= 4 else "" @@ -168,7 +172,7 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: prefix = "" if stop_effect == "deleted": prefix = "[SUPPRIMÉ] " - if stop_effect == "added": + elif stop_effect == "added": prefix = "[NOUVEAU] " stops_list.append(f"{prefix}{stop_name} ({a_time if a_time else b_time})") @@ -179,7 +183,6 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: "effect": stop_effect }) else: - # Plan de vol classique stops_data = section.get("stop_date_times", []) for stop in stops_data: stop_name = stop.get("stop_point", {}).get("name", "") @@ -191,30 +194,29 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: prefix = "" if stop_effect == "deleted": prefix = "[SUPPRIMÉ] " - if stop_effect == "added": + elif stop_effect == "added": prefix = "[NOUVEAU] " stops_list.append(f"{prefix}{stop_name} ({formatted_time})") just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time stops_schedule.append({ "name": stop_name, - "time": just_time, # Pour compatibilité V1 + "time": just_time, "base_time": just_time, "amended_time": None, "effect": stop_effect }) - route_details = " ➔ ".join(stops_list) return { - "departure_time": format_time(journey.get("departure_date_time", "")), - "arrival_time": format_time(journey.get("arrival_date_time", "")), - "base_departure_time": format_time(section.get("base_departure_date_time")), - "base_arrival_time": format_time(section.get("base_arrival_time")), + "departure_time": departure_time, + "arrival_time": arrival_time, + "base_departure_time": format_time(base_dep_raw), + "base_arrival_time": arrival_time, # On remet l'info temps réel ici aussi "delay_minutes": delay, "delay_cause": delay_cause, "duration_minutes": get_duration(journey), - "has_delay": (delay > 0 or len(delay_cause) > 0), + "has_delay": delay > 0, "canceled": is_canceled, "route_details": route_details, "stops_schedule": stops_schedule, @@ -255,7 +257,9 @@ def _handle_coordinator_update(self) -> None: section = journey.get("sections", [{}])[0] dep_dt = parse_datetime(journey.get("departure_date_time", "")) base_dep_dt = parse_datetime(section.get("base_departure_date_time")) - delay = int((dep_dt - base_dep_dt).total_seconds() / 60) if dep_dt and base_dep_dt else 0 + delay = 0 + if dep_dt and base_dep_dt: + delay = int((dep_dt - base_dep_dt).total_seconds() / 60) departure_times.append(format_time(journey.get("departure_date_time", ""))) delays.append(str(delay)) diff --git a/custom_components/sncf_trains/strings.json b/custom_components/sncf_trains/strings.json index fe26c0f..2ef8100 100644 --- a/custom_components/sncf_trains/strings.json +++ b/custom_components/sncf_trains/strings.json @@ -6,7 +6,7 @@ } }, "error": { - "invalid_api_key": "API Key not found. Please retry." + "invalid_api_key": "API Key not found or invalid. Please retry." }, "abort": { "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]" @@ -47,13 +47,13 @@ "arrival_city": { "title": "Select arrival city", "data": { - "departure_city": "City name" + "arrival_city": "City name" } }, "arrival_station": { "title": "Select arrival station", "data": { - "departure_station": "Station name" + "arrival_station": "Station name" } }, "time_range": { @@ -61,7 +61,8 @@ "data": { "time_start": "Time start", "time_end": "Time end", - "train_count": "Trains count" + "train_count": "Trains count", + "show_route_details": "Show intermediate stops" } }, "reconfigure": { @@ -69,15 +70,16 @@ "data": { "time_start": "Time start", "time_end": "Time end", - "train_count": "Trains count" + "train_count": "Trains count", + "show_route_details": "Show intermediate stops" } } }, "error": { - "no_stations": "No station for this city" + "no_stations": "No station found for this city" }, "abort": { - "already_configured_as_entry": "Already train is configured", + "already_configured_as_entry": "This journey is already configured", "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]" } } diff --git a/custom_components/sncf_trains/translations/fr.json b/custom_components/sncf_trains/translations/fr.json index 9b73d42..1ef5083 100644 --- a/custom_components/sncf_trains/translations/fr.json +++ b/custom_components/sncf_trains/translations/fr.json @@ -14,7 +14,7 @@ "invalid_api_key": "Clé API invalide. Veuillez vérifier et réessayer." }, "abort": { - "reconfigure_successful": "Compose reconfiguré avec succès" + "reconfigure_successful": "Intégration reconfigurée avec succès" } }, "options": { @@ -65,7 +65,7 @@ "title": "Choisissez la plage horaire", "data": { "time_start": "Heure de départ", - "time_end": "Heure d'arrivé", + "time_end": "Heure d'arrivée", "train_count": "Nombre de trains", "show_route_details": "Afficher les arrêts intermédiaires" } @@ -74,7 +74,7 @@ "title": "Choisissez la plage horaire", "data": { "time_start": "Heure de départ", - "time_end": "Heure d'arrivé", + "time_end": "Heure d'arrivée", "train_count": "Nombre de trains", "show_route_details": "Afficher les arrêts intermédiaires" } diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index 094a97c..efb96b6 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -1,47 +1,110 @@ -// Ajouter au registre des cartes personnalisées +// SNCF Train Card V3.5.0 window.customCards = window.customCards || []; window.customCards.push({ type: 'sncf-train-card', name: 'SNCF Train Card', preview: true, - description: 'V3.3 - Radar de ligne avec badges textuels et alertes Orange/Rouge.' + description: 'Version intégrale - Radar, Animation temps réel et Éditeur visuel.' }); -// --- CLASSE DE L'ÉDITEUR VISUEL --- +// --- ÉDITEUR VISUEL (CODE COMPLET) --- class SncfTrainCardEditor extends HTMLElement { - constructor() { super(); this.attachShadow({ mode: 'open' }); } - setConfig(config) { this._config = { ...config }; this.render(); } + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + } + + setConfig(config) { + this._config = { ...config }; + this.render(); + } + + set hass(hass) { + this._hass = hass; + } + render() { if (!this._config) return; + this.shadowRoot.innerHTML = `
-
-
+
+ + +
+ +
+ + +
+
-
-
+
+ + +
+
+ + +
+
-
-
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
+ +
+
+
+
+ +
+ + +
+ +
+ +
-
+ `; + .checkbox input { width: 18px; height: 18px; margin: 0; } + .highlight { background: rgba(0, 83, 156, 0.05); padding: 10px; border-radius: 6px; border-left: 4px solid #00539c; } + + `; + this.shadowRoot.querySelectorAll('input').forEach(input => { input.addEventListener('change', this.valueChanged.bind(this)); }); } + valueChanged(ev) { + if (!this._config) return; const target = ev.target; let value = target.type === 'checkbox' ? target.checked : (target.type === 'number' ? Number(target.value) : target.value); this._config = { ...this._config, [target.id]: value }; @@ -50,12 +113,56 @@ class SncfTrainCardEditor extends HTMLElement { } customElements.define('sncf-train-card-editor', SncfTrainCardEditor); -// --- CLASSE DE LA CARTE PRINCIPALE --- +// --- CARTE PRINCIPALE (LOGIQUE COMPLÈTE) --- class SncfTrainCard extends HTMLElement { - constructor() { super(); this.attachShadow({ mode: 'open' }); } + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + this.updateInterval = null; + this.lastTrainSignature = null; + this._lastRenderTime = 0; + } + static getConfigElement() { return document.createElement("sncf-train-card-editor"); } - setConfig(config) { this.config = { title: "Trains SNCF", train_emoji: "🚅", train_station_emoji: "🚉", animation_duration: 30, use_real_duration: true, speed_factor: 2, ...config }; } - set hass(hass) { this._hass = hass; this.render(); } + + setConfig(config) { + if (!config.device_id) throw new Error('You need to define device_id'); + this.config = { + title: "Trains SNCF", + train_emoji: "🚅", + train_station_emoji: "🚉", + train_emoji_axial_symmetry: true, + animation_duration: 30, + use_real_duration: true, + speed_factor: 2, + update_interval: 30000, + show_real_stop_times: true, + ...config + }; + this.render(); + } + + set hass(hass) { + this._hass = hass; + this.render(); + } + + connectedCallback() { this.startUpdateTimer(); } + disconnectedCallback() { this.stopUpdateTimer(); } + + startUpdateTimer() { + this.stopUpdateTimer(); + this.updateInterval = setInterval(async () => { + if (this._hass) { + this._lastRenderTime = 0; + await this.render(); + } + }, this.config.update_interval); + } + + stopUpdateTimer() { + if (this.updateInterval) { clearInterval(this.updateInterval); this.updateInterval = null; } + } async getTrainEntities() { if (!this._hass || !this.config.device_id) return []; @@ -63,7 +170,9 @@ class SncfTrainCard extends HTMLElement { const allReg = await this._hass.callWS({ type: 'config/entity_registry/list' }); const deviceEntities = allReg.filter(e => e.device_id === this.config.device_id); const trainEntities = deviceEntities.filter(e => e.entity_id.includes('train')) - .map(e => this._hass.states[e.entity_id]).filter(e => e && e.attributes && e.attributes.departure_time); + .map(e => this._hass.states[e.entity_id]) + .filter(e => e && e.attributes && e.attributes.departure_time); + const now = new Date(); return trainEntities.filter(e => this.parseTime(e.attributes.departure_time) >= now) .sort((a, b) => this.parseTime(a.attributes.departure_time) - this.parseTime(b.attributes.departure_time)) @@ -72,56 +181,78 @@ class SncfTrainCard extends HTMLElement { } parseTime(t) { - if (!t || !t.includes(' - ')) return new Date(t || 0); + if (!t || !t.includes(' - ')) return new Date(0); const p = t.split(' - '), d = p[0].split('/'), h = p[1].split(':'); return new Date(d[2], d[1]-1, d[0], h[0], h[1]); } render() { if (!this._hass || !this.config) return; + + const nowTs = Date.now(); + if (nowTs - this._lastRenderTime < 1000) return; + this._lastRenderTime = nowTs; + this.getTrainEntities().then(trains => { const currentTime = new Date(); const trainLinesHTML = trains.map(train => { const attrs = train.attributes; const dep = this.parseTime(attrs.departure_time); const diff = (dep - currentTime) / 60000; - const max = this.config.animation_duration || 30; - const pos = diff > max ? -10 : (diff <= 0 ? 100 : ((max - diff) / max) * 100); + const maxAnim = this.config.animation_duration || 30; + + const pos = diff > maxAnim ? -10 : (diff <= 0 ? 100 : ((maxAnim - diff) / maxAnim) * 100); + const hasDelay = attrs.has_delay || false; const isCanceled = attrs.canceled || false; let animDur = this.config.use_real_duration && attrs.duration_minutes ? - attrs.duration_minutes * (this.config.speed_factor || 2) : this.config.animation_duration; + attrs.duration_minutes * (this.config.speed_factor || 2) : 30; let timelineHTML = ''; if (this.config.show_route_details && attrs.stops_schedule) { - timelineHTML = `
` + - attrs.stops_schedule.map(s => { - let statusBadge = ""; - if (s.effect === 'deleted') statusBadge = ' SUPPRIMÉ'; - else if (s.effect === 'added') statusBadge = ' RAJOUTÉ'; - - return ` -
-
-
${s.time}
-
- ${s.name}${statusBadge} -
-
`; - }).join('') + `
`; + timelineHTML = ` +
+
+
+ ${attrs.stops_schedule.map(s => { + const isDeleted = s.effect === 'deleted'; + const isAdded = s.effect === 'added'; + const isStopDelayed = this.config.show_real_stop_times && s.amended_time && s.base_time && (s.amended_time !== s.base_time); + + const displayTime = isStopDelayed ? + `${s.base_time}${s.amended_time}` : + `${s.base_time || s.time}`; + + let statusBadge = ""; + if (isDeleted) statusBadge = ' SUPPRIMÉ'; + else if (isAdded) statusBadge = ' RAJOUTÉ'; + + return ` +
+
+
${displayTime}
+
+ ${s.name}${statusBadge} +
+
`; + }).join('')} +
+
`; } const timeOnly = (t) => t ? t.split(' - ')[1] : "--:--"; return ` -
+
-
- ${isCanceled ? '❌' : this.config.train_emoji} -
+ ${pos >= 0 && pos <= 100 ? ` +
+ ${isCanceled ? '❌' : this.config.train_emoji} +
+ ` : ''}
${this.config.train_station_emoji}
@@ -140,44 +271,48 @@ class SncfTrainCard extends HTMLElement { this.shadowRoot.innerHTML = ` -
${this.config.title}
${trainLinesHTML}`; + +
${this.config.title}
+ ${trainLinesHTML} + `; }); } } diff --git a/translations/fr.json b/translations/fr.json deleted file mode 100644 index 9b73d42..0000000 --- a/translations/fr.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "title": "Trains SNCF", - "config": { - "step": { - "user": { - "title": "Clé API SNCF", - "description": "Entrez votre clé API SNCF pour commencer.", - "data": { - "api_key": "Clé API" - } - } - }, - "error": { - "invalid_api_key": "Clé API invalide. Veuillez vérifier et réessayer." - }, - "abort": { - "reconfigure_successful": "Compose reconfiguré avec succès" - } - }, - "options": { - "step": { - "init": { - "title": "Options", - "description": "Définissez les intervalles de mise à jour.", - "data": { - "update_interval": "Intervalle pendant la plage horaire (minutes)", - "outside_interval": "Intervalle en dehors de la plage horaire (minutes)" - } - } - } - }, - "config_subentries": { - "train": { - "initiate_flow": { - "user": "Ajouter un trajet", - "reconfigure": "Reconfigurer un trajet" - }, - "entry_type": "Train", - "step": { - "departure_city": { - "title": "Choisissez la ville de départ", - "data": { - "departure_city": "Nom de la ville" - } - }, - "departure_station": { - "title": "Choisissez la gare de départ", - "data": { - "departure_station": "Nom de la gare" - } - }, - "arrival_city": { - "title": "Choisissez la ville d'arrivée", - "data": { - "arrival_city": "Nom de la ville" - } - }, - "arrival_station": { - "title": "Choisissez la gare d'arrivée", - "data": { - "arrival_station": "Nom de la gare" - } - }, - "time_range": { - "title": "Choisissez la plage horaire", - "data": { - "time_start": "Heure de départ", - "time_end": "Heure d'arrivé", - "train_count": "Nombre de trains", - "show_route_details": "Afficher les arrêts intermédiaires" - } - }, - "reconfigure": { - "title": "Choisissez la plage horaire", - "data": { - "time_start": "Heure de départ", - "time_end": "Heure d'arrivé", - "train_count": "Nombre de trains", - "show_route_details": "Afficher les arrêts intermédiaires" - } - } - }, - "error": { - "no_stations": "Aucune gare trouvée pour cette ville." - }, - "abort": { - "already_configured_as_entry": "Ce trajet est déjà configuré.", - "reconfigure_successful": "Trajet reconfiguré avec succès" - } - } - } -} \ No newline at end of file diff --git a/www/sncf-train-card.js b/www/sncf-train-card.js deleted file mode 100644 index cf4ad81..0000000 --- a/www/sncf-train-card.js +++ /dev/null @@ -1,568 +0,0 @@ -// Ajouter au registre des cartes personnalisées -window.customCards = window.customCards || []; -window.customCards.push({ - type: 'sncf-train-card', - name: 'SNCF Train Card', - preview: true, - description: 'Carte personnalisée animée pour afficher les trains SNCF avec radar de ligne.' -}); - -// --- CLASSE DE L'ÉDITEUR VISUEL --- -class SncfTrainCardEditor extends HTMLElement { - constructor() { - super(); - this.attachShadow({ mode: 'open' }); - } - - setConfig(config) { - this._config = { ...config }; - this.render(); - } - - render() { - if (!this._config) return; - - this.shadowRoot.innerHTML = ` -
-
- - -
- -
- - -
- -
-
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
- -
- - -
- -
- - -
-
- - - `; - - // Écouteurs d'événements pour mettre à jour la config en direct - this.shadowRoot.querySelectorAll('input').forEach(input => { - input.addEventListener('change', this.valueChanged.bind(this)); - if (input.type === 'text' || input.type === 'number') { - input.addEventListener('input', this.valueChanged.bind(this)); // Pour mise à jour fluide - } - }); - } - - valueChanged(ev) { - if (!this._config || !this.hass) return; - const target = ev.target; - let value = target.type === 'checkbox' ? target.checked : target.value; - - if (target.type === 'number') { - value = Number(value); - } - - if (this._config[target.id] === value) return; - - this._config = { ...this._config, [target.id]: value }; - - const event = new CustomEvent('config-changed', { - detail: { config: this._config }, - bubbles: true, - composed: true, - }); - this.dispatchEvent(event); - } -} - -customElements.define('sncf-train-card-editor', SncfTrainCardEditor); - - -// --- CLASSE DE LA CARTE PRINCIPALE --- -class SncfTrainCard extends HTMLElement { - constructor() { - super(); - this.attachShadow({ mode: 'open' }); - this.updateInterval = null; - this.lastTrainSignature = null; - this._lastRenderTime = 0; - } - - // Lier l'éditeur à la carte - static getConfigElement() { - return document.createElement("sncf-train-card-editor"); - } - - static getStubConfig() { - return { - title: "Trains SNCF", - device_id: "", - train_lines: 3, - animation_duration: 30, - show_route_details: true - }; - } - - setConfig(config) { - if (!config.device_id) { - throw new Error('Vous devez définir le device_id'); - } - - const previousDeviceId = this.config ? this.config.device_id : null; - const deviceIdChanged = previousDeviceId && previousDeviceId !== config.device_id; - - this.config = { - device_id: config.device_id, - train_lines: config.train_lines !== undefined ? config.train_lines : 3, - title: config.title || 'Trains SNCF', - train_emoji: config.train_emoji || '🚅', - train_emoji_axial_symmetry: config.train_emoji_axial_symmetry !== false, - train_station_emoji: config.train_station_emoji || '🚉', - animation_duration: config.animation_duration || 30, - update_interval: config.update_interval || 30000, - show_route_details: config.show_route_details !== undefined ? config.show_route_details : false, - ...config - }; - - if (deviceIdChanged) { - this.stopUpdateTimer(); - this.startUpdateTimer(); - } - - this.render(); - } - - set hass(hass) { - const previousHass = this._hass; - this._hass = hass; - - if (this.config && previousHass) { - this.checkForTrainUpdates(previousHass, hass); - } else { - this.render(); - } - } - - async checkForTrainUpdates(previousHass, currentHass) { - try { - const currentTrains = await this.getTrainEntities(); - const currentSignature = this.createTrainSignature(currentTrains); - - if (currentSignature !== this.lastTrainSignature) { - this.lastTrainSignature = currentSignature; - this.render(); - } - } catch (error) { - this.render(); - } - } - - createTrainSignature(trains) { - return trains.map(train => - `${train.entity_id}:${train.attributes.departure_time}:${train.attributes.delay_minutes || 0}:${train.attributes.has_delay || false}` - ).join('|'); - } - - connectedCallback() { - this.startUpdateTimer(); - } - - disconnectedCallback() { - this.stopUpdateTimer(); - } - - startUpdateTimer() { - this.stopUpdateTimer(); - this.updateInterval = setInterval(async () => { - if (this._hass) { - this._lastRenderTime = 0; - await this.render(); - } - }, this.config.update_interval); - } - - stopUpdateTimer() { - if (this.updateInterval) { - clearInterval(this.updateInterval); - this.updateInterval = null; - } - } - - async getTrainEntities() { - if (!this._hass) return []; - - try { - const allEntityRegistry = await this._hass.callWS({ - type: 'config/entity_registry/list' - }); - - const deviceEntities = allEntityRegistry.filter(entityInfo => - entityInfo.device_id === this.config.device_id - ); - - if (!deviceEntities || deviceEntities.length === 0) return []; - - const trainEntities = deviceEntities - .filter(entityInfo => entityInfo.entity_id.includes('train')) - .map(entityInfo => this._hass.states[entityInfo.entity_id]) - .filter(entity => entity && entity.attributes && entity.attributes.departure_time); - - const currentTime = new Date(); - const upcomingTrains = trainEntities.filter(entity => { - const departureTime = this.parseTime(entity.attributes.departure_time); - return departureTime >= currentTime; - }); - - return upcomingTrains - .sort((a, b) => this.parseTime(a.attributes.departure_time) - this.parseTime(b.attributes.departure_time)) - .slice(0, this.config.train_lines); - - } catch (error) { - return []; - } - } - - parseTime(departureTime) { - if (!departureTime) return new Date(0); - - if (departureTime.includes('/') && departureTime.includes(' - ')) { - const parts = departureTime.split(' - '); - if (parts.length === 2) { - const dateComponents = parts[0].split('/'); - if (dateComponents.length === 3) { - const day = parseInt(dateComponents[0]); - const month = parseInt(dateComponents[1]) - 1; - const year = parseInt(dateComponents[2]); - - const timeComponents = parts[1].split(':'); - if (timeComponents.length === 2) { - const hour = parseInt(timeComponents[0]); - const minute = parseInt(timeComponents[1]); - return new Date(year, month, day, hour, minute); - } - } - } - } - return new Date(departureTime); - } - - calculateTrainPosition(departureTime, currentTime) { - if (!departureTime) return -10; - const departure = this.parseTime(departureTime); - if (isNaN(departure.getTime())) return -10; - - const now = currentTime || new Date(); - const diffMinutes = (departure - now) / (1000 * 60); - const maxMinutes = this.config.animation_duration; - - if (diffMinutes > maxMinutes) return -10; - if (diffMinutes <= 0) return 100; - - return ((maxMinutes - diffMinutes) / maxMinutes) * 100; - } - - formatTime(timeString) { - if (!timeString) return 'N/A'; - const time = this.parseTime(timeString); - if (isNaN(time.getTime())) return 'Format invalide'; - return time.toLocaleTimeString('fr-FR', { hour: '2-digit', minute: '2-digit' }); - } - - calculateRealArrivalTime(departureTime, delayMinutes) { - if (!departureTime || !delayMinutes || delayMinutes === 0) return null; - const originalTime = this.parseTime(departureTime); - const realTime = new Date(originalTime.getTime() + (delayMinutes * 60000)); - return realTime.toLocaleTimeString('fr-FR', { hour: '2-digit', minute: '2-digit' }); - } - - getTrainColor(delayMinutes, hasDelay) { - if (!hasDelay || delayMinutes === 0) return '#4caf50'; - return '#f44336'; - } - - async render() { - if (!this._hass || !this.config) return; - - const now = Date.now(); - if (now - this._lastRenderTime < 1000) return; - this._lastRenderTime = now; - - const trains = await this.getTrainEntities(); - - if (trains.length === 0) { - this.shadowRoot.innerHTML = ` -
Aucun train trouvé pour ce device_id.
 - `; - return; - } - - const currentTime = new Date(); - const trainLinesHTML = this.renderTrainLines(trains, currentTime); - - this.shadowRoot.innerHTML = ` - - - -
-
${this.config.title}
- ${trainLinesHTML} -
- - `; - } - - renderTrainLines(trains, currentTime) { - return trains.map((train) => { - const position = this.calculateTrainPosition(train.attributes.departure_time, currentTime); - const delayMinutes = train.attributes.delay_minutes || 0; - const hasDelay = train.attributes.has_delay || false; - const trainColor = this.getTrainColor(delayMinutes, hasDelay); - const formattedTime = this.formatTime(train.attributes.departure_time); - const realArrivalTime = this.calculateRealArrivalTime(train.attributes.departure_time, delayMinutes); - - // Extraction du plan de vol (tableau) - const stopsSchedule = train.attributes.stops_schedule || []; - - // Construction de la barre graphique "Métro" - let timelineHTML = ''; - if (this.config.show_route_details && stopsSchedule.length > 0) { - const stopsHTML = stopsSchedule.map(stop => ` -
-
-
${stop.time}
-
${stop.name}
-
- `).join(''); - - timelineHTML = ` -
-
-
- ${stopsHTML} -
-
- `; - } - - return ` -
-
-
- ${position >= 0 && position <= 100 ? ` -
- ${this.config.train_emoji} -
- ` : ''} -
- -
-
${this.config.train_station_emoji}
-
-
- ${hasDelay && realArrivalTime ? ` -
${formattedTime}
-
${realArrivalTime}
- ` : `
${formattedTime}
`} -
-
- ${hasDelay ? `+${delayMinutes}min` : 'À l\'heure'} -
-
-
-
- - ${timelineHTML} - -
- `; - }).join(''); - } -} - -customElements.define('sncf-train-card', SncfTrainCard); \ No newline at end of file From 378656ddfc4a03ba4fe7894aca5ee96b68c0e9b1 Mon Sep 17 00:00:00 2001 From: ProBreizh35 <75017525+ProBreizh35@users.noreply.github.com> Date: Wed, 6 May 2026 21:03:18 +0200 Subject: [PATCH 14/23] =?UTF-8?q?derni=C3=A8re=20modifications?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 270 ++++++++---------- custom_components/sncf_trains/api.py | 14 +- custom_components/sncf_trains/coordinator.py | 32 ++- custom_components/sncf_trains/sensor.py | 57 ++-- .../sncf_trains/www/sncf-train-card.js | 2 +- 5 files changed, 176 insertions(+), 199 deletions(-) diff --git a/README.md b/README.md index 47e0b9e..07b3550 100644 --- a/README.md +++ b/README.md @@ -1,240 +1,196 @@ -# ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT -# 🚄 Intégration SNCF Trains pour Home Assistant - -> [!CAUTION] -> **Ce projet est actuellement en phase de développement intensif.** -> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version du `sensor.py` et de la `sncf-train-card.js` pour une compatibilité totale. +![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) +![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) +![Licence MIT](https://img.shields.io/badge/Licence-MIT-green) ---- +# 🚆 SNCF Trains pour Home Assistant -### 🚀 Dernières mises à jour ferroviaires (Avril 2026) +Suivez facilement les horaires des trains SNCF entre deux gares directement dans votre tableau de bord Home Assistant, grâce à l’API officielle de la [SNCF](https://www.digital.sncf.com/startup/api). -Le système a été lourdement modifié : +Départs, arrivées, retards, durée du trajet et type de train (TER, TGV, etc.) : toutes les informations essentielles sont regroupées dans une interface personnalisable et entièrement traduite en français. -* **🕒 Correction du "Time-Glitch" (Décalage horaire) :** **Résolution définitive** du bug critique qui affichait des trains "il y a 8 heures". Les capteurs gèrent désormais nativement les fuseaux horaires (Timezone ISO 8601). -* **📡 Radar de Ligne (V3.3) :** Intégration d'un "thermomètre de ligne" dynamique avec détection des **badges d'arrêts supprimés** ou **exceptionnels**. ⚠️ *Ce paramètre est désactivé par défaut.* -* **🎭 Moteur d'Animation Dynamique :** Possibilité de synchroniser la vitesse de l'emoji train sur la durée réelle du trajet (`duration_minutes`). -* **🔍 Analyse des Perturbations :** * Extraction de la **cause officielle** du retard (ex: Panne de signalisation, Défaut d'alimentation). - * Gestion visuelle des **Annulations** (croix rouge et rail d'alerte). - * Code couleur intelligent : **Orange** pour les retards, **Rouge** pour les suppressions. +> [!CAUTION] +> +> ### ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT +> +> **Ce projet est actuellement en phase d'amélioration intensive.** +> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version des fichiers de l'intégration pour garantir une compatibilité totale avec votre tableau de bord. --- -### 📸 Aperçu Visuel - -| Version Précédente (Épurée) | Nouvelle Version (Radar de Ligne) | -| :---: | :---: | -| Avant | Maintenant | +## 🧪 Nouveauté en phase de test : Les Trains Supprimés +> **Nous avons récemment introduit la détection et l'affichage des trains annulés/supprimés !** > Cette fonctionnalité est actuellement en **phase de test**. +> +> 🙏 **Un immense merci** à tous les utilisateurs qui prennent le temps de nous faire leurs retours (qu'il s'agisse de petits bugs ou de succès sur vos trajets quotidiens). C'est grâce à votre aide que nous pouvons stabiliser et améliorer ce projet pour tout le monde ! -> *Note : Le radar de ligne affiche désormais tous les arrêts intermédiaires, mais peut être désactivé dans les options pour retrouver le design minimaliste.* - +--- -![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) -![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) -![Licence MIT](https://img.shields.io/badge/Licence-MIT-green) +## 🚀 Dernières mises à jour (Avril 2026) -Suivez les horaires des trains SNCF entre deux gares dans Home Assistant, grâce à l’API officielle [SNCF](https://www.digital.sncf.com/startup/api). -Départ / arrivée, retards, durée, mode (TER…), tout est intégré dans une interface configurable et traduite. +Le système a été lourdement mis à jour pour vous offrir une précision et un confort d'utilisation optimaux : -> ⚠️ Ne prend pas en compte les trains supprimés. +- **🕒 Correction de l'affichage de l'heure :** Résolution définitive du problème qui affichait des trains "il y a 8 heures". Le système gère désormais parfaitement les fuseaux horaires locaux. +- **📡 Radar de Ligne (V3.3) :** Intégration d'un visuel détaillé affichant les arrêts intermédiaires et détectant les modifications de parcours. _(Note : Cette option peut être désactivée dans les paramètres pour garder un design simple)._ +- **🎭 Moteur d'Animation Dynamique :** L'emoji du train avance désormais de manière synchronisée avec la durée réelle de votre trajet. +- **🔍 Analyse Intelligente des Perturbations :** \* Affichage clair de la **cause officielle** du retard (ex: Panne de signalisation, Défaut d'alimentation...). + - Code couleur intuitif : **Orange** pour les retards, **Rouge** pour les suppressions. --- -## 📦 Installation - -### 1. Via HACS (recommandé) +## 📸 Aperçu Visuel -> Nécessite HACS installé dans Home Assistant +| Design Épuré (Classique) | Nouveau Design (Radar de Ligne) | +| :-----------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------: | +| Avant | Radar de Ligne V3 | -1. Aller dans **HACS** -2. Chercher **SNCF Trains** -3. Installer puis redémarrer Home Assistant +### ⚠️ Zoom sur les Retards et Perturbations -### 2. Manuel (sans HACS) +Grâce à la nouvelle analyse des données de la SNCF, la carte est capable d'afficher le suivi en temps réel des incidents avec la cause exacte et l'impact sur chaque arrêt : -1. Télécharger le contenu du dépôt -2. Copier le dossier `sncf_trains` dans `config/custom_components/` -3. Redémarrer Home Assistant +Détail d'un retard avec sa cause officielle --- -## ⚙️ Configuration +## 📦 Installation -1. Aller dans **Paramètres → Appareils & services → Ajouter une intégration** -2. Rechercher **SNCF Trains** -3. Suivre les étapes : - - Clé API SNCF -4. Ajouter un trajet : - - Ville et gare de départ - - Ville et gare d'arrivée - - Plage horaire à surveiller +### 1. Via HACS (Méthode recommandée) -Plusieurs trajets peuvent être configurés séparément. +_Nécessite [HACS](https://hacs.xyz/) installé sur votre Home Assistant._ ---- +1. Ouvrez **HACS** dans votre menu de gauche. +2. Recherchez **SNCF Trains**. +3. Cliquez sur **Installer**, puis redémarrez Home Assistant. -## 🧩 Options dynamiques +### 2. Méthode Manuelle -### Intégration principale (Configurer) +1. Téléchargez le contenu de ce dépôt. +2. Copiez le dossier `sncf_trains` dans le répertoire `config/custom_components/` de votre Home Assistant. +3. Redémarrez Home Assistant. -- ⏱ Intervalle de mise à jour **pendant** la plage horaire -- 🕰 Intervalle **hors** plage horaire +--- -### Par trajet (Reconfigurer un trajet) +## ⚙️ Configuration initiale -- 🚆 Nombre de trains affichés -- 🕗 Heures de début et fin de surveillance +1. Dans Home Assistant, allez dans **Paramètres** → **Appareils et services** → **Ajouter une intégration**. +2. Recherchez **SNCF Trains**. +3. Renseignez votre **Clé API SNCF** _(voir section suivante)_. +4. Configurez votre premier trajet en indiquant : + - La gare de départ. + - La gare d'arrivée. + - La plage horaire que vous souhaitez surveiller. -✅ Aucun redémarrage requis. Les modifications sont appliquées dynamiquement. +_Astuce : Vous pouvez configurer autant de trajets différents que vous le souhaitez !_ --- -## 🔐 Clé API SNCF +## 🔐 Obtenir sa Clé API SNCF (Gratuit) -Obtenez votre clé ici : [https://www.digital.sncf.com/startup/api](https://www.digital.sncf.com/startup/api) +Pour que l'intégration fonctionne, vous avez besoin d'une clé API officielle fournie par la SNCF : -1. Créez un compte ou connectez-vous -2. Générez une clé API gratuite -3. Utilisez-la lors de la configuration (limite de 5 000 requêtes par jour) +1. Rendez-vous sur le [portail API SNCF](https://www.digital.sncf.com/startup/api). +2. Créez un compte gratuitement ou connectez-vous. +3. Générez votre clé API (celle-ci autorise jusqu'à 5 000 requêtes par jour, ce qui est largement suffisant). +4. Copiez-la et collez-la lors de la configuration dans Home Assistant. -> Pour changer de clé, cliquer sur **Reconfigurer** dans l'intégration. +> _Pour changer de clé plus tard, il vous suffira de cliquer sur **Reconfigurer** depuis la page de l'intégration._ --- -## ⚙️ Variables de l'intégration - -| Nom | Description | -|-----|-------------| -| `update_interval` | Intervalle de mise à jour **pendant** la plage horaire (défaut : 2 min) | -| `outside_interval` | Intervalle **hors** plage horaire (défaut : 60 min) | -| `train_count` | Nombre de trains à afficher | -| `time_start` / `time_end` | Plage horaire de surveillance (ex. : `06:00` → `09:00`) | - -> 🕑 L'intervalle actif s'active automatiquement **2h avant** le début de plage. +## 🧩 Options et Personnalisation ---- - -## 📊 Capteurs créés +Vous pouvez ajuster le comportement de l'intégration sans avoir à redémarrer Home Assistant : -- `sensor.sncf__` — capteur principal du trajet -- `sensor.sncf_train_X__` — capteur par train -- `calendar.trains` — calendrier des prochains départs -- `sensor.sncf_tous_les_trains_ligne_X` +**Options globales de l'intégration :** -### Attributs du capteur principal +- ⏱ **Intervalle de rafraîchissement (actif) :** Fréquence de mise à jour pendant vos heures de trajet (défaut : 2 min). +- 🕰 **Intervalle de rafraîchissement (repos) :** Fréquence de mise à jour hors de vos heures de trajet (défaut : 60 min). -- Nombre de trajets -- Informations les inervalles +**Options spécifiques à chaque trajet :** -### Capteurs secondaires (enfants) pour chaque train +- 🚆 **Nombre de trains à afficher :** Choisissez combien de départs simultanés vous souhaitez surveiller **(jusqu'à 20 trains par ligne maximum !)**. +- 🕗 **Heures exactes de début et fin de surveillance.** -- Heure de départ (`device_class: timestamp`) -- Heure d’arrivée -- Retard estimé -- Durée totale (`duration_minutes`) -- Mode, direction, numéro +_(Le mode actif se déclenche automatiquement 2 heures avant l'heure de début que vous avez configurée)._ --- -## 🎨 Carte Lovelace — SNCF Train Card +## 📊 Données et Capteurs -La carte `sncf-train-card` est **automatiquement disponible** dans le sélecteur de cartes dès l'installation de l'intégration. +L'intégration crée automatiquement plusieurs capteurs pour vos automatisations : -### Ajouter la carte +- `sensor.sncf__` : Le capteur global résumant votre trajet. +- `sensor.sncf_train_X__` : Un capteur individuel pour chaque train suivi. +- `calendar.trains` : Un calendrier pratique affichant vos prochains départs. -Dans un tableau de bord, cliquer sur **+ Ajouter une carte** → chercher **SNCF Train Card**. +**Informations disponibles pour chaque train :** -Ou en YAML : +- Heure de départ prévue et réelle. +- Heure d’arrivée. +- Durée totale du voyage. +- Type de train (TER, TGV...), direction et numéro de ligne. +- Minutes de retard et cause officielle (si applicable). -```yaml -type: custom:sncf-train-card -device_id: VOTRE_DEVICE_ID -``` +--- -### 🔍 Trouver le `device_id` +## 🎨 Carte pour le Tableau de Bord (Lovelace) -Le `device_id` correspond à l'appareil créé lors de la configuration du trajet. +Une jolie carte visuelle (`sncf-train-card`) est incluse et prête à l'emploi dès l'installation ! -1. Aller dans **Paramètres → Appareils & services → SNCF Trains** -2. Cliquer sur le trajet souhaité -3. L'URL contient l'identifiant : `.../config/devices/device/XXXX` +### Trouver son `device_id` -> ![Exemple d'identifiant](./assets/device_id_url.png) +Pour que la carte sache quel trajet afficher, elle a besoin de l'identifiant de l'appareil (`device_id`) : -### ⚙️ Paramètres de la carte +1. Allez dans **Paramètres** → **Appareils et services** → **SNCF Trains**. +2. Cliquez sur l'appareil correspondant à votre trajet. +3. Regardez l'URL dans la barre de votre navigateur : la suite de lettres et chiffres à la fin est votre `device_id` (ex: `.../config/devices/device/abc123def456`). -| Paramètre | Type | Défaut | Description | -|-----------|------|--------|-------------| -| `device_id` | `string` | **obligatoire** | Identifiant de l'appareil SNCF (voir ci-dessus) | -| `title` | `string` | `'Trains SNCF'` | Titre affiché en haut de la carte | -| `train_lines` | `number` | `3` | Nombre de trains affichés simultanément | -| `train_emoji` | `string` | `'🚅'` | Emoji du train animé sur la barre de progression | -| `train_emoji_axial_symmetry` | `boolean` | `true` | Retourne l'emoji (à utiliser selon son sens) | -| `train_station_emoji` | `string` | `'🚉'` | Emoji affiché à côté des gares | -| `animation_duration` | `number` | `30` | Nombre de minutes avant l'arrivée en gare à partir duquel l'animation du train se déclenche (ex : `30` = animation active dans les 30 dernières minutes, `60` = dans la dernière heure) | -| `update_interval` | `number` | `30000` | Intervalle de rafraîchissement de la carte en **millisecondes** | +### Configuration YAML Avancée -### Exemple complet +Voici un exemple de configuration complet pour exploiter 100% des capacités de la carte : ```yaml type: custom:sncf-train-card -device_id: abc123def456 +device_id: VOTRE_DEVICE_ID title: "Paris → Lyon" -train_lines: 4 +train_lines: 5 train_emoji: "🚆" train_emoji_axial_symmetry: true train_station_emoji: "🏙️" animation_duration: 45 update_interval: 60000 +show_route_details: true +use_real_duration: true +show_real_stop_times: true +show_delay_cause: true ``` -### Exemple d'affichage - -![Exemple d'affichage](./assets/card_example.png) - ---- - -## 📸 Aperçus - -**Carte capteur :** - -sensor - -**Détails du prochain train :** +**🔍 QUE FAIT CHAQUE OPTION ?** -image - -**Dashboard Lovelace :** - -dashboard +- train_lines: 5 : Affiche les 5 prochains départs sur votre tableau de bord. +- train_emoji: "🚆" : Remplace l'icône du train par défaut par l'emoji de votre choix. +- train_emoji_axial_symmetry: true : Retourne l'emoji horizontalement (très utile si vous voulez donner l'impression que le train roule vers la gauche). +- train_station_emoji: "🏙️" : Affiche cet emoji à côté du nom de la gare. +- animation_duration: 45 : L'animation du train qui avance sur la ligne démarrera exactement 45 minutes avant le départ. +- update_interval: 60000 : La carte se rafraîchit visuellement toutes les 60 secondes (60000 ms). +- show_route_details: true : Active le Radar de Ligne ! Affiche une timeline sous le trajet principal avec tous les arrêts intermédiaires de votre train. +- use_real_duration: true : Ajuste la vitesse de l'animation en fonction du temps de trajet réel. Un trajet de 2h paraîtra visuellement plus lent qu'un trajet de 15 minutes. +- show_real_stop_times: true : Sur le radar de ligne, en cas de retard, affiche l'heure initiale (barrée) suivie de la nouvelle heure estimée (en orange) pour chaque arrêt intermédiaire. +- show_delay_cause: true : Affiche clairement le motif du retard (ex: Panne de signalisation, Obstacle sur les voies) juste en dessous du temps de retard. --- -## 🛠 Développement +## 🔮 Roadmap / À venir -Compatible avec Home Assistant `2025.8+`. +🛤️ Pour les grands voyageurs : L'ajout de l'affichage des voies de départ et d'arrivée est actuellement en cours de réflexion. C'est une fonctionnalité qui s'avère beaucoup plus complexe à mettre en place de manière fiable . Restez à l'écoute ! -Structure : -- `__init__.py` : enregistrement de l'intégration et de la carte Lovelace -- `calendar.py` : calendrier -- `config_flow.py` : assistant UI de configuration -- `options_flow.py` : formulaire d’options dynamiques -- `sensor.py` : entités de capteurs -- `coordinator.py` : logique de récupération intelligente -- `translations/fr.json` : interface en français -- `manifest.json` : métadonnées et dépendances -- `www/sncf-train-card.js` : carte Lovelace personnalisée +## 👨‍💻 Développement et Contribution ---- +Compatible avec Home Assistant 2025.8 et supérieur. -## 👨‍💻 Auteur +Développé par Master13011. -Développé par [Master13011](https://github.com/Master13011) -Contributions bienvenues via **Pull Request** ou **Issues** - ---- +Les contributions sont les bienvenues ! N'hésitez pas à ouvrir une Issue pour signaler un problème ou soumettre une Pull Request. -## 📄 Licence +## 📄 LICENCE -Code open-source sous licence **MIT** +Ce projet est open-source et distribué sous la licence MIT. diff --git a/custom_components/sncf_trains/api.py b/custom_components/sncf_trains/api.py index 9e8e191..47d12e0 100644 --- a/custom_components/sncf_trains/api.py +++ b/custom_components/sncf_trains/api.py @@ -1,7 +1,7 @@ import base64 import logging from aiohttp import ClientSession, ClientTimeout, ClientError -from typing import List, Optional, Mapping +from typing import List, Optional, Mapping, Dict, Any from homeassistant.exceptions import ConfigEntryAuthFailed import asyncio @@ -22,7 +22,7 @@ def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): self._timeout = timeout async def fetch_departures( - self, stop_id: str, max_results: int = 20 #By default = 10 + self, stop_id: str, max_results: int = 20 ) -> Optional[List[dict]]: if stop_id.startswith("stop_area:"): url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" @@ -47,14 +47,10 @@ async def fetch_departures( timeout=ClientTimeout(total=self._timeout), ) as resp: if resp.status == 401: - # vrai problème d'auth raise ConfigEntryAuthFailed("Unauthorized: check your API key.") if resp.status == 429: - # rate-limit => pas une auth failure _LOGGER.warning("API rate limit (429) on %s with %s", url, params) - raise RuntimeError( - "SNCF API rate-limited (429)" - ) # sera géré comme non-critique + raise RuntimeError("SNCF API rate-limited (429)") resp.raise_for_status() data = await resp.json() return data.get("departures", []) @@ -65,7 +61,7 @@ async def fetch_departures( async def fetch_journeys( self, from_id: str, to_id: str, datetime_str: str, count: int = 20 - ) -> Optional[List[dict]]: + ) -> Optional[Dict[str, Any]]: # 👈 On change le type de retour url = f"{API_BASE}/v1/coverage/sncf/journeys" params_raw: dict[str, object] = { "from": from_id, @@ -91,7 +87,7 @@ async def fetch_journeys( raise RuntimeError("Quota exceeded: 429 Too Many Requests.") resp.raise_for_status() data = await resp.json() - return data.get("journeys", []) + return data # 👈 ON RETOURNE TOUT LE JSON ! except (ClientError, asyncio.TimeoutError) as err: _LOGGER.warning("Network error fetching journeys from SNCF API: %s", err) return None diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index d01faaa..4d3fca9 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -8,7 +8,6 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant -from homeassistant.exceptions import ConfigEntryAuthFailed from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.util import dt as dt_util @@ -71,10 +70,8 @@ def _build_datetime_param(self, time_start: str, time_end: str) -> str: dt_end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) if now > dt_end: - # Si la plage est finie pour aujourd'hui, on vise demain dt_start += timedelta(days=1) elif now > dt_start: - # Si on est dans la plage, on commence à "maintenant" dt_start = now return dt_start.strftime("%Y%m%dT%H%M%S") @@ -91,7 +88,6 @@ def _adjust_update_interval(self, time_start: str, time_end: str) -> timedelta: if end <= start: end += timedelta(days=1) - # Fenêtre d'activation 1h avant le début de la plage pre_start = start - timedelta(hours=1) if now < pre_start: @@ -123,34 +119,40 @@ async def _async_update_data(self) -> dict[str, Any]: arrival = entry.data[CONF_TO] time_start = entry.data[CONF_TIME_START] time_end = entry.data[CONF_TIME_END] - # On récupère le nombre de trains souhaité par l'utilisateur train_count = entry.data.get("train_count", 10) update_intervals.append(self._adjust_update_interval(time_start, time_end)) datetime_str = self._build_datetime_param(time_start, time_end) - journeys = None + journeys_data = None for attempt in range(1, max_retries + 1): try: - journeys = await self.api_client.fetch_journeys( + journeys_data = await self.api_client.fetch_journeys( departure, arrival, datetime_str, count=train_count ) - if journeys is not None: + if journeys_data is not None: break except (ClientError, asyncio.TimeoutError, RuntimeError) as err: _LOGGER.warning("Tentative %d/%d échouée: %s", attempt, max_retries, err) await asyncio.sleep(retry_delay) - if journeys is None or not isinstance(journeys, list): + # Vérification du dictionnaire + if journeys_data is None or not isinstance(journeys_data, dict): continue - # Filtrage des trajets directs uniquement - trains[subentry_id] = [ - j for j in journeys - if isinstance(j, dict) and len(j.get("sections", [])) == 1 - ] + # Extraction séparée + journeys_list = journeys_data.get("journeys", []) + disruptions_list = journeys_data.get("disruptions", []) + + valid_journeys = [] + for j in journeys_list: + if isinstance(j, dict) and len(j.get("sections", [])) == 1: + # 👈 LA MAGIE : On injecte les perturbations dans chaque trajet + j["_disruptions"] = disruptions_list + valid_journeys.append(j) + + trains[subentry_id] = valid_journeys - # Mise à jour de l'intervalle global du coordinateur (le plus petit des trajets) if update_intervals: new_interval = min(update_intervals) if self.update_interval != new_interval: diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index da7d40b..18b7648 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -35,15 +35,12 @@ async def async_setup_entry( for subentry in entry.subentries.values(): journeys = coordinator.data.get(subentry.subentry_id, []) - # Dynamisme : on crée autant de capteurs que demandé dans la config display_count = min(len(journeys), subentry.data.get("train_count", 0)) sensors = [] - # Capteurs individuels pour chaque train for idx in range(display_count): sensors.append(SncfTrainSensor(coordinator, subentry.subentry_id, idx)) - # Capteur résumé ligne par ligne sensors.append(SncfAllTrainsLineSensor(coordinator, subentry.subentry_id)) async_add_entities( @@ -90,16 +87,12 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: self.tid = train_id self.jid = journey_id entry = self.coordinator.entry.subentries[train_id] - journey = coordinator.data[train_id][journey_id] - section = journey.get("sections", [{}])[0] - departure_time = parse_datetime(section.get("base_departure_date_time", "")) self.departure = entry.data[CONF_FROM] self.arrival = entry.data[CONF_TO] self._attr_name = f"Train {journey_id + 1}" self._attr_unique_id = f"{entry.subentry_id}_{journey_id}" - self._attr_extra_state_attributes = self._extra_attributes(journey) self._attr_device_info = { "identifiers": {(DOMAIN, entry.subentry_id)}, "name": f"SNCF {entry.data[CONF_DEPARTURE_NAME]} → {entry.data[CONF_ARRIVAL_NAME]}", @@ -107,28 +100,45 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: "model": "API", "entry_type": DeviceEntryType.SERVICE, } - self._attr_native_value = departure_time + + # On appelle la fonction de mise à jour dès la création pour mutualiser le code + self._update_state() @callback def _handle_coordinator_update(self) -> None: - journey = self.coordinator.data[self.tid][self.jid] - section = journey.get("sections", [{}])[0] - self._attr_native_value = parse_datetime(section.get("base_departure_date_time", "")) - self._attr_extra_state_attributes = self._extra_attributes(journey) + """Appelé à chaque mise à jour de l'API.""" + self._update_state() self.async_write_ha_state() + def _update_state(self) -> None: + """Met à jour les valeurs du capteur de manière sécurisée.""" + journeys = self.coordinator.data.get(self.tid, []) + + # SÉCURITÉ : On vérifie si le train existe bien dans la liste ! + if self.jid < len(journeys): + journey = journeys[self.jid] + section = journey.get("sections", [{}])[0] + + self._attr_native_value = parse_datetime(section.get("base_departure_date_time", "")) + self._attr_extra_state_attributes = self._extra_attributes(journey) + self._attr_available = True # Le capteur est actif + else: + # Si l'API est KO ou renvoie moins de trains que prévu + self._attr_native_value = None + self._attr_extra_state_attributes = {} + self._attr_available = False # Le capteur passe en "Indisponible" proprement + def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: """Calcul des attributs détaillés pour chaque train.""" section = journey.get("sections", [{}])[0] - # 1. Gestion des dates avec fallback (Double Miroir pour le développeur) + # 1. Gestion des dates avec fallback base_dep_raw = section.get("base_departure_date_time") base_arr_raw = section.get("base_arrival_time") or section.get("base_arrival_date_time") - + real_dep_raw = journey.get("departure_date_time") or base_dep_raw real_arr_raw = journey.get("arrival_date_time") or base_arr_raw - # Formatage final (Zéro n/a ici) arrival_time = format_time(real_arr_raw) departure_time = format_time(real_dep_raw) @@ -145,12 +155,25 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") delay_cause = section.get("cause", "") + if not delay_cause: messages = journey.get("messages", []) if messages: delay_cause = messages[0].get("text", "") - # 4. Plan de vol structuré (Precision Radar) + if not delay_cause: + disruptions = journey.get("_disruptions", []) + links = section.get("display_informations", {}).get("links", []) + disruption_ids = [link.get("id") for link in links if link.get("type") == "disruption"] + + for disruption in disruptions: + if disruption.get("id") in disruption_ids: + disruption_msgs = disruption.get("messages", []) + if disruption_msgs: + delay_cause = disruption_msgs[0].get("text", "") + break + + # 4. Plan de vol structuré stops_schedule = [] route_details = "" show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) @@ -212,7 +235,7 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: "departure_time": departure_time, "arrival_time": arrival_time, "base_departure_time": format_time(base_dep_raw), - "base_arrival_time": arrival_time, # On remet l'info temps réel ici aussi + "base_arrival_time": arrival_time, "delay_minutes": delay, "delay_cause": delay_cause, "duration_minutes": get_duration(journey), diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index efb96b6..d8d810e 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -1,4 +1,4 @@ -// SNCF Train Card V3.5.0 +// SNCF Train Card V3.5.1 window.customCards = window.customCards || []; window.customCards.push({ type: 'sncf-train-card', From 229e949f3a5be71394194b5dbfc13a2b9b3e8a17 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Sun, 17 May 2026 15:13:53 +0200 Subject: [PATCH 15/23] =?UTF-8?q?Ajout=20des=20fichiers=20=C3=A0=20compare?= =?UTF-8?q?r=20pour=20merge=20:D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.new.md | 261 ++++++++++++++ .../sncf_trains/www/sncf-train-card.new.js | 319 ++++++++++++++++++ 2 files changed, 580 insertions(+) create mode 100644 README.new.md create mode 100644 custom_components/sncf_trains/www/sncf-train-card.new.js diff --git a/README.new.md b/README.new.md new file mode 100644 index 0000000..6f31760 --- /dev/null +++ b/README.new.md @@ -0,0 +1,261 @@ +![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) +![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) +![Licence MIT](https://img.shields.io/badge/Licence-MIT-green) + +# 🚆 SNCF Trains pour Home Assistant + +Suivez facilement les horaires des trains SNCF entre deux gares directement dans votre tableau de bord Home Assistant, grâce à l’API officielle de la [SNCF](https://www.digital.sncf.com/startup/api). + +Départs, arrivées, retards, durée du trajet et type de train (TER, TGV, etc.) : toutes les informations essentielles sont regroupées dans une interface personnalisable et entièrement traduite en français. + +> [!CAUTION] +> +> ### ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT +> +> **Ce projet est actuellement en phase d'amélioration intensive.** +> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version des fichiers de l'intégration pour garantir une compatibilité totale avec votre tableau de bord. + +--- + +## 🧪 Nouveauté en phase de test : Les Trains Supprimés + +> **Nous avons récemment introduit la détection et l'affichage des trains annulés/supprimés !** > Cette fonctionnalité est actuellement en **phase de test**. +> +> 🙏 **Un immense merci** à tous les utilisateurs qui prennent le temps de nous faire leurs retours (qu'il s'agisse de petits bugs ou de succès sur vos trajets quotidiens). C'est grâce à votre aide que nous pouvons stabiliser et améliorer ce projet pour tout le monde ! + +--- + +## 🚀 Dernières mises à jour (Avril 2026) + +Le système a été lourdement mis à jour pour vous offrir une précision et un confort d'utilisation optimaux : + +- **🕒 Correction de l'affichage de l'heure :** Résolution définitive du problème qui affichait des trains "il y a 8 heures". Le système gère désormais parfaitement les fuseaux horaires locaux. +- **📡 Radar de Ligne (V3.3) :** Intégration d'un visuel détaillé affichant les arrêts intermédiaires et détectant les modifications de parcours. _(Note : Cette option peut être désactivée dans les paramètres pour garder un design simple)._ +- **🎭 Moteur d'Animation Dynamique :** L'emoji du train avance désormais de manière synchronisée avec la durée réelle de votre trajet. +- **🔍 Analyse Intelligente des Perturbations :** \* Affichage clair de la **cause officielle** du retard (ex: Panne de signalisation, Défaut d'alimentation...). + - Code couleur intuitif : **Orange** pour les retards, **Rouge** pour les suppressions. + +--- + +## 📸 Aperçu Visuel + +| Design Épuré (Classique) | Nouveau Design (Radar de Ligne) | +| :-----------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------: | +| Avant | Radar de Ligne V3 | + +### ⚠️ Zoom sur les Retards et Perturbations + +Grâce à la nouvelle analyse des données de la SNCF, la carte est capable d'afficher le suivi en temps réel des incidents avec la cause exacte et l'impact sur chaque arrêt : + +Détail d'un retard avec sa cause officielle + +--- + +## 📦 Installation + +### 1. Via HACS (Méthode recommandée) + +_Nécessite [HACS](https://hacs.xyz/) installé sur votre Home Assistant._ + +1. Ouvrez **HACS** dans votre menu de gauche. +2. Recherchez **SNCF Trains**. +3. Cliquez sur **Installer**, puis redémarrez Home Assistant. + +### 2. Méthode Manuelle + +1. Téléchargez le contenu de ce dépôt. +2. Copiez le dossier `sncf_trains` dans le répertoire `config/custom_components/` de votre Home Assistant. +3. Redémarrez Home Assistant. + +--- + +## ⚙️ Configuration initiale + +1. Dans Home Assistant, allez dans **Paramètres** → **Appareils et services** → **Ajouter une intégration**. +2. Recherchez **SNCF Trains**. +3. Renseignez votre **Clé API SNCF** _(voir section suivante)_. +4. Configurez votre premier trajet en indiquant : + - La gare de départ. + - La gare d'arrivée. + - La plage horaire que vous souhaitez surveiller. + +_Astuce : Vous pouvez configurer autant de trajets différents que vous le souhaitez !_ + +--- + +## 🔐 Obtenir sa Clé API SNCF (Gratuit) + +Pour que l'intégration fonctionne, vous avez besoin d'une clé API officielle fournie par la SNCF : + +1. Rendez-vous sur le [portail API SNCF](https://www.digital.sncf.com/startup/api). +2. Créez un compte gratuitement ou connectez-vous. +3. Générez votre clé API (celle-ci autorise jusqu'à 5 000 requêtes par jour, ce qui est largement suffisant). +4. Copiez-la et collez-la lors de la configuration dans Home Assistant. + +> _Pour changer de clé plus tard, il vous suffira de cliquer sur **Reconfigurer** depuis la page de l'intégration._ + +--- + +## 🧩 Options et Personnalisation + +Vous pouvez ajuster le comportement de l'intégration sans avoir à redémarrer Home Assistant : + +**Options globales de l'intégration :** + +- ⏱ **Intervalle de rafraîchissement (actif) :** Fréquence de mise à jour pendant vos heures de trajet (défaut : 2 min). +- 🕰 **Intervalle de rafraîchissement (repos) :** Fréquence de mise à jour hors de vos heures de trajet (défaut : 60 min). + +**Options spécifiques à chaque trajet :** + +- 🚆 **Nombre de trains à afficher :** Choisissez combien de départs simultanés vous souhaitez surveiller **(jusqu'à 20 trains par ligne maximum !)**. +- 🕗 **Heures exactes de début et fin de surveillance.** + +_(Le mode actif se déclenche automatiquement 2 heures avant l'heure de début que vous avez configurée)._ + +--- + +## 📊 Données et Capteurs + +L'intégration crée automatiquement plusieurs capteurs pour vos automatisations : + +- `sensor.sncf__` : Le capteur global résumant votre trajet. +- `sensor.sncf_train_X__` : Un capteur individuel pour chaque train suivi. +- `calendar.trains` : Un calendrier pratique affichant vos prochains départs. + +**Informations disponibles pour chaque train :** + +- Heure de départ prévue et réelle. +- Heure d’arrivée. +- Durée totale du voyage. +- Type de train (TER, TGV...), direction et numéro de ligne. +- Minutes de retard et cause officielle (si applicable). + +--- + +## 🎨 Carte pour le Tableau de Bord (Lovelace) + +Une jolie carte visuelle (`sncf-train-card`) est incluse et prête à l'emploi dès l'installation ! + +### Trouver son `device_id` + +Pour que la carte sache quel trajet afficher, elle a besoin de l'identifiant de l'appareil (`device_id`) : + +1. Allez dans **Paramètres** → **Appareils et services** → **SNCF Trains**. +2. Cliquez sur l'appareil correspondant à votre trajet. +3. Regardez l'URL dans la barre de votre navigateur : la suite de lettres et chiffres à la fin est votre `device_id` (ex: `.../config/devices/device/abc123def456`). + +### Configuration YAML Avancée + +<<<<<<< HEAD +Voici un exemple de configuration complet pour exploiter 100% des capacités de la carte : +======= +--- + +## 🎨 Carte Lovelace — SNCF Train Card + +La carte `sncf-train-card` est **automatiquement disponible** dans le sélecteur de cartes dès l'installation de l'intégration. + +### Ajouter la carte + +Dans un tableau de bord, cliquer sur **+ Ajouter une carte** → chercher **SNCF Train Card**. + +La configuration peut ensuite se faire : + +- via l'éditeur visuel Lovelace +- ou via YAML + +Ou en YAML : +>>>>>>> origin/fetch-evolves + +```yaml +type: custom:sncf-train-card +device_id: VOTRE_DEVICE_ID +<<<<<<< HEAD +======= +``` + +### 🔍 Trouver le `device_id` + +_S'obtient dynamiquement via la configuration visuelle._ + +Le `device_id` correspond à l'appareil créé lors de la configuration du trajet. + +1. Aller dans **Paramètres → Appareils & services → SNCF Trains** +2. Cliquer sur le trajet souhaité +3. L'URL contient l'identifiant : `.../config/devices/device/XXXX` + +> ![Exemple d'identifiant](./assets/device_id_url.png) + +### ⚙️ Paramètres de la carte + +| Paramètre | Type | Défaut | Description | +|-----------|------|--------|-------------| +| `device_id` | `string` | **obligatoire** | Identifiant de l'appareil SNCF (voir ci-dessus) | +| `title` | `string` | `'Trains SNCF'` | Titre affiché en haut de la carte | +| `train_lines` | `number` | `3` | Nombre de trains affichés simultanément | +| `animation_duration` | `number` | `30` | Nombre de minutes avant l'arrivée en gare à partir duquel l'animation du train se déclenche (ex : `30` = animation active dans les 30 dernières minutes, `60` = dans la dernière heure) | +| `update_interval` | `number` | `30000` | Intervalle de rafraîchissement de la carte en **millisecondes** | +| `train_emoji_axial_symmetry` | `boolean` | `true` | Retourne l'emoji du train horizontalement | +| `train_emoji` | `string` | `'🚅'` | Emoji du train animé sur la barre | +| `show_departure_station` | `boolean` | `true` | Affiche ou masque les informations de départ | +| `departure_station_emoji` | `string` | `''` | Emoji de la station de départ | +| `show_arrival_station` | `boolean` | `true` | Affiche ou masque les informations d'arrivée | +| `arrival_station_emoji` | `string` | `'🚉'` | Emoji de la station d'arrivée | + +### Exemple complet + +```yaml +type: custom:sncf-train-card +device_id: abc123def456 +>>>>>>> origin/fetch-evolves +title: "Paris → Lyon" +train_lines: 5 +train_emoji: "🚆" +train_emoji_axial_symmetry: true +show_departure_station: true +departure_station_emoji: "🚉" +show_arrival_station: true +arrival_station_emoji: "🏙️" +animation_duration: 0 +update_interval: 60000 +show_route_details: true +use_real_duration: true +show_real_stop_times: true +show_delay_cause: true +``` + +**🔍 QUE FAIT CHAQUE OPTION ?** + +<<<<<<< HEAD +- train_lines: 5 : Affiche les 5 prochains départs sur votre tableau de bord. +- train_emoji: "🚆" : Remplace l'icône du train par défaut par l'emoji de votre choix. +- train_emoji_axial_symmetry: true : Retourne l'emoji horizontalement (très utile si vous voulez donner l'impression que le train roule vers la gauche). +- train_station_emoji: "🏙️" : Affiche cet emoji à côté du nom de la gare. +- animation_duration: 45 : L'animation du train qui avance sur la ligne démarrera exactement 45 minutes avant le départ. +- update_interval: 60000 : La carte se rafraîchit visuellement toutes les 60 secondes (60000 ms). +- show_route_details: true : Active le Radar de Ligne ! Affiche une timeline sous le trajet principal avec tous les arrêts intermédiaires de votre train. +- use_real_duration: true : Ajuste la vitesse de l'animation en fonction du temps de trajet réel. Un trajet de 2h paraîtra visuellement plus lent qu'un trajet de 15 minutes. +- show_real_stop_times: true : Sur le radar de ligne, en cas de retard, affiche l'heure initiale (barrée) suivie de la nouvelle heure estimée (en orange) pour chaque arrêt intermédiaire. +- show_delay_cause: true : Affiche clairement le motif du retard (ex: Panne de signalisation, Obstacle sur les voies) juste en dessous du temps de retard. +======= +![Exemple d'affichage](./assets/card_example.png) +![Exemple d'affichage](./assets/card_example.png) +>>>>>>> origin/fetch-evolves + +--- + +## 🔮 Roadmap / À venir + +🛤️ Pour les grands voyageurs : L'ajout de l'affichage des voies de départ et d'arrivée est actuellement en cours de réflexion. C'est une fonctionnalité qui s'avère beaucoup plus complexe à mettre en place de manière fiable . Restez à l'écoute ! + +## 👨‍💻 Développement et Contribution + +Compatible avec Home Assistant 2025.8 et supérieur. + +Développé par Master13011. + +Les contributions sont les bienvenues ! N'hésitez pas à ouvrir une Issue pour signaler un problème ou soumettre une Pull Request. + +## 📄 LICENCE + +Ce projet est open-source et distribué sous la licence MIT. diff --git a/custom_components/sncf_trains/www/sncf-train-card.new.js b/custom_components/sncf_trains/www/sncf-train-card.new.js new file mode 100644 index 0000000..ee20d1f --- /dev/null +++ b/custom_components/sncf_trains/www/sncf-train-card.new.js @@ -0,0 +1,319 @@ +// SNCF Train Card V3.5.1 +window.customCards = window.customCards || []; +window.customCards.push({ + type: 'sncf-train-card', + name: 'SNCF Train Card', + preview: true, + description: 'Version intégrale - Radar, Animation temps réel et Éditeur visuel.' +}); + +// --- ÉDITEUR VISUEL (CODE COMPLET) --- +class SncfTrainCardEditor extends HTMLElement { + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + } + + setConfig(config) { + this._config = { ...config }; + this.render(); + } + + set hass(hass) { + this._hass = hass; + } + + render() { + if (!this._config) return; + + this.shadowRoot.innerHTML = ` +
+
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
+ +
+
+
+
+ +
+ + +
+ +
+ + +
+
+ + + `; + + this.shadowRoot.querySelectorAll('input').forEach(input => { + input.addEventListener('change', this.valueChanged.bind(this)); + }); + } + + valueChanged(ev) { + if (!this._config) return; + const target = ev.target; + let value = target.type === 'checkbox' ? target.checked : (target.type === 'number' ? Number(target.value) : target.value); + this._config = { ...this._config, [target.id]: value }; + this.dispatchEvent(new CustomEvent('config-changed', { detail: { config: this._config }, bubbles: true, composed: true })); + } +} +customElements.define('sncf-train-card-editor', SncfTrainCardEditor); + +// --- CARTE PRINCIPALE (LOGIQUE COMPLÈTE) --- +class SncfTrainCard extends HTMLElement { + constructor() { + super(); + this.attachShadow({ mode: 'open' }); + this.updateInterval = null; + this.lastTrainSignature = null; + this._lastRenderTime = 0; + } + + static getConfigElement() { return document.createElement("sncf-train-card-editor"); } + + setConfig(config) { + if (!config.device_id) throw new Error('You need to define device_id'); + this.config = { + title: "Trains SNCF", + train_emoji: "🚅", + train_station_emoji: "🚉", + train_emoji_axial_symmetry: true, + animation_duration: 30, + use_real_duration: true, + speed_factor: 2, + update_interval: 30000, + show_real_stop_times: true, + ...config + }; + this.render(); + } + + set hass(hass) { + this._hass = hass; + this.render(); + } + + connectedCallback() { this.startUpdateTimer(); } + disconnectedCallback() { this.stopUpdateTimer(); } + + startUpdateTimer() { + this.stopUpdateTimer(); + this.updateInterval = setInterval(async () => { + if (this._hass) { + this._lastRenderTime = 0; + await this.render(); + } + }, this.config.update_interval); + } + + stopUpdateTimer() { + if (this.updateInterval) { clearInterval(this.updateInterval); this.updateInterval = null; } + } + + async getTrainEntities() { + if (!this._hass || !this.config.device_id) return []; + try { + const allReg = await this._hass.callWS({ type: 'config/entity_registry/list' }); + const deviceEntities = allReg.filter(e => e.device_id === this.config.device_id); + const trainEntities = deviceEntities.filter(e => e.entity_id.includes('train')) + .map(e => this._hass.states[e.entity_id]) + .filter(e => e && e.attributes && e.attributes.departure_time); + + const now = new Date(); + return trainEntities.filter(e => this.parseTime(e.attributes.departure_time) >= now) + .sort((a, b) => this.parseTime(a.attributes.departure_time) - this.parseTime(b.attributes.departure_time)) + .slice(0, this.config.train_lines || 3); + } catch (e) { return []; } + } + + parseTime(t) { + if (!t || !t.includes(' - ')) return new Date(0); + const p = t.split(' - '), d = p[0].split('/'), h = p[1].split(':'); + return new Date(d[2], d[1]-1, d[0], h[0], h[1]); + } + + render() { + if (!this._hass || !this.config) return; + + const nowTs = Date.now(); + if (nowTs - this._lastRenderTime < 1000) return; + this._lastRenderTime = nowTs; + + this.getTrainEntities().then(trains => { + const currentTime = new Date(); + const trainLinesHTML = trains.map(train => { + const attrs = train.attributes; + const dep = this.parseTime(attrs.departure_time); + const diff = (dep - currentTime) / 60000; + const maxAnim = this.config.animation_duration || 30; + + const pos = diff > maxAnim ? -10 : (diff <= 0 ? 100 : ((maxAnim - diff) / maxAnim) * 100); + + const hasDelay = attrs.has_delay || false; + const isCanceled = attrs.canceled || false; + + let animDur = this.config.use_real_duration && attrs.duration_minutes ? + attrs.duration_minutes * (this.config.speed_factor || 2) : 30; + + let timelineHTML = ''; + if (this.config.show_route_details && attrs.stops_schedule) { + timelineHTML = ` +
+
+
+ ${attrs.stops_schedule.map(s => { + const isDeleted = s.effect === 'deleted'; + const isAdded = s.effect === 'added'; + const isStopDelayed = this.config.show_real_stop_times && s.amended_time && s.base_time && (s.amended_time !== s.base_time); + + const displayTime = isStopDelayed ? + `${s.base_time}${s.amended_time}` : + `${s.base_time || s.time}`; + + let statusBadge = ""; + if (isDeleted) statusBadge = ' SUPPRIMÉ'; + else if (isAdded) statusBadge = ' RAJOUTÉ'; + + return ` +
+
+
${displayTime}
+
+ ${s.name}${statusBadge} +
+
`; + }).join('')} +
+
`; + } + + const timeOnly = (t) => t ? t.split(' - ')[1] : "--:--"; + + return ` +
+
+
+ ${pos >= 0 && pos <= 100 ? ` +
+ ${isCanceled ? '❌' : this.config.train_emoji} +
+ ` : ''} +
+
+
${this.config.train_station_emoji}
+
+
${hasDelay ? `${timeOnly(attrs.base_departure_time)}${timeOnly(attrs.departure_time)}` : timeOnly(attrs.departure_time)}
+
+ ${isCanceled ? 'ANNULÉ' : (hasDelay ? `+${attrs.delay_minutes}min` : 'À l\'heure')} +
+ ${attrs.delay_cause ? `
${attrs.delay_cause}
` : ''} +
+
+
+ ${timelineHTML} +
`; + }).join(''); + + this.shadowRoot.innerHTML = ` + + +
${this.config.title}
+ ${trainLinesHTML} + `; + }); + } +} +customElements.define('sncf-train-card', SncfTrainCard); \ No newline at end of file From 87157e9866e861258bb61966c303f3421abcf05b Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Sat, 23 May 2026 16:28:54 +0200 Subject: [PATCH 16/23] =?UTF-8?q?Homog=C3=A9n=C3=A9isation=20des=20devs=20?= =?UTF-8?q?de=20PB35=20avec=20ceux=20de=20la=20branche=20main.=20TODO=20:?= =?UTF-8?q?=20tester=20avec=20son=20backend=20python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sncf_trains/www/sncf-train-card.js | 27 +- .../sncf_trains/www/sncf-train-card.new.js | 1119 +++++++++++++---- 2 files changed, 859 insertions(+), 287 deletions(-) diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index e3e8f1e..9ec73da 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -1,5 +1,5 @@ // Ajouter au registre des cartes personnalisées -globalThis.customCards ||= [] +globalThis.customCards = globalThis.customCards || [] globalThis.customCards.push({ type: 'sncf-train-card', name: 'SNCF Train Card', @@ -472,27 +472,6 @@ class SncfTrainCard extends HTMLElement { }); } - /** - * Calcule l'heure d'arrivée réelle en ajoutant les minutes de retard à l'heure de départ prévue, et retourne une chaîne formatée de l'heure d'arrivée réelle, ou null si les données nécessaires sont manquantes ou si le train n'a pas de retard. - * @param departureTime - L'heure de départ - * @param delayMinutes - Le temps de retard en minutes - * @returns {string} Une chaîne représentant l'heure avec retard formatée ou null - */ - // TODO : tester si encore utile ? - calculateRealArrivalTime(departureTime, delayMinutes) { - if (!departureTime || !delayMinutes || delayMinutes === 0) { - return null; - } - - const originalTime = this.parseTime(departureTime); - const realTime = new Date(originalTime.getTime() + (delayMinutes * 60000)); // Ajouter les minutes de retard - - return realTime.toLocaleTimeString('fr-FR', { - hour: '2-digit', - minute: '2-digit' - }); - } - /** * Calcule la couleur du train en fonction du retard * @param {number} delayMinutes - Le nombre de minutes de retard @@ -567,7 +546,7 @@ class SncfTrainCard extends HTMLElement { * @returns {string} Une chaîne HTML représentant la section complète du train */ renderTrainLines(trains) { - return trains.map((train, index) => { + return trains.map(train => { const TA = train.attributes; const position = this.calculateTrainPosition(TA); const delayMinutes = TA.delay_minutes || 0; @@ -854,4 +833,4 @@ class SncfTrainCard extends HTMLElement { } // Définir l'élément custom -customElements.define('sncf-train-card', SncfTrainCard); \ No newline at end of file +customElements.define('sncf-train-card', SncfTrainCard); diff --git a/custom_components/sncf_trains/www/sncf-train-card.new.js b/custom_components/sncf_trains/www/sncf-train-card.new.js index ee20d1f..6b7da79 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.new.js +++ b/custom_components/sncf_trains/www/sncf-train-card.new.js @@ -1,319 +1,912 @@ -// SNCF Train Card V3.5.1 -window.customCards = window.customCards || []; -window.customCards.push({ +// Ajouter au registre des cartes personnalisées +globalThis.customCards = globalThis.customCards || [] +globalThis.customCards.push({ type: 'sncf-train-card', name: 'SNCF Train Card', + description: 'Carte personnalisée animée pour afficher les trains SNCF en temps réel', preview: true, - description: 'Version intégrale - Radar, Animation temps réel et Éditeur visuel.' + configurable: true }); -// --- ÉDITEUR VISUEL (CODE COMPLET) --- -class SncfTrainCardEditor extends HTMLElement { +class SncfTrainCard extends HTMLElement { constructor() { super(); - this.attachShadow({ mode: 'open' }); + this.attachShadow({mode: 'open'}); + this.updateInterval = null; + this.lastTrainSignature = null; + this._lastRenderTime = 0; } + /** + * Méthode héritée
+ * Permet de définir la configuration de la carte, avec validation et gestion des changements de device_id pour forcer une mise à jour immédiate + * @param {Object} config - La configuration de la carte, qui doit inclure au minimum un device_id valide pour fonctionner correctement, et peut inclure d'autres paramètres pour personnaliser l'affichage + * @throws {Error} Si le device_id n'est pas défini, une erreur est levée pour informer l'utilisateur de la nécessité de fournir cette information essentielle + */ setConfig(config) { - this._config = { ...config }; + if (!config.device_id) { + throw new Error('You need to define device_id'); + } + + // Normaliser device_id en tableau (rétrocompatibilité) + let normalizedDeviceId = config.device_id; + if (typeof normalizedDeviceId === 'string') { + normalizedDeviceId = [normalizedDeviceId]; + } else if (!Array.isArray(normalizedDeviceId)) { + // FIXME : custom error ? + throw new TypeError('device_id must be a string or an array of strings'); + } + + // Vérifier qu'il y a au moins un device_id non-vide + if (!normalizedDeviceId.length || !normalizedDeviceId.some(id => typeof id === 'string' && id.trim() !== '')) { + // FIXME : custom error ? + throw new TypeError('You need to define at least one valid device_id'); + } + + const previousDeviceId = this.config ? this.config.device_id : null; + const deviceIdChanged = previousDeviceId && JSON.stringify(previousDeviceId) !== JSON.stringify(normalizedDeviceId); + + // Créer une copie de la config avec le device_id normalisé + this.config = { ...config, device_id: normalizedDeviceId }; + + // Forcer la mise à jour immédiate si device_id a changé + if (deviceIdChanged) { + this.stopUpdateTimer(); + this.startUpdateTimer(); + } + + // Toujours forcer un nouveau rendu this.render(); } - set hass(hass) { - this._hass = hass; + /** + * Méthode héritée
+ * Fournit la configuration du formulaire pour l'éditeur de Lovelace, avec des labels et des aides personnalisés + */ + static getConfigForm() { + return { + schema: [ + { + name: "device_id", + required: true, + selector: { + device: { + multiple: true, + filter: { + integration: "sncf_trains" + } + } + } + }, + { + name: "title", + selector: {text: {}}, + }, + { + name: "train_lines", + selector: { + number: { + min: 1, + max: 10, + step: 1, + }, + }, + }, + { + name: "animation_duration", + selector: { + number: { + min: 0, + max: 100, + step: 1, + }, + }, + }, + { + name: "update_interval", + selector: { + number: { + min: 5000, + step: 1000, + }, + }, + }, + { + name: "show_route_details", + selector: { boolean: {} } + }, + { + type: "grid", + name: "", + column_min_width: "150px", + schema: [ + { + name: "train_emoji_axial_symmetry", + selector: {boolean: {}}, + }, + { + name: "train_emoji", + selector: { + icon: {}, + }, + }, + { + name: "show_departure_station", + selector: {boolean: {}}, + }, + { + name: "departure_station_emoji", + selector: { + icon: {}, + }, + }, + { + name: "show_arrival_station", + selector: {boolean: {}}, + }, + { + name: "arrival_station_emoji", + selector: { + icon: {}, + }, + }, + ] + }, + ], + computeLabel: (schema) => { + const labels = { + device_id: "IDs des Devices (obligatoire - tableau de devices)", + title: "Titre de la carte", + train_emoji: "Emoji du train", + train_lines: "Nombre de trains à afficher", + animation_duration: "Durée d'animation (minutes)", + update_interval: "Intervalle de mise à jour (ms)", + departure_station_emoji: "Emoji de la gare de départ", + arrival_station_emoji: "Emoji de la gare d'arrivée", + show_departure_station: "Afficher les informations de départ", + show_arrival_station: "Afficher les informations d'arrivée", + train_emoji_axial_symmetry: "Symétrie axiale du train", + }; + return labels[schema.name] || undefined; + }, + computeHelper: (schema) => { + const helpers = { + device_id: "Les identifiants uniques des devices SNCF à afficher (tableau de devices)", + title: "Le titre affiché en haut de la carte", + train_emoji: "L'emoji représentant le train", + train_lines: "Le nombre de trains à afficher (1-10)", + animation_duration: "Nombre de minutes avant le départ pour que le train apparaisse", + update_interval: "Fréquence de rafraîchissement en millisecondes (ex: 30000 pour 30s)", + departure_station_emoji: "L'emoji pour la gare de départ", + arrival_station_emoji: "L'emoji pour la gare d'arrivée", + show_departure_station: "Affiche ou masque la gare de départ", + show_arrival_station: "Affiche ou masque la gare d'arrivée", + train_emoji_axial_symmetry: "Retourner l'emoji du train horizontalement", + }; + return helpers[schema.name] || undefined; + }, + }; } - render() { - if (!this._config) return; - - this.shadowRoot.innerHTML = ` -
-
- - -
- -
- - -
- -
-
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
- -
- - -
- -
- - -
- -
-
-
-
+ /** + * Méthode héritée
+ * Fournit une configuration par défaut pour le mode aperçu dans l'éditeur de Lovelace + */ + static getStubConfig() { + return { + device_id: ['', ''], + title: 'Trains SNCF', + train_lines: 5, + animation_duration: 30, + update_interval: 30000, + train_emoji_axial_symmetry: true, + train_emoji: '🚅', + show_departure_station: true, + departure_station_emoji: '', + show_arrival_station: true, + arrival_station_emoji: '🚉', + // TODO rename to show_route or show_timeline ? + show_route_details: false + }; + } -
- - -
- -
- - -
-
+ /** + * Méthode héritée
+ * Permet de recevoir l'objet Home Assistant et de déclencher une vérification des mises à jour des trains pour éviter les rendus inutiles + * @param {Object} hass - L'objet Home Assistant fourni par le système, utilisé pour accéder aux états et aux services, et pour déclencher des mises à jour de la carte lorsque les données des trains changent + */ + set hass(hass) { + const previousHass = this._hass; + this._hass = hass; - - `; + // Vérifier si les données des trains ont changé + if (this.config && previousHass) { + this.checkForTrainUpdates(previousHass, hass); + } else { + this.render(); + } + } - this.shadowRoot.querySelectorAll('input').forEach(input => { - input.addEventListener('change', this.valueChanged.bind(this)); - }); + /** + * Méthode héritée
+ * Démarre un timer pour forcer des mises à jour régulières, ce qui est nécessaire pour capturer les changements de données en temps réel + */ + connectedCallback() { + this.startUpdateTimer(); } - valueChanged(ev) { - if (!this._config) return; - const target = ev.target; - let value = target.type === 'checkbox' ? target.checked : (target.type === 'number' ? Number(target.value) : target.value); - this._config = { ...this._config, [target.id]: value }; - this.dispatchEvent(new CustomEvent('config-changed', { detail: { config: this._config }, bubbles: true, composed: true })); + /** + * Méthode héritée
+ * Arrête le timer de mise à jour pour éviter les fuites de mémoire lorsque la carte est retirée du DOM + */ + disconnectedCallback() { + this.stopUpdateTimer(); } -} -customElements.define('sncf-train-card-editor', SncfTrainCardEditor); -// --- CARTE PRINCIPALE (LOGIQUE COMPLÈTE) --- -class SncfTrainCard extends HTMLElement { - constructor() { - super(); - this.attachShadow({ mode: 'open' }); - this.updateInterval = null; - this.lastTrainSignature = null; - this._lastRenderTime = 0; + /** + * Méthode héritée
+ * Calcule la taille de la carte en fonction du nombre de lignes de train à afficher, avec une taille minimale pour éviter les problèmes d'affichage + */ + getCardSize() { + return Math.max(3, this.config.train_lines + 1); } - static getConfigElement() { return document.createElement("sncf-train-card-editor"); } + /** + * Vérifie si les données des trains ont changé en comparant une signature des données actuelles avec la dernière signature connue, et ne fait un rendu que si nécessaire pour optimiser les performances + * @param {Object} previousHass - L'objet Home Assistant précédent pour comparer les données + * @param {Object} currentHass - L'objet Home Assistant actuel pour récupérer les données fraîches + */ + async checkForTrainUpdates(previousHass, currentHass) { + try { + // Récupérer les entités actuelles + const currentTrains = await this.getTrainEntities(); - setConfig(config) { - if (!config.device_id) throw new Error('You need to define device_id'); - this.config = { - title: "Trains SNCF", - train_emoji: "🚅", - train_station_emoji: "🚉", - train_emoji_axial_symmetry: true, - animation_duration: 30, - use_real_duration: true, - speed_factor: 2, - update_interval: 30000, - show_real_stop_times: true, - ...config - }; - this.render(); - } + // Créer une signature des données actuelles + const currentSignature = this.createTrainSignature(currentTrains); - set hass(hass) { - this._hass = hass; - this.render(); + // Comparer avec la signature précédente + if (currentSignature !== this.lastTrainSignature) { + this.lastTrainSignature = currentSignature; + this.render(); + } + } catch (error) { + // En cas d'erreur, faire un rendu quand même + console.error(error); + this.render(); + } } - connectedCallback() { this.startUpdateTimer(); } - disconnectedCallback() { this.stopUpdateTimer(); } + /** + * Crée une signature unique pour les données des trains en concaténant les informations clés de chaque train, ce qui permet de détecter facilement les changements sans faire un rendu complet à chaque fois + * @param {Array} trains - Un tableau d'entités de train + * @returns {string} Une chaîne de caractères représentant la signature des données des trains + */ + createTrainSignature(trains) { + return trains.map(train => + `${train.entity_id}:${train.attributes.departure_time}:${train.attributes.delay_minutes || 0}:${train.attributes.has_delay || false}` + ).join('|'); + } + /** + * Démarre un timer qui force un rendu de la carte à intervalles réguliers, ce qui est nécessaire pour capturer les changements de données en temps réel, surtout pour les données de train qui peuvent changer fréquemment + */ startUpdateTimer() { this.stopUpdateTimer(); this.updateInterval = setInterval(async () => { if (this._hass) { - this._lastRenderTime = 0; + // Force un nouveau rendu à intervalles réguliers pour capturer les changements + this._lastRenderTime = 0; // Reset du throttle await this.render(); } }, this.config.update_interval); } + /** + * Arrête le timer de mise à jour pour éviter les fuites de mémoire lorsque la carte est retirée du DOM ou lorsque le device_id change, ce qui est important pour maintenir les performances et éviter les rendus inutiles + */ stopUpdateTimer() { - if (this.updateInterval) { clearInterval(this.updateInterval); this.updateInterval = null; } + if (this.updateInterval) { + clearInterval(this.updateInterval); + this.updateInterval = null; + } } + /** + * Récupère les entités de train associées aux device_id configurés en utilisant l'API WebSocket de Home Assistant pour obtenir des données fraîches, filtre les trains qui ne sont pas encore passés, et trie les résultats par heure de départ pour n'afficher que les trains à venir, ce qui garantit que les informations affichées sont toujours à jour et pertinentes pour l'utilisateur + * @returns {Promise} Un tableau d'entités de train avec des données fraîches, fusionnées de tous les devices et triées par date d'arrivée + */ async getTrainEntities() { if (!this._hass || !this.config.device_id) return []; + try { - const allReg = await this._hass.callWS({ type: 'config/entity_registry/list' }); - const deviceEntities = allReg.filter(e => e.device_id === this.config.device_id); - const trainEntities = deviceEntities.filter(e => e.entity_id.includes('train')) - .map(e => this._hass.states[e.entity_id]) - .filter(e => e && e.attributes && e.attributes.departure_time); - - const now = new Date(); - return trainEntities.filter(e => this.parseTime(e.attributes.departure_time) >= now) - .sort((a, b) => this.parseTime(a.attributes.departure_time) - this.parseTime(b.attributes.departure_time)) - .slice(0, this.config.train_lines || 3); - } catch (e) { return []; } - } + // Utiliser l'API Home Assistant pour récupérer toutes les entités + const allEntityRegistry = await this._hass.callWS({ type: 'config/entity_registry/list' }); + // Récupérer les entités pour tous les device_id + const allTrainEntities = []; + + for (const deviceId of this.config.device_id) { + if (!deviceId) continue; + + // Filtrer les entités par device_id + const deviceEntities = allEntityRegistry.filter(entityInfo => + entityInfo.device_id === deviceId + ); + + if (!deviceEntities || deviceEntities.length === 0) { + console.warn(`⚠️ Aucune entité trouvée pour le device_id: ${deviceId}`); + continue; + } - parseTime(t) { - if (!t || !t.includes(' - ')) return new Date(0); - const p = t.split(' - '), d = p[0].split('/'), h = p[1].split(':'); - return new Date(d[2], d[1]-1, d[0], h[0], h[1]); - } + // Récupérer les états des entités train trouvées avec données fraîches + const trainEntities = deviceEntities + .filter(entityInfo => entityInfo.entity_id.includes('train')) + .map(entityInfo => { + // Forcer la récupération de l'état frais + return this._hass.states[entityInfo.entity_id]; + }) + .filter(entity => entity?.attributes?.departure_time); - render() { - if (!this._hass || !this.config) return; + allTrainEntities.push(...trainEntities); + } - const nowTs = Date.now(); - if (nowTs - this._lastRenderTime < 1000) return; - this._lastRenderTime = nowTs; + // Source - https://stackoverflow.com/a/1214753 + // Posted by Kip, modified by community. See post 'Timeline' for change history + // Retrieved 2026-05-15, License - CC BY-SA 4.0 + const addMinutes = (date, minutes) => { + return new Date(date.getTime() + minutes*60000); + } - this.getTrainEntities().then(trains => { + // Filtrer les trains qui ne sont pas encore passés const currentTime = new Date(); - const trainLinesHTML = trains.map(train => { - const attrs = train.attributes; - const dep = this.parseTime(attrs.departure_time); - const diff = (dep - currentTime) / 60000; - const maxAnim = this.config.animation_duration || 30; - - const pos = diff > maxAnim ? -10 : (diff <= 0 ? 100 : ((maxAnim - diff) / maxAnim) * 100); - - const hasDelay = attrs.has_delay || false; - const isCanceled = attrs.canceled || false; - - let animDur = this.config.use_real_duration && attrs.duration_minutes ? - attrs.duration_minutes * (this.config.speed_factor || 2) : 30; - - let timelineHTML = ''; - if (this.config.show_route_details && attrs.stops_schedule) { - timelineHTML = ` -
-
-
- ${attrs.stops_schedule.map(s => { - const isDeleted = s.effect === 'deleted'; - const isAdded = s.effect === 'added'; - const isStopDelayed = this.config.show_real_stop_times && s.amended_time && s.base_time && (s.amended_time !== s.base_time); - - const displayTime = isStopDelayed ? - `${s.base_time}${s.amended_time}` : - `${s.base_time || s.time}`; - - let statusBadge = ""; - if (isDeleted) statusBadge = ' SUPPRIMÉ'; - else if (isAdded) statusBadge = ' RAJOUTÉ'; - - return ` -
-
-
${displayTime}
-
- ${s.name}${statusBadge} -
-
`; - }).join('')} -
-
`; + const upcomingTrains = allTrainEntities.filter(entity => { + // TODO : paramétrer le temps d'affichage max d'un train arrivé en gare + const arrivalTime = addMinutes(this.parseTime(entity.attributes.arrival_time), 30); + return arrivalTime >= currentTime; + }); + + return upcomingTrains.toSorted((a, b) => { + const aTime = this.parseTime(a.attributes.arrival_time); + const bTime = this.parseTime(b.attributes.arrival_time); + return aTime - bTime; + }) + .slice(0, this.config.train_lines); + + } catch (error) { + console.error('❌ Erreur lors de la récupération via API:', error); + return []; + } + } + + /** + * Parse une chaîne de temps au format spécifique de la SNCF (ex: "19/11/2025 - 08:20") et retourne un objet Date, ou une date par défaut si le format est invalide ou si la chaîne est vide, ce qui permet de gérer correctement les données de temps fournies par les entités de train et d'éviter les erreurs d'affichage + * @param {string} departureTime - La chaîne de temps à parser, qui peut être au format SNCF ou un format standard reconnu par JavaScript + * @returns {Date} Un objet Date représentant le temps de départ, ou une date par défaut si le parsing échoue + */ + parseTime(departureTime) { + if (!departureTime) { + return new Date(0); + } + + // Format SNCF: "19/11/2025 - 08:20" + if (departureTime.includes('/') && departureTime.includes(' - ')) { + const parts = departureTime.split(' - '); + if (parts.length === 2) { + const datePart = parts[0]; // "19/11/2025" + const timePart = parts[1]; // "08:20" + + const dateComponents = datePart.split('/'); + if (dateComponents.length === 3) { + const day = Number.parseInt(dateComponents[0]); + const month = Number.parseInt(dateComponents[1]) - 1; // Mois 0-indexé + const year = Number.parseInt(dateComponents[2]); + + const timeComponents = timePart.split(':'); + if (timeComponents.length === 2) { + const hour = Number.parseInt(timeComponents[0]); + const minute = Number.parseInt(timeComponents[1]); + + return new Date(year, month, day, hour, minute); + } } + } + } + + // Fallback vers Date classique + return new Date(departureTime); + } + + /** + * Calcule la position du train sur la barre de progression en fonction de l'heure actuelle et de l'heure de départ, en affichant le train 30 minutes avant le départ et en le faisant avancer vers la droite à mesure que l'heure de départ approche, ce qui crée une animation visuelle intuitive pour les utilisateurs afin de suivre l'approche du train vers la gare, et retourne une position en pourcentage (0% = train à gauche, 100% = train arrivé) ou une valeur négative pour indiquer que le train n'est pas encore visible, ce qui permet de gérer l'affichage du train de manière dynamique en fonction du temps restant avant le départ + * @param {object} trainAttributes - Les attributs du train, qui doivent inclure au minimum une heure de départ valide pour que le calcul fonctionne correctement, et peuvent inclure d'autres informations pour personnaliser l'affichage + * @returns {number} Un nombre représentant la position du train en pourcentage (0-100) ou une valeur négative si le train n'est pas encore visible + */ + calculateTrainPosition(trainAttributes) { + if (!trainAttributes.departure_time || !trainAttributes.arrival_time) { + return -10; + } + + const departure = this.parseTime(trainAttributes.departure_time); + const arrival = this.parseTime(trainAttributes.arrival_time); + const travelTime = (arrival - departure) / (1000 * 60); + + if (Number.isNaN(departure.getTime()) || Number.isNaN(arrival.getTime()) || travelTime < 0) { + return -10; + } + + const now = new Date(); + const diffMinutes = (arrival - now) / (1000 * 60); + + if (diffMinutes > travelTime) { + // TODO : tester et s'assurer de la véracité / nom du param animation_duration + if (this.config.animation_duration === 0 || this.config.animation_duration > diffMinutes - travelTime) { + // Train apparaît X minutes avant l'heure + return 0; + } + // Hors de la barre + return -10; + } + if (diffMinutes <= 0) { + // Arrivé à la gare + return 100; + } + + // Position sur la barre (0% = gauche, 100% = droite) + return ((travelTime - diffMinutes) / travelTime) * 100; + } + + /** + * Formate une chaîne de temps en une heure lisible au format français (ex: "08:20"), ou retourne "N/A" si la chaîne est vide, ou "Format invalide" si le parsing échoue, ce qui permet d'afficher les heures de départ et d'arrivée de manière claire et compréhensible pour les utilisateurs, tout en gérant les cas où les données de temps peuvent être manquantes ou mal formatées + * @param {string} timeString - La chaîne de temps à formater, qui doit être au format reconnu par la méthode parseTime + * @returns {string} Une chaîne représentant l'heure formatée ou un message d'erreur si le format est invalide + */ + formatTime(timeString) { + if (!timeString) { + return 'N/A'; + } + + const time = this.parseTime(timeString); + + if (Number.isNaN(time.getTime())) { + return 'Format invalide'; + } + + return time.toLocaleTimeString('fr-FR', { + hour: '2-digit', + minute: '2-digit' + }); + } - const timeOnly = (t) => t ? t.split(' - ')[1] : "--:--"; - - return ` -
-
-
- ${pos >= 0 && pos <= 100 ? ` -
- ${isCanceled ? '❌' : this.config.train_emoji} -
- ` : ''} -
-
-
${this.config.train_station_emoji}
-
-
${hasDelay ? `${timeOnly(attrs.base_departure_time)}${timeOnly(attrs.departure_time)}` : timeOnly(attrs.departure_time)}
-
- ${isCanceled ? 'ANNULÉ' : (hasDelay ? `+${attrs.delay_minutes}min` : 'À l\'heure')} -
- ${attrs.delay_cause ? `
${attrs.delay_cause}
` : ''} -
-
-
- ${timelineHTML} -
`; - }).join(''); + /** + * Calcule la couleur du train en fonction du retard + * @param {number} delayMinutes - Le nombre de minutes de retard + * @param {boolean} hasDelay - Indique si le train a du retard ou non + * @returns {string} La couleur correspondante + */ + getTrainColor(delayMinutes, hasDelay) { + if (!hasDelay || delayMinutes === 0) return '#4caf50'; // Vert à l'heure + return '#f44336'; // Rouge en retard (peu importe le nombre de minutes) + } + /** + * Méthode héritée
+ * Génération du rendu de l'ensemble de la carte, incluant le css et l'html + */ + async render() { + if (!this._hass || !this.config) { + return; + } + + // Éviter les rendus trop fréquents (max 1 par seconde) + const now = Date.now(); + if (now - this._lastRenderTime < 1000) { + return; + } + this._lastRenderTime = now; + + const trains = await this.getTrainEntities(); + + if (trains.length === 0) { this.shadowRoot.innerHTML = ` - -
${this.config.title}
- ${trainLinesHTML} - `; - }); +
+
Aucun train trouvé pour ce device. Vérifiez la configuration.
+
+ + `; + return; + } + + this.shadowRoot.innerHTML = ` + ${this.renderCss()} + + +
+
+
${this.config.title}
+
+ + ${this.renderTrainLines(trains)} + +
+ + `; + } + + /** + * Rendu des icônes en fonction de la configuration, en vérifiant si l'icône est un emoji simple ou une icône HA (mdi:, fa:, ic:, ...), et en retournant le HTML approprié pour chaque cas. + * @param icone - La chaîne de caractères représentant l'icône configurée, qui peut être un emoji simple ou une icône HA avec un préfixe spécifique, et qui doit être traitée différemment pour s'assurer qu'elle s'affiche correctement dans la carte + * @return {string} Une chaîne HTML représentant l'icône à afficher, soit en utilisant la balise pour les icônes HA, soit en affichant directement l'emoji pour les emojis simples, ce qui permet de gérer une grande variété d'icônes de manière flexible et personnalisable + */ + renderIcone(icone) { + if (icone?.includes(':')) { + return ``; + } + return icone; + } + + /** + * Rendu des lignes de train en fonction des données fournies, en calculant la position de chaque train sur la barre de progression, en affichant les informations de départ et d'arrivée selon la configuration, et en appliquant des styles différents pour les trains en retards. + * @param {Array} trains - Un tableau d'entités de train à afficher, avec leurs attributs contenant les informations nécessaires pour le rendu + * @returns {string} Une chaîne HTML représentant la section complète du train + */ + renderTrainLines(trains) { + return trains.map(train => { + const TA = train.attributes; + const position = this.calculateTrainPosition(TA); + const delayMinutes = TA.delay_minutes || 0; + const hasDelay = TA.has_delay; + const isRunning = this.parseTime(TA.departure_time) < new Date() && new Date() < this.parseTime(TA.arrival_time) + const isArrived = new Date() > this.parseTime(TA.arrival_time) + const trainColor = this.getTrainColor(delayMinutes, hasDelay); + + const theme = isArrived ? 'arrived' : hasDelay ? 'delayed' : isRunning ? 'running' : ''; + return ` +
+ ${this.config.show_departure_station ? this.renderDeparture(TA) : ''} + +
+ ${ position >= 0 ? + `
+ ${this.renderIcone(this.config.train_emoji)} +
` : '' + } +
+ + ${this.config.show_arrival_station ? this.renderArrival(TA) : ''} + + ${this.config.show_route_details && TA.stops_schedule ? this.renderTimeline(TA) : ''} +
`; + }).join(''); + } + + /** + * + * @param trainAttributes + * @return {string} + */ + renderTimeline(trainAttributes) { + return ` +
+
+
+ ${this.renderStops(trainAttributes.stops_schedule)} +
+
+ `; + } + + /** + * + * @param stops + * @return {*} + */ + renderStops(stops) { + return stops.map(stop => { + const isDeleted = stop.effect === 'deleted'; + const isAdded = stop.effect === 'added'; + const isStopDelayed = this.config.show_route_details && stop.amended_time && stop.base_time && (stop.amended_time !== stop.base_time); + + const displayTime = isStopDelayed ? + `${stop.base_time}${stop.amended_time}` : + `${stop.base_time || stop.time}`; + + let statusBadge = ""; + if (isDeleted) { + statusBadge = ' SUPPRIMÉ'; + } else if (isAdded) { + statusBadge = ' RAJOUTÉ'; + } + + return ` +
+
+
+ ${displayTime} +
+
+ ${stop.name}${statusBadge} +
+
+ `; + }).join(''); + } + + /** + * Rendu de la section de départ pour un train donné, en affichant l'heure de départ prévue, l'heure de départ réelle si le train a du retard. + * @param {object} trainAttributes - Les attributs du train + * @returns {string} Une chaîne HTML représentant la section de départ du train + */ + renderDeparture(trainAttributes) { + const hasDelay = trainAttributes.has_delay || false; + const isGone = new Date() > this.parseTime(trainAttributes.departure_time) + const delayMinutes = trainAttributes.delay_minutes || 0; + const departureTime = this.formatTime(trainAttributes.base_departure_time); + const realDepartureTime = this.formatTime(trainAttributes.departure_time); + + return ` +
+
+
+ ${hasDelay && realDepartureTime ? ` +
${departureTime}
+
${realDepartureTime}
+ ` : ` +
${departureTime}
+ `} +
+
+ ${hasDelay ? `+${delayMinutes}min` : isGone ? 'Parti' : 'À l\'heure'} +
+
+
${this.renderIcone(this.config.departure_station_emoji)}
+
+ ` + } + + /** + * Rendu de la section d'arrivée pour un train donné, en affichant l'heure d'arrivée prévue, l'heure d'arrivée réelle si le train a du retard. + * @param {object} trainAttributes - Les attributs du train + * @returns {string} Une chaîne HTML représentant la section d'arrivée du train + */ + renderArrival(trainAttributes) { + const hasDelay = trainAttributes.has_delay || false; + const isArrived = new Date() > this.parseTime(trainAttributes.arrival_time) + const delayMinutes = trainAttributes.delay_minutes || 0; + const arrivalTime = this.formatTime(trainAttributes.base_arrival_time); + const realArrivalTime = this.formatTime(trainAttributes.arrival_time); + + return ` +
+
${this.renderIcone(this.config.arrival_station_emoji)}
+
+
+ ${hasDelay && realArrivalTime ? ` +
${arrivalTime}
+
${realArrivalTime}
+ ` : ` +
${arrivalTime}
+ `} +
+
+ ${hasDelay ? `+${delayMinutes}min` : isArrived ? 'Arrivé' : 'À l\'heure'} +
+ ${trainAttributes.delay_cause ? `
${trainAttributes.delay_cause}
` : ''} +
+
+ `; + } + + /** + * Rendu du CSS pour la carte, en définissant les styles de base pour la carte, les lignes de train, les barres de progression, les emojis, et les informations de station + * @return {string} Une chaîne HTML contenant les styles CSS pour la carte. + */ + renderCss() { + return ` + + `; } + } -customElements.define('sncf-train-card', SncfTrainCard); \ No newline at end of file + +// Définir l'élément custom +customElements.define('sncf-train-card', SncfTrainCard); From 290e24cc3da333cf6371e108a95f1e6a8ac9dc8e Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 01:19:05 +0200 Subject: [PATCH 17/23] =?UTF-8?q?Reprise=20des=20devs=20python=20de=20PB35?= =?UTF-8?q?=20Diminution=20des=20impacts=20inutiles=20et=20des=20modificat?= =?UTF-8?q?ions=20anodines.=20Am=C3=A9lioration=20du=20frontend=20pour=20?= =?UTF-8?q?=C3=AAtre=20plus=20flexible=20Suppression=20de=20la=20notion=20?= =?UTF-8?q?de=20train=20annul=C3=A9=20pour=20le=20moment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom_components/sncf_trains/api.py | 40 +- custom_components/sncf_trains/config_flow.py | 25 +- custom_components/sncf_trains/const.py | 2 - custom_components/sncf_trains/coordinator.py | 80 +-- custom_components/sncf_trains/manifest.json | 10 +- custom_components/sncf_trains/sensor.py | 259 +++++----- custom_components/sncf_trains/strings.json | 6 +- .../sncf_trains/translations/fr.json | 6 +- .../sncf_trains/www/sncf-train-card.js | 476 +++++++++++++----- 9 files changed, 585 insertions(+), 319 deletions(-) diff --git a/custom_components/sncf_trains/api.py b/custom_components/sncf_trains/api.py index 47d12e0..85a4dd8 100644 --- a/custom_components/sncf_trains/api.py +++ b/custom_components/sncf_trains/api.py @@ -22,7 +22,7 @@ def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): self._timeout = timeout async def fetch_departures( - self, stop_id: str, max_results: int = 20 + self, stop_id: str, max_results: int = 10 ) -> Optional[List[dict]]: if stop_id.startswith("stop_area:"): url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" @@ -41,16 +41,20 @@ async def fetch_departures( try: async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), ) as resp: if resp.status == 401: + # vrai problème d'auth raise ConfigEntryAuthFailed("Unauthorized: check your API key.") if resp.status == 429: + # rate-limit => pas une auth failure _LOGGER.warning("API rate limit (429) on %s with %s", url, params) - raise RuntimeError("SNCF API rate-limited (429)") + raise RuntimeError( + "SNCF API rate-limited (429)" + ) # sera géré comme non-critique resp.raise_for_status() data = await resp.json() return data.get("departures", []) @@ -60,8 +64,8 @@ async def fetch_departures( return None async def fetch_journeys( - self, from_id: str, to_id: str, datetime_str: str, count: int = 20 - ) -> Optional[Dict[str, Any]]: # 👈 On change le type de retour + self, from_id: str, to_id: str, datetime_str: str, count: int = 5 + ) -> Optional[Dict[str, Any]]: url = f"{API_BASE}/v1/coverage/sncf/journeys" params_raw: dict[str, object] = { "from": from_id, @@ -76,10 +80,10 @@ async def fetch_journeys( headers = {"Authorization": f"Basic {self._token}"} try: async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), ) as resp: if resp.status == 401: raise ConfigEntryAuthFailed("Unauthorized: check your API key.") @@ -87,7 +91,7 @@ async def fetch_journeys( raise RuntimeError("Quota exceeded: 429 Too Many Requests.") resp.raise_for_status() data = await resp.json() - return data # 👈 ON RETOURNE TOUT LE JSON ! + return data except (ClientError, asyncio.TimeoutError) as err: _LOGGER.warning("Network error fetching journeys from SNCF API: %s", err) return None @@ -102,14 +106,14 @@ async def search_stations(self, query: str) -> Optional[List[dict]]: headers = {"Authorization": f"Basic {self._token}"} try: async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), ) as resp: resp.raise_for_status() data = await resp.json() return data.get("places", []) except (ClientError, asyncio.TimeoutError) as err: _LOGGER.error("Network error searching stations from SNCF API: %s", err) - return None \ No newline at end of file + return None diff --git a/custom_components/sncf_trains/config_flow.py b/custom_components/sncf_trains/config_flow.py index 2f2e1db..27941f4 100644 --- a/custom_components/sncf_trains/config_flow.py +++ b/custom_components/sncf_trains/config_flow.py @@ -29,13 +29,11 @@ CONF_TRAIN_COUNT, CONF_UPDATE_INTERVAL, CONF_OUTSIDE_INTERVAL, - CONF_SHOW_ROUTE_DETAILS, # NOUVEAU DEFAULT_OUTSIDE_INTERVAL, DEFAULT_TIME_END, DEFAULT_TIME_START, DEFAULT_TRAIN_COUNT, DEFAULT_UPDATE_INTERVAL, - DEFAULT_SHOW_ROUTE_DETAILS, # NOUVEAU DOMAIN, ) @@ -83,7 +81,7 @@ async def _validate_api_key(self, api: SncfApiClient): @classmethod @callback def async_get_supported_subentry_types( - cls, config_entry: ConfigEntry + cls, config_entry: ConfigEntry ) -> dict[str, type[ConfigSubentryFlow]]: """Return subentries supported by this integration.""" return { @@ -142,7 +140,7 @@ class TrainSubentryFlowHandler(ConfigSubentryFlow): config_entry: ConfigEntry | None = None async def async_step_departure_city( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the departure city step.""" errors = {} @@ -168,7 +166,7 @@ async def async_step_departure_city( ) async def async_step_departure_station( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the departure station step.""" if user_input is not None: @@ -186,7 +184,7 @@ async def async_step_departure_station( ) async def async_step_arrival_city( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the arrival city step.""" errors = {} @@ -205,7 +203,7 @@ async def async_step_arrival_city( ) async def async_step_arrival_station( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the arrival station step.""" if user_input is not None: @@ -223,7 +221,7 @@ async def async_step_arrival_station( ) async def async_step_time_range( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the time range step.""" if user_input is not None: @@ -252,8 +250,6 @@ async def async_step_time_range( }, unique_id=unique_id, ) - - # NOUVEAU: On ajoute l'option booléenne return self.async_show_form( step_id="time_range", data_schema=vol.Schema( @@ -261,13 +257,12 @@ async def async_step_time_range( vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, - vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=DEFAULT_SHOW_ROUTE_DETAILS): bool, } ), ) async def async_step_reconfigure( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """User flow to modify an existing entry.""" config_subentry = self._get_reconfigure_subentry() @@ -283,15 +278,11 @@ async def async_step_reconfigure( title=f"Trajet: {data[CONF_DEPARTURE_NAME]} → {data[CONF_ARRIVAL_NAME]} ({data[CONF_TIME_START]} - {data[CONF_TIME_END]})", ) - # NOUVEAU: On récupère l'ancienne valeur si elle existe - current_show_route = config_subentry.data.get(CONF_SHOW_ROUTE_DETAILS, DEFAULT_SHOW_ROUTE_DETAILS) - DATA_SCHEMA = vol.Schema( { vol.Required(CONF_TIME_START, default=DEFAULT_TIME_START): str, vol.Required(CONF_TIME_END, default=DEFAULT_TIME_END): str, vol.Required(CONF_TRAIN_COUNT, default=DEFAULT_TRAIN_COUNT): int, - vol.Optional(CONF_SHOW_ROUTE_DETAILS, default=current_show_route): bool, } ) @@ -302,4 +293,4 @@ async def async_step_reconfigure( ), ) - async_step_user = async_step_departure_city \ No newline at end of file + async_step_user = async_step_departure_city diff --git a/custom_components/sncf_trains/const.py b/custom_components/sncf_trains/const.py index 545f277..74a05e1 100644 --- a/custom_components/sncf_trains/const.py +++ b/custom_components/sncf_trains/const.py @@ -9,7 +9,6 @@ DEFAULT_TRAIN_COUNT = 5 DEFAULT_TIME_START = "07:00" DEFAULT_TIME_END = "10:00" -DEFAULT_SHOW_ROUTE_DETAILS = False ATTRIBUTION = "Data provided by api.sncf.com" @@ -24,4 +23,3 @@ CONF_TIME_START = "time_start" CONF_TO = "to" CONF_TRAIN_COUNT = "train_count" -CONF_SHOW_ROUTE_DETAILS = "show_route_details" # NOUVEAU \ No newline at end of file diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index 4d3fca9..1d68190 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -1,13 +1,13 @@ -"""Data Update Coordinator for SNCF integration.""" +"""Data Update Coordinator.""" import logging from datetime import timedelta from typing import Any import asyncio from aiohttp import ClientError - from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant +from homeassistant.exceptions import ConfigEntryAuthFailed from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.util import dt as dt_util @@ -32,7 +32,7 @@ class SncfUpdateCoordinator(DataUpdateCoordinator): """Coordonnateur pour récupérer les données des trajets SNCF.""" def __init__(self, hass: HomeAssistant, entry: ConfigEntry): - """Initialisation du coordinateur.""" + """Initialisation.""" self.entry = entry self.api_client = None self.update_interval_minutes = entry.options.get( @@ -50,22 +50,24 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry): ) async def _async_setup(self) -> None: - """Paramétrage du client API au démarrage.""" + """Paramétrage du coordinateur.""" api_key = self.entry.data[CONF_API_KEY] try: session = async_get_clientsession(self.hass) self.api_client = SncfApiClient(session, api_key) + except Exception as err: - _LOGGER.error("Erreur d'initialisation API SNCF: %s", err) + if "401" in str(err) or "403" in str(err): + raise ConfigEntryAuthFailed("Clé API invalide ou expirée") from err + _LOGGER.error("Erreur lors de la récupération des trajets SNCF: %s", err) raise UpdateFailed(err) from err def _build_datetime_param(self, time_start: str, time_end: str) -> str: - """Construit le paramètre datetime pour l'API en ignorant le passé.""" + """Construit le paramètre datetime pour l'API""" now = dt_util.now() h_start, m_start = map(int, time_start.split(":")) h_end, m_end = map(int, time_end.split(":")) - dt_start = now.replace(hour=h_start, minute=m_start, second=0, microsecond=0) dt_end = now.replace(hour=h_end, minute=m_end, second=0, microsecond=0) @@ -76,8 +78,8 @@ def _build_datetime_param(self, time_start: str, time_end: str) -> str: return dt_start.strftime("%Y%m%dT%H%M%S") - def _adjust_update_interval(self, time_start: str, time_end: str) -> timedelta: - """Calcule l'intervalle approprié (Actif vs Éco).""" + def _adjust_update_interval(self, time_start, time_end) -> timedelta | None: + """Ajuste la fréquence selon la plage horaire, avec préfenêtre 1h et gestion minuit.""" now = dt_util.now() h_start, m_start = map(int, time_start.split(":")) h_end, m_end = map(int, time_end.split(":")) @@ -102,19 +104,35 @@ def _adjust_update_interval(self, time_start: str, time_end: str) -> timedelta: if in_fast_mode else self.outside_interval_minutes ) - return timedelta(minutes=interval_minutes) + new_interval = timedelta(minutes=interval_minutes) + + if self.update_interval != new_interval: + _LOGGER.debug( + "Update interval: %s → %s minutes", + ( + None + if self.update_interval is None + else self.update_interval.total_seconds() / 60 + ), + interval_minutes, + ) + return new_interval + + return new_interval async def _async_update_data(self) -> dict[str, Any]: - """Récupère les données depuis l'API SNCF.""" + """Récupère les données de l'API SNCF.""" + if not self.entry.subentries: + _LOGGER.warning("Pas de subentries configurés") return {} update_intervals = [] trains = {} - max_retries = 3 - retry_delay = 2 - + max_retries = 3 # nombre de tentatives + retry_delay = 2 # secondes entre les tentatives for subentry_id, entry in self.entry.subentries.items(): + _LOGGER.debug(entry.title) departure = entry.data[CONF_FROM] arrival = entry.data[CONF_TO] time_start = entry.data[CONF_TIME_START] @@ -123,31 +141,34 @@ async def _async_update_data(self) -> dict[str, Any]: update_intervals.append(self._adjust_update_interval(time_start, time_end)) datetime_str = self._build_datetime_param(time_start, time_end) - - journeys_data = None + journeys = None for attempt in range(1, max_retries + 1): try: - journeys_data = await self.api_client.fetch_journeys( + journeys = await self.api_client.fetch_journeys( departure, arrival, datetime_str, count=train_count ) - if journeys_data is not None: - break + if journeys is not None: + break # succès, on sort du retry except (ClientError, asyncio.TimeoutError, RuntimeError) as err: - _LOGGER.warning("Tentative %d/%d échouée: %s", attempt, max_retries, err) + _LOGGER.warning( + "Erreur réseau lors de la récupération des trajets (tentative %d/%d) : %s", + attempt, + max_retries, + err, + ) await asyncio.sleep(retry_delay) - # Vérification du dictionnaire - if journeys_data is None or not isinstance(journeys_data, dict): + if journeys is None or not isinstance(journeys, dict): + _LOGGER.error("Aucune donnée reçue de l'API SNCF pour le trajet ") continue - # Extraction séparée - journeys_list = journeys_data.get("journeys", []) - disruptions_list = journeys_data.get("disruptions", []) + journeys_list = journeys.get("journeys", []) + disruptions_list = journeys.get("disruptions", []) valid_journeys = [] for j in journeys_list: if isinstance(j, dict) and len(j.get("sections", [])) == 1: - # 👈 LA MAGIE : On injecte les perturbations dans chaque trajet + # On injecte les perturbations dans chaque trajet j["_disruptions"] = disruptions_list valid_journeys.append(j) @@ -157,6 +178,9 @@ async def _async_update_data(self) -> dict[str, Any]: new_interval = min(update_intervals) if self.update_interval != new_interval: self.update_interval = new_interval - _LOGGER.debug("Nouvel intervalle de mise à jour: %s min", new_interval.total_seconds() / 60) + _LOGGER.debug( + "Coordinator update interval set to %s minutes", + self.update_interval.total_seconds() / 60, + ) - return trains \ No newline at end of file + return trains diff --git a/custom_components/sncf_trains/manifest.json b/custom_components/sncf_trains/manifest.json index 3ed24ae..a89ef6b 100644 --- a/custom_components/sncf_trains/manifest.json +++ b/custom_components/sncf_trains/manifest.json @@ -1,16 +1,12 @@ { "domain": "sncf_trains", "name": "SNCF Trains", - "after_dependencies": [ - "http" - ], + "after_dependencies": ["http"], "codeowners": [ "@Master13011" ], "config_flow": true, - "dependencies": [ - "frontend" - ], + "dependencies": ["frontend"], "documentation": "https://github.com/Master13011/SNCF-API-HA", "integration_type": "service", "iot_class": "cloud_polling", @@ -21,4 +17,4 @@ "requirements": [], "single_config_entry": true, "version": "1.0.0" -} +} \ No newline at end of file diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index 18b7648..d879fd6 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -22,9 +22,9 @@ async def async_setup_entry( - hass: HomeAssistant, - entry: SncfDataConfigEntry, - async_add_entities: AddEntitiesCallback, + hass: HomeAssistant, + entry: SncfDataConfigEntry, + async_add_entities: AddEntitiesCallback, ) -> None: """Set up SNCF entities from a config entry.""" @@ -38,16 +38,22 @@ async def async_setup_entry( display_count = min(len(journeys), subentry.data.get("train_count", 0)) sensors = [] + # Capteurs individuels pour chaque train for idx in range(display_count): sensors.append(SncfTrainSensor(coordinator, subentry.subentry_id, idx)) + # Capteur résumé ligne par ligne sensors.append(SncfAllTrainsLineSensor(coordinator, subentry.subentry_id)) + # Ajouter tous les capteurs de cette subentry au même niveau async_add_entities( sensors, config_subentry_id=subentry.subentry_id, update_before_add=True ) +# --- Sensor Classes --- + + class SncfJourneySensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): """Main SNCF sensor: number of direct journeys & summary.""" @@ -57,6 +63,7 @@ class SncfJourneySensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): _attr_native_unit_of_measurement = "trajets" def __init__(self, coordinator: SncfUpdateCoordinator) -> None: + """Initialize.""" super().__init__(coordinator) self._attr_unique_id = f"sncf_trains_{coordinator.entry.entry_id}" self._attr_device_info = { @@ -67,10 +74,19 @@ def __init__(self, coordinator: SncfUpdateCoordinator) -> None: "entry_type": DeviceEntryType.SERVICE, } self._attr_native_value = len(coordinator.data) + self._attr_extra_state_attributes = { + "update_interval": coordinator.update_interval_minutes, + "outside_interval": coordinator.outside_interval_minutes, + } @callback def _handle_coordinator_update(self) -> None: + """Handle updated data from the coordinator.""" self._attr_native_value = len(self.coordinator.data) + self._attr_extra_state_attributes = { + "update_interval": self.coordinator.update_interval_minutes, + "outside_interval": self.coordinator.outside_interval_minutes, + } self.async_write_ha_state() @@ -83,16 +99,23 @@ class SncfTrainSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): _attr_device_class = SensorDeviceClass.TIMESTAMP def __init__(self, coordinator, train_id: str, journey_id: int) -> None: + """Initialize the sensor.""" super().__init__(coordinator) self.tid = train_id self.jid = journey_id entry = self.coordinator.entry.subentries[train_id] + self.journey = coordinator.data[train_id][journey_id] + self.sections = self.journey.get("sections", [{}])[0] + departure_time = parse_datetime(self.sections.get("base_departure_date_time", "")) + dep_name = entry.data[CONF_DEPARTURE_NAME] + arr_name = entry.data[CONF_ARRIVAL_NAME] self.departure = entry.data[CONF_FROM] self.arrival = entry.data[CONF_TO] self._attr_name = f"Train {journey_id + 1}" self._attr_unique_id = f"{entry.subentry_id}_{journey_id}" + self._attr_extra_state_attributes = self._extra_attributes(self.journey) self._attr_device_info = { "identifiers": {(DOMAIN, entry.subentry_id)}, "name": f"SNCF {entry.data[CONF_DEPARTURE_NAME]} → {entry.data[CONF_ARRIVAL_NAME]}", @@ -100,7 +123,7 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: "model": "API", "entry_type": DeviceEntryType.SERVICE, } - + self._attr_native_value = departure_time # On appelle la fonction de mise à jour dès la création pour mutualiser le code self._update_state() @@ -111,59 +134,118 @@ def _handle_coordinator_update(self) -> None: self.async_write_ha_state() def _update_state(self) -> None: - """Met à jour les valeurs du capteur de manière sécurisée.""" - journeys = self.coordinator.data.get(self.tid, []) - - # SÉCURITÉ : On vérifie si le train existe bien dans la liste ! - if self.jid < len(journeys): - journey = journeys[self.jid] - section = journey.get("sections", [{}])[0] - - self._attr_native_value = parse_datetime(section.get("base_departure_date_time", "")) - self._attr_extra_state_attributes = self._extra_attributes(journey) + """Handle updated data from the coordinator.""" + self.journey = self.coordinator.data[self.tid][self.jid] + if self.jid < len(self.journey): + self.sections = self.journey.get("sections", [{}])[0] + self._attr_native_value = parse_datetime(self.sections.get("base_departure_date_time", "")) + self._attr_extra_state_attributes = self._extra_attributes(self.journey) self._attr_available = True # Le capteur est actif else: # Si l'API est KO ou renvoie moins de trains que prévu self._attr_native_value = None self._attr_extra_state_attributes = {} - self._attr_available = False # Le capteur passe en "Indisponible" proprement + self._attr_available = False # Le capteur passe en "Indisponible" def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: - """Calcul des attributs détaillés pour chaque train.""" - section = journey.get("sections", [{}])[0] + """Extra attributes.""" + arr_dt = parse_datetime(self.sections.get("arrival_date_time", "")) + base_arr_dt = parse_datetime(self.sections.get("base_arrival_date_time", "")) + delay = ( + int((arr_dt - base_arr_dt).total_seconds() / 60) + if arr_dt and base_arr_dt + else 0 + ) - # 1. Gestion des dates avec fallback - base_dep_raw = section.get("base_departure_date_time") - base_arr_raw = section.get("base_arrival_time") or section.get("base_arrival_date_time") + delay_cause = self._get_delay() - real_dep_raw = journey.get("departure_date_time") or base_dep_raw - real_arr_raw = journey.get("arrival_date_time") or base_arr_raw + route_details, stops_schedule = self._get_route() - arrival_time = format_time(real_arr_raw) - departure_time = format_time(real_dep_raw) + return { + "departure_time": format_time(journey.get("departure_date_time", "")), + "arrival_time": format_time(journey.get("arrival_date_time", "")), + "base_departure_time": format_time(self.sections.get("base_departure_date_time")), + "base_arrival_time": format_time(self.sections.get("base_arrival_date_time")), + "delay_minutes": delay, + "delay_cause": delay_cause, + "duration_minutes": get_duration(journey), + "has_delay": delay > 0, + "route_details": route_details, + "stops_schedule": stops_schedule, + "departure_stop_id": self.departure, + "arrival_stop_id": self.arrival, + "direction": self.sections.get("display_informations", {}).get("direction", ""), + "physical_mode": self.sections.get("display_informations", {}).get("physical_mode", ""), + "commercial_mode": self.sections.get("display_informations", {}).get("commercial_mode", ""), + "train_num": get_train_num(journey), + } - # 2. Calcul du retard (minutes) - arr_dt = parse_datetime(real_arr_raw) - base_arr_dt = parse_datetime(base_arr_raw) - delay = 0 - if arr_dt and base_arr_dt: - delay = int((arr_dt - base_arr_dt).total_seconds() / 60) + def _get_route(self) -> Any: + impacted_stops = self.sections.get("impacted_stops", []) + stops_list = [] + stops_schedule = [] - # 3. Détection d'annulation et Cause - status = journey.get("status", "") - section_status = section.get("status", "") - is_canceled = (status == "NO_SERVICE" or section_status == "NO_SERVICE") + if impacted_stops: + for stop in impacted_stops: + stop_name = stop.get("stop_point", {}).get("name", "") + b_raw = stop.get("base_departure_time") or stop.get("base_arrival_time") + a_raw = stop.get("amended_departure_time") or stop.get("amended_arrival_time") + + b_time = f"{b_raw[:2]}:{b_raw[2:4]}" if b_raw and len(b_raw) >= 4 else "" + a_time = f"{a_raw[:2]}:{a_raw[2:4]}" if a_raw and len(a_raw) >= 4 else "" + + stop_effect = stop.get("stop_time_effect", "unchanged") + prefix = "" + if stop_effect == "deleted": + prefix = "[SUPPRIMÉ] " + elif stop_effect == "added": + prefix = "[NOUVEAU] " + + stops_list.append(f"{prefix}{stop_name} ({a_time if a_time else b_time})") + stops_schedule.append({ + "name": stop_name, + "base_time": b_time, + "amended_time": a_time if a_time != b_time else None, + "effect": stop_effect + }) + else: + stops_data = self.sections.get("stop_date_times", []) + for stop in stops_data: + stop_name = stop.get("stop_point", {}).get("name", "") + raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) + formatted_time = format_time(raw_time) if raw_time else "" + stop_effect = stop.get("stop_time_effect", "unchanged") + + if stop_name and formatted_time: + prefix = "" + if stop_effect == "deleted": + prefix = "[SUPPRIMÉ] " + elif stop_effect == "added": + prefix = "[NOUVEAU] " - delay_cause = section.get("cause", "") + stops_list.append(f"{prefix}{stop_name} ({formatted_time})") + just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time + stops_schedule.append({ + "name": stop_name, + "time": just_time, + "base_time": just_time, + "amended_time": None, + "effect": stop_effect + }) + route_details = " ➔ ".join(stops_list) + return route_details, stops_schedule + + def _get_delay(self) -> Any: + delay_cause = self.sections.get("cause", "") if not delay_cause: - messages = journey.get("messages", []) + messages = self.journey.get("messages", []) if messages: delay_cause = messages[0].get("text", "") if not delay_cause: - disruptions = journey.get("_disruptions", []) - links = section.get("display_informations", {}).get("links", []) + disruptions = self.journey.get("_disruptions", []) + links = self.sections.get("display_informations", {}).get("links", []) disruption_ids = [link.get("id") for link in links if link.get("type") == "disruption"] for disruption in disruptions: @@ -172,81 +254,7 @@ def _extra_attributes(self, journey: dict[str, Any]) -> dict[str, Any]: if disruption_msgs: delay_cause = disruption_msgs[0].get("text", "") break - - # 4. Plan de vol structuré - stops_schedule = [] - route_details = "" - show_routes = self.coordinator.entry.subentries[self.tid].data.get("show_route_details", False) - - if show_routes: - impacted_stops = section.get("impacted_stops", []) - stops_list = [] - - if impacted_stops: - for stop in impacted_stops: - stop_name = stop.get("stop_point", {}).get("name", "") - b_raw = stop.get("base_departure_time") or stop.get("base_arrival_time") - a_raw = stop.get("amended_departure_time") or stop.get("amended_arrival_time") - - b_time = f"{b_raw[:2]}:{b_raw[2:4]}" if b_raw and len(b_raw) >= 4 else "" - a_time = f"{a_raw[:2]}:{a_raw[2:4]}" if a_raw and len(a_raw) >= 4 else "" - - stop_effect = stop.get("stop_time_effect", "unchanged") - prefix = "" - if stop_effect == "deleted": - prefix = "[SUPPRIMÉ] " - elif stop_effect == "added": - prefix = "[NOUVEAU] " - - stops_list.append(f"{prefix}{stop_name} ({a_time if a_time else b_time})") - stops_schedule.append({ - "name": stop_name, - "base_time": b_time, - "amended_time": a_time if a_time != b_time else None, - "effect": stop_effect - }) - else: - stops_data = section.get("stop_date_times", []) - for stop in stops_data: - stop_name = stop.get("stop_point", {}).get("name", "") - raw_time = stop.get("departure_date_time", stop.get("arrival_date_time", "")) - formatted_time = format_time(raw_time) if raw_time else "" - stop_effect = stop.get("stop_time_effect", "unchanged") - - if stop_name and formatted_time: - prefix = "" - if stop_effect == "deleted": - prefix = "[SUPPRIMÉ] " - elif stop_effect == "added": - prefix = "[NOUVEAU] " - - stops_list.append(f"{prefix}{stop_name} ({formatted_time})") - just_time = formatted_time.split(" - ")[-1] if " - " in formatted_time else formatted_time - stops_schedule.append({ - "name": stop_name, - "time": just_time, - "base_time": just_time, - "amended_time": None, - "effect": stop_effect - }) - route_details = " ➔ ".join(stops_list) - - return { - "departure_time": departure_time, - "arrival_time": arrival_time, - "base_departure_time": format_time(base_dep_raw), - "base_arrival_time": arrival_time, - "delay_minutes": delay, - "delay_cause": delay_cause, - "duration_minutes": get_duration(journey), - "has_delay": delay > 0, - "canceled": is_canceled, - "route_details": route_details, - "stops_schedule": stops_schedule, - "direction": section.get("display_informations", {}).get("direction", ""), - "physical_mode": section.get("display_informations", {}).get("physical_mode", ""), - "train_num": get_train_num(journey), - } + return delay_cause class SncfAllTrainsLineSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEntity): @@ -257,6 +265,7 @@ class SncfAllTrainsLineSensor(CoordinatorEntity[SncfUpdateCoordinator], SensorEn _attr_attribution = ATTRIBUTION def __init__(self, coordinator: SncfUpdateCoordinator, train_id: str) -> None: + """Initialize the line sensor.""" super().__init__(coordinator) self.tid = train_id self._attr_name = "Tous les trains (ligne)" @@ -271,28 +280,40 @@ def __init__(self, coordinator: SncfUpdateCoordinator, train_id: str) -> None: @callback def _handle_coordinator_update(self) -> None: + """Update all trains values on a single line.""" journeys = self.coordinator.data.get(self.tid, []) departure_times = [] + base_departure_times = [] delays = [] overall_has_delay = False for journey in journeys: section = journey.get("sections", [{}])[0] - dep_dt = parse_datetime(journey.get("departure_date_time", "")) - base_dep_dt = parse_datetime(section.get("base_departure_date_time")) - delay = 0 - if dep_dt and base_dep_dt: - delay = int((dep_dt - base_dep_dt).total_seconds() / 60) + arr_dt = parse_datetime(journey.get("arrival_date_time", "")) + base_arr_dt = parse_datetime(section.get("base_arrival_date_time")) + delay = ( + int((arr_dt - base_arr_dt).total_seconds() / 60) + if arr_dt and base_arr_dt + else 0 + ) departure_times.append(format_time(journey.get("departure_date_time", ""))) + base_departure_times.append( + format_time(section.get("base_departure_date_time")) + ) delays.append(str(delay)) + if delay > 0: overall_has_delay = True self._attr_extra_state_attributes = { "departure_time": "; ".join(departure_times), + "base_departure_time": "; ".join(base_departure_times), "delay_minutes": "; ".join(delays), "has_delay": overall_has_delay, } + + # On peut mettre un "native_value" arbitraire, par exemple le nombre de trains self._attr_native_value = len(journeys) - self.async_write_ha_state() \ No newline at end of file + + self.async_write_ha_state() diff --git a/custom_components/sncf_trains/strings.json b/custom_components/sncf_trains/strings.json index 2ef8100..4b30f1c 100644 --- a/custom_components/sncf_trains/strings.json +++ b/custom_components/sncf_trains/strings.json @@ -61,8 +61,7 @@ "data": { "time_start": "Time start", "time_end": "Time end", - "train_count": "Trains count", - "show_route_details": "Show intermediate stops" + "train_count": "Trains count" } }, "reconfigure": { @@ -70,8 +69,7 @@ "data": { "time_start": "Time start", "time_end": "Time end", - "train_count": "Trains count", - "show_route_details": "Show intermediate stops" + "train_count": "Trains count" } } }, diff --git a/custom_components/sncf_trains/translations/fr.json b/custom_components/sncf_trains/translations/fr.json index 1ef5083..ef55b71 100644 --- a/custom_components/sncf_trains/translations/fr.json +++ b/custom_components/sncf_trains/translations/fr.json @@ -66,8 +66,7 @@ "data": { "time_start": "Heure de départ", "time_end": "Heure d'arrivée", - "train_count": "Nombre de trains", - "show_route_details": "Afficher les arrêts intermédiaires" + "train_count": "Nombre de trains" } }, "reconfigure": { @@ -75,8 +74,7 @@ "data": { "time_start": "Heure de départ", "time_end": "Heure d'arrivée", - "train_count": "Nombre de trains", - "show_route_details": "Afficher les arrêts intermédiaires" + "train_count": "Nombre de trains" } } }, diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index 9ec73da..487b07d 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -33,12 +33,14 @@ class SncfTrainCard extends HTMLElement { if (typeof normalizedDeviceId === 'string') { normalizedDeviceId = [normalizedDeviceId]; } else if (!Array.isArray(normalizedDeviceId)) { - throw new Error('device_id must be a string or an array of strings'); + // FIXME : custom error ? + throw new TypeError('device_id must be a string or an array of strings'); } // Vérifier qu'il y a au moins un device_id non-vide - if (!normalizedDeviceId.length || !normalizedDeviceId.some(id => id)) { - throw new Error('You need to define at least one valid device_id'); + if (!normalizedDeviceId.length || !normalizedDeviceId.some(id => typeof id === 'string' && id.trim() !== '')) { + // FIXME : custom error ? + throw new TypeError('You need to define at least one valid device_id'); } const previousDeviceId = this.config ? this.config.device_id : null; @@ -77,89 +79,119 @@ class SncfTrainCard extends HTMLElement { } }, { - name: "title", - selector: {text: {}}, - }, - { - name: "train_lines", - selector: { - number: { - min: 1, - max: 10, - step: 1, - }, - }, - }, - { - name: "animation_duration", - selector: { - number: { - min: 0, - max: 100, - step: 1, - }, - }, - }, - { - name: "update_interval", - selector: { - number: { - min: 5000, - step: 1000, - }, - }, - }, - { - type: "grid", - name: "", - column_min_width: "150px", + type: 'expandable', + name: 'settings', + title: 'Options de personalisation', schema: [ { - name: "train_emoji_axial_symmetry", - selector: {boolean: {}}, + name: "title", + selector: {text: {}}, }, { - name: "train_emoji", + name: "train_lines", selector: { - icon: {}, + number: { + min: 1, + max: 10, + step: 1, + }, }, }, { - name: "show_departure_station", - selector: {boolean: {}}, + name: "show_route_details", + selector: {boolean: {}} }, { - name: "departure_station_emoji", + name: "animation_duration", selector: { - icon: {}, + number: { + min: 0, + max: 100, + step: 1, + }, }, }, + ] + }, + { + type: 'expandable', + name: 'display', + title: 'Options d\'affichage avancées', + schema: [ { - name: "show_arrival_station", - selector: {boolean: {}}, - }, - { - name: "arrival_station_emoji", + name: "number_of_stops", selector: { - icon: {}, + number: { + min: 2, + max: 10, + step: 1, + }, }, }, - ] + { + type: "grid", + name: "", + column_min_width: "150px", + schema: [ + { + name: "train_emoji_axial_symmetry", + selector: {boolean: {}}, + }, + { + name: "train_emoji", + selector: { + icon: {}, + }, + }, + { + name: "show_departure_station", + selector: {boolean: {}}, + }, + { + name: "departure_station_emoji", + selector: { + icon: {}, + }, + }, + { + name: "show_arrival_station", + selector: {boolean: {}}, + }, + { + name: "arrival_station_emoji", + selector: { + icon: {}, + }, + }, + ] + } + ], + }, + { + name: "update_interval", + selector: { + number: { + min: 5000, + step: 1000, + }, + }, }, ], computeLabel: (schema) => { const labels = { device_id: "IDs des Devices (obligatoire - tableau de devices)", title: "Titre de la carte", - train_emoji: "Emoji du train", train_lines: "Nombre de trains à afficher", + show_route_details: "Afficher les arrêts", animation_duration: "Durée d'animation (minutes)", - update_interval: "Intervalle de mise à jour (ms)", - departure_station_emoji: "Emoji de la gare de départ", - arrival_station_emoji: "Emoji de la gare d'arrivée", + number_of_stops: "Nombre d'arrêts à afficher", + train_emoji_axial_symmetry: "Symétrie axiale du train", + train_emoji: "Emoji du train", show_departure_station: "Afficher les informations de départ", + departure_station_emoji: "Emoji de la gare de départ", show_arrival_station: "Afficher les informations d'arrivée", - train_emoji_axial_symmetry: "Symétrie axiale du train", + arrival_station_emoji: "Emoji de la gare d'arrivée", + update_interval: "Intervalle de mise à jour (ms)", }; return labels[schema.name] || undefined; }, @@ -167,15 +199,17 @@ class SncfTrainCard extends HTMLElement { const helpers = { device_id: "Les identifiants uniques des devices SNCF à afficher (tableau de devices)", title: "Le titre affiché en haut de la carte", - train_emoji: "L'emoji représentant le train", train_lines: "Le nombre de trains à afficher (1-10)", + show_route_details: "Affiche ou masque la frise des arrêts du train", animation_duration: "Nombre de minutes avant le départ pour que le train apparaisse", - update_interval: "Fréquence de rafraîchissement en millisecondes (ex: 30000 pour 30s)", - departure_station_emoji: "L'emoji pour la gare de départ", - arrival_station_emoji: "L'emoji pour la gare d'arrivée", + number_of_stops: "Le nombre d'arrêts à afficher dans la frise (2-10)", + train_emoji_axial_symmetry: "Retourner l'emoji du train horizontalement", + train_emoji: "L'emoji représentant le train", show_departure_station: "Affiche ou masque la gare de départ", + departure_station_emoji: "L'emoji pour la gare de départ", show_arrival_station: "Affiche ou masque la gare d'arrivée", - train_emoji_axial_symmetry: "Retourner l'emoji du train horizontalement", + arrival_station_emoji: "L'emoji pour la gare d'arrivée", + update_interval: "Fréquence de rafraîchissement en millisecondes (ex: 30000 pour 30s)", }; return helpers[schema.name] || undefined; }, @@ -189,16 +223,23 @@ class SncfTrainCard extends HTMLElement { static getStubConfig() { return { device_id: ['', ''], - title: 'Trains SNCF', - train_lines: 5, + settings: { + title: 'Trains SNCF', + train_lines: 5, + // TODO rename to show_route or show_timeline ? + show_route_details: false, + }, + display: { + number_of_stops: 7, + train_emoji_axial_symmetry: true, + train_emoji: '🚅', + show_departure_station: true, + departure_station_emoji: '', + show_arrival_station: true, + arrival_station_emoji: '🚉', + }, animation_duration: 30, update_interval: 30000, - train_emoji_axial_symmetry: true, - train_emoji: '🚅', - show_departure_station: true, - departure_station_emoji: '', - show_arrival_station: true, - arrival_station_emoji: '🚉', }; } @@ -240,7 +281,7 @@ class SncfTrainCard extends HTMLElement { * Calcule la taille de la carte en fonction du nombre de lignes de train à afficher, avec une taille minimale pour éviter les problèmes d'affichage */ getCardSize() { - return Math.max(3, this.config.train_lines + 1); + return Math.max(3, this.config.settings.train_lines + 1); } /** @@ -312,10 +353,7 @@ class SncfTrainCard extends HTMLElement { try { // Utiliser l'API Home Assistant pour récupérer toutes les entités - const allEntityRegistry = await this._hass.callWS({ - type: 'config/entity_registry/list' - }); - + const allEntityRegistry = await this._hass.callWS({ type: 'config/entity_registry/list' }); // Récupérer les entités pour tous les device_id const allTrainEntities = []; @@ -344,6 +382,83 @@ class SncfTrainCard extends HTMLElement { allTrainEntities.push(...trainEntities); } + const d = new Date(); + if (d.getMinutes() < 30) d.setHours(d.getHours()-1) + allTrainEntities.push({ + entity_id: "sensor.nantes_le_pouliguen_train_11", + attributes: { + arrival_stop_id : "stop_point:SNCF:87481002:Train", + arrival_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()+1}:32`, + attribution : "Data provided by api.sncf.com", + base_arrival_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()+1}:02`, + base_departure_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()}:00`, + commercial_mode : "Aléop", + delay_cause: "Perturbation de lignes férroviaires", + delay_minutes : 24, + departure_stop_id : "stop_point:SNCF:87481762:Train", + departure_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()}:30`, + device_class : "timestamp", + direction : "Nantes (Nantes)", + duration_minutes : 67, + friendly_name : "Le Pouliguen → Nantes Train 7", + has_delay : true, + icon : "mdi:train", + physical_mode : "TER / Intercités", + train_num: "858060", + stops_schedule: [ + { + "name": "Le Pouliguen", + "time": `${d.getHours()}:30`, + "base_time": `${d.getHours()}:00`, + "amended_time": `${d.getHours()}:30`, + "effect": "unchanged" + }, + { + "name": "La Baule-Escoublac", + "time": `${d.getHours()}:35`, + "base_time": `${d.getHours()}:05`, + "amended_time": `${d.getHours()}:35`, + "effect": "unchanged" + }, + { + "name": "La Baule Les Pins", + "time": `${d.getHours()}:38`, + "base_time": `${d.getHours()}:08`, + "amended_time": `${d.getHours()}:38`, + "effect": "unchanged" + }, + { + "name": "Pornichet", + "time": `${d.getHours()}:42`, + "base_time": `${d.getHours()}:12`, + "amended_time": `${d.getHours()}:42`, + "effect": "unchanged" + }, + { + "name": "Saint-Nazaire", + "time": `${d.getHours()}:54`, + "base_time": `${d.getHours()}:24`, + "amended_time": `${d.getHours()}:54`, + "effect": "unchanged" + }, + { + "name": "Savenay", + "time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:08`, + "base_time": `${d.getHours()}:38`, + "amended_time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:08`, + "effect": "unchanged" + }, + { + "name": "Nantes", + "time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:32`, + "base_time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:02`, + "amended_time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:32`, + "effect": "unchanged" + } + ] + } + }); + // Source - https://stackoverflow.com/a/1214753 // Posted by Kip, modified by community. See post 'Timeline' for change history // Retrieved 2026-05-15, License - CC BY-SA 4.0 @@ -359,13 +474,12 @@ class SncfTrainCard extends HTMLElement { return arrivalTime >= currentTime; }); - return upcomingTrains - .sort((a, b) => { - const aTime = this.parseTime(a.attributes.arrival_time); - const bTime = this.parseTime(b.attributes.arrival_time); - return aTime - bTime; - }) - .slice(0, this.config.train_lines); + return upcomingTrains.toSorted((a, b) => { + const aTime = this.parseTime(a.attributes.arrival_time); + const bTime = this.parseTime(b.attributes.arrival_time); + return aTime - bTime; + }) + .slice(0, this.config.settings.train_lines); } catch (error) { console.error('❌ Erreur lors de la récupération via API:', error); @@ -383,7 +497,7 @@ class SncfTrainCard extends HTMLElement { return new Date(0); } - // Format SNCF: "19/11/2025 - 08:20" + // Format date et heure : "19/11/2025 - 08:20" if (departureTime.includes('/') && departureTime.includes(' - ')) { const parts = departureTime.split(' - '); if (parts.length === 2) { @@ -407,22 +521,39 @@ class SncfTrainCard extends HTMLElement { } } + // Format heure only : "08:20" + if (departureTime.includes(':')) { + const parts = departureTime.split(':'); + if (parts.length === 2) { + const hour = Number.parseInt(parts[0]); + const minute = Number.parseInt(parts[1]); + + const date = new Date(); + if (hour > 20 && date.getHours() < 4) { + date.setDate(date.getDate() - 1); + } + date.setHours(hour); + date.setMinutes(minute); + return date; + } + } + // Fallback vers Date classique return new Date(departureTime); } /** * Calcule la position du train sur la barre de progression en fonction de l'heure actuelle et de l'heure de départ, en affichant le train 30 minutes avant le départ et en le faisant avancer vers la droite à mesure que l'heure de départ approche, ce qui crée une animation visuelle intuitive pour les utilisateurs afin de suivre l'approche du train vers la gare, et retourne une position en pourcentage (0% = train à gauche, 100% = train arrivé) ou une valeur négative pour indiquer que le train n'est pas encore visible, ce qui permet de gérer l'affichage du train de manière dynamique en fonction du temps restant avant le départ - * @param {object} trainAttributes - Les attributs du train, qui doivent inclure au minimum une heure de départ valide pour que le calcul fonctionne correctement, et peuvent inclure d'autres informations pour personnaliser l'affichage + * @param {object} TA - Les attributs du train, qui doivent inclure au minimum une heure de départ valide pour que le calcul fonctionne correctement, et peuvent inclure d'autres informations pour personnaliser l'affichage * @returns {number} Un nombre représentant la position du train en pourcentage (0-100) ou une valeur négative si le train n'est pas encore visible */ - calculateTrainPosition(trainAttributes) { - if (!trainAttributes.departure_time || !trainAttributes.arrival_time) { + calculateTrainPosition(TA) { + if (!TA.departure_time || !TA.arrival_time) { return -10; } - const departure = this.parseTime(trainAttributes.departure_time); - const arrival = this.parseTime(trainAttributes.arrival_time); + const departure = this.parseTime(TA.departure_time); + const arrival = this.parseTime(TA.arrival_time); const travelTime = (arrival - departure) / (1000 * 60); if (Number.isNaN(departure.getTime()) || Number.isNaN(arrival.getTime()) || travelTime < 0) { @@ -434,7 +565,7 @@ class SncfTrainCard extends HTMLElement { if (diffMinutes > travelTime) { // TODO : tester et s'assurer de la véracité / nom du param animation_duration - if (this.config.animation_duration === 0 || this.config.animation_duration > diffMinutes - travelTime) { + if (this.config.settings.animation_duration === 0 || this.config.settings.animation_duration > diffMinutes - travelTime) { // Train apparaît X minutes avant l'heure return 0; } @@ -518,7 +649,7 @@ class SncfTrainCard extends HTMLElement {
-
${this.config.title}
+
${this.config.settings.title}
${this.renderTrainLines(trains)} @@ -550,26 +681,103 @@ class SncfTrainCard extends HTMLElement { const TA = train.attributes; const position = this.calculateTrainPosition(TA); const delayMinutes = TA.delay_minutes || 0; - const hasDelay = TA.has_delay || false; + const hasDelay = TA.has_delay; const isRunning = this.parseTime(TA.departure_time) < new Date() && new Date() < this.parseTime(TA.arrival_time) const isArrived = new Date() > this.parseTime(TA.arrival_time) const trainColor = this.getTrainColor(delayMinutes, hasDelay); const theme = isArrived ? 'arrived' : hasDelay ? 'delayed' : isRunning ? 'running' : ''; return ` -
- ${this.config.show_departure_station ? this.renderDeparture(TA) : ''} - -
- ${ position >= 0 ? - `
- ${this.renderIcone(this.config.train_emoji)} -
` : '' - } +
+
+ ${this.config.display.show_departure_station ? this.renderDeparture(TA) : ''} + +
+ ${ position >= 0 ? + `
+ ${this.renderIcone(this.config.display.train_emoji)} +
` : '' + } + ${TA.delay_cause ? `
${TA.delay_cause}
` : ''} +
+ + ${this.config.display.show_arrival_station ? this.renderArrival(TA) : ''}
+ ${this.config.settings.show_route_details && TA.stops_schedule ? this.renderTimeline(TA) : ''} +
`; + }).join(''); + } + + /** + * Rendu de la timeline des arrêts d'un train, en affichant une ligne horizontale avec des points représentant les arrêts + * @param {object} TA - Les attributs du train + * @return {string} Une chaîne HTML représentant la timeline des arrêts du train + */ + renderTimeline(TA) { + return ` +
+
+
+ ${this.renderStops(TA.stops_schedule, this.parseTime(TA.departure_time) < Date.now())} +
+
+ `; + } + + /** + * Rendu de la timeline des arrêts d'un train, en affichant les arrêts futurs et les arrêts passés jusqu'à une limite + * de 5 arrêts, avec des styles différents pour les arrêts supprimés, ajoutés ou retardés, ce qui permet de visualiser + * facilement le parcours du train et les éventuels changements ou perturbations sur sa route, tout en évitant de + * surcharger l'affichage avec trop d'informations + * @param {Array} stops - Un tableau d'objets représentant les arrêts du train + * @param {boolean} hasStarted - Indique si le train a déjà commencé son trajet + * @return {string} Une chaîne HTML représentant les différents arrêts du train + */ + renderStops(stops, hasStarted) { + const now = new Date(); + const maxStops = this.config.display.number_of_stops; + let i = 0; + return stops.filter((stop, index) => { + // On conserve tous les arrêts si le nombre d'arrêts est inférieur à la limite + if (stops.length < maxStops) return true; + + // Si le train est parti + if (hasStarted) { + // On récupère les arrêts futurs + if (this.parseTime(stop.time) >= now) return i++ < maxStops + // et les arrêts precedents jusqu'à la limite max en partant de la fin + if (stops.length - index <= maxStops) return i++ <= maxStops; + } else { + // Sinon, on prend les prochains arrêt jusqu'à la limite + return i++ < maxStops + } + }).map(stop => { + const isDeleted = stop.effect === 'deleted'; + const isAdded = stop.effect === 'added'; + // TODO : s'assurer de l'utilité de amended_time par rapport à time / base_time + const isStopDelayed = this.config.settings.show_route_details && stop.amended_time && stop.base_time && (stop.amended_time !== stop.base_time); + + const displayTime = isStopDelayed ? + `${stop.base_time}${stop.amended_time}` : + `${stop.base_time || stop.time}`; + + let statusBadge = ""; + if (isDeleted) { + statusBadge = ' SUPPRIMÉ'; + } else if (isAdded) { + statusBadge = ' RAJOUTÉ'; + } - ${this.config.show_arrival_station ? this.renderArrival(TA) : ''} + return ` +
+
+
+ ${displayTime} +
+
+ ${stop.name}${statusBadge} +
`; }).join(''); @@ -577,15 +785,15 @@ class SncfTrainCard extends HTMLElement { /** * Rendu de la section de départ pour un train donné, en affichant l'heure de départ prévue, l'heure de départ réelle si le train a du retard. - * @param {object} trainAttributes - Les attributs du train + * @param {object} TA - Les attributs du train * @returns {string} Une chaîne HTML représentant la section de départ du train */ - renderDeparture(trainAttributes) { - const hasDelay = trainAttributes.has_delay || false; - const isGone = new Date() > this.parseTime(trainAttributes.departure_time) - const delayMinutes = trainAttributes.delay_minutes || 0; - const departureTime = this.formatTime(trainAttributes.base_departure_time); - const realDepartureTime = this.formatTime(trainAttributes.departure_time); + renderDeparture(TA) { + const hasDelay = TA.has_delay || false; + const isGone = new Date() > this.parseTime(TA.departure_time) + const delayMinutes = TA.delay_minutes || 0; + const departureTime = this.formatTime(TA.base_departure_time); + const realDepartureTime = this.formatTime(TA.departure_time); return `
@@ -602,26 +810,26 @@ class SncfTrainCard extends HTMLElement { ${hasDelay ? `+${delayMinutes}min` : isGone ? 'Parti' : 'À l\'heure'}
-
${this.renderIcone(this.config.departure_station_emoji)}
+
${this.renderIcone(this.config.display.departure_station_emoji)}
` } /** * Rendu de la section d'arrivée pour un train donné, en affichant l'heure d'arrivée prévue, l'heure d'arrivée réelle si le train a du retard. - * @param {object} trainAttributes - Les attributs du train + * @param {object} TA - Les attributs du train * @returns {string} Une chaîne HTML représentant la section d'arrivée du train */ - renderArrival(trainAttributes) { - const hasDelay = trainAttributes.has_delay || false; - const isArrived = new Date() > this.parseTime(trainAttributes.arrival_time) - const delayMinutes = trainAttributes.delay_minutes || 0; - const arrivalTime = this.formatTime(trainAttributes.base_arrival_time); - const realArrivalTime = this.formatTime(trainAttributes.arrival_time); + renderArrival(TA) { + const hasDelay = TA.has_delay || false; + const isArrived = new Date() > this.parseTime(TA.arrival_time) + const delayMinutes = TA.delay_minutes || 0; + const arrivalTime = this.formatTime(TA.base_arrival_time); + const realArrivalTime = this.formatTime(TA.arrival_time); return `
-
${this.renderIcone(this.config.arrival_station_emoji)}
+
${this.renderIcone(this.config.display.arrival_station_emoji)}
${hasDelay && realArrivalTime ? ` @@ -768,6 +976,16 @@ class SncfTrainCard extends HTMLElement { .train-emoji-axial-symmetry-true { transform: translateX(-50%) scaleX(-1); } + + .delay-cause { + position: absolute; + top: 10px; + width: stretch; + text-align: center; + overflow:hidden; + white-space:nowrap; + text-overflow: ellipsis; + } .station { display: flex; @@ -826,6 +1044,24 @@ class SncfTrainCard extends HTMLElement { padding: 20px; font-weight: 500; } + + /* Radar Styles */ + .timeline-wrapper { position: relative; margin-top: 15px; padding: 0 10px; } + .timeline-line { position: absolute; top: 7px; left: 35px; right: 35px; height: 2px; background: var(--primary-color); opacity: 0.2; } + .timeline-line.delayed-line { background: #ff9800; opacity: 0.5; } + .timeline-container { display: flex; justify-content: space-between; position: relative; z-index: 2; } + .timeline-stop { display: flex; flex-direction: column; align-items: center; width: 90px; } + .timeline-dot { width: 14px; height: 14px; border-radius: 50%; background: var(--card-background-color); border: 3px solid var(--primary-color); margin-bottom: 6px; box-sizing: border-box; } + .timeline-dot.delayed-dot { border-color: #ff9800; } + .timeline-dot.deleted-dot { background: #f44336; border-color: #f44336; } + .timeline-dot.added-dot { border-color: #ff9800; border-style: dashed; } + .timeline-time { font-size: 0.75em; font-weight: bold; display: contents; } + .base-time-radar { text-decoration: line-through; opacity: 0.5; font-size: 0.9em; } + .amended-time-radar { color: #ff9800; font-weight: bold; } + .timeline-name { font-size: 0.65em; text-align: center; color: var(--secondary-text-color); line-height: 1.2; } + .badge-stop { font-size: 0.8em; font-weight: bold; padding: 1px 3px; border-radius: 3px; color: white; } + .badge-stop.deleted { background: #f44336; } + .badge-stop.added { background: #ff9800; } `; } From fb4219ccac2a7b7922d4ba2bc4c07f5226233777 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 01:21:08 +0200 Subject: [PATCH 18/23] cleanup --- README.new.md | 261 ----- .../sncf_trains/www/sncf-train-card.new.js | 912 ------------------ 2 files changed, 1173 deletions(-) delete mode 100644 README.new.md delete mode 100644 custom_components/sncf_trains/www/sncf-train-card.new.js diff --git a/README.new.md b/README.new.md deleted file mode 100644 index 6f31760..0000000 --- a/README.new.md +++ /dev/null @@ -1,261 +0,0 @@ -![Home Assistant](https://img.shields.io/badge/Home--Assistant-2024.5+-blue?logo=home-assistant) -![Custom Component](https://img.shields.io/badge/Custom%20Component-oui-orange) -![Licence MIT](https://img.shields.io/badge/Licence-MIT-green) - -# 🚆 SNCF Trains pour Home Assistant - -Suivez facilement les horaires des trains SNCF entre deux gares directement dans votre tableau de bord Home Assistant, grâce à l’API officielle de la [SNCF](https://www.digital.sncf.com/startup/api). - -Départs, arrivées, retards, durée du trajet et type de train (TER, TGV, etc.) : toutes les informations essentielles sont regroupées dans une interface personnalisable et entièrement traduite en français. - -> [!CAUTION] -> -> ### ⚠️ DÉVELOPPEMENT ACTIF / ACTIVE DEVELOPMENT -> -> **Ce projet est actuellement en phase d'amélioration intensive.** -> Les fonctionnalités évoluent rapidement. Assurez-vous d'utiliser la dernière version des fichiers de l'intégration pour garantir une compatibilité totale avec votre tableau de bord. - ---- - -## 🧪 Nouveauté en phase de test : Les Trains Supprimés - -> **Nous avons récemment introduit la détection et l'affichage des trains annulés/supprimés !** > Cette fonctionnalité est actuellement en **phase de test**. -> -> 🙏 **Un immense merci** à tous les utilisateurs qui prennent le temps de nous faire leurs retours (qu'il s'agisse de petits bugs ou de succès sur vos trajets quotidiens). C'est grâce à votre aide que nous pouvons stabiliser et améliorer ce projet pour tout le monde ! - ---- - -## 🚀 Dernières mises à jour (Avril 2026) - -Le système a été lourdement mis à jour pour vous offrir une précision et un confort d'utilisation optimaux : - -- **🕒 Correction de l'affichage de l'heure :** Résolution définitive du problème qui affichait des trains "il y a 8 heures". Le système gère désormais parfaitement les fuseaux horaires locaux. -- **📡 Radar de Ligne (V3.3) :** Intégration d'un visuel détaillé affichant les arrêts intermédiaires et détectant les modifications de parcours. _(Note : Cette option peut être désactivée dans les paramètres pour garder un design simple)._ -- **🎭 Moteur d'Animation Dynamique :** L'emoji du train avance désormais de manière synchronisée avec la durée réelle de votre trajet. -- **🔍 Analyse Intelligente des Perturbations :** \* Affichage clair de la **cause officielle** du retard (ex: Panne de signalisation, Défaut d'alimentation...). - - Code couleur intuitif : **Orange** pour les retards, **Rouge** pour les suppressions. - ---- - -## 📸 Aperçu Visuel - -| Design Épuré (Classique) | Nouveau Design (Radar de Ligne) | -| :-----------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------: | -| Avant | Radar de Ligne V3 | - -### ⚠️ Zoom sur les Retards et Perturbations - -Grâce à la nouvelle analyse des données de la SNCF, la carte est capable d'afficher le suivi en temps réel des incidents avec la cause exacte et l'impact sur chaque arrêt : - -Détail d'un retard avec sa cause officielle - ---- - -## 📦 Installation - -### 1. Via HACS (Méthode recommandée) - -_Nécessite [HACS](https://hacs.xyz/) installé sur votre Home Assistant._ - -1. Ouvrez **HACS** dans votre menu de gauche. -2. Recherchez **SNCF Trains**. -3. Cliquez sur **Installer**, puis redémarrez Home Assistant. - -### 2. Méthode Manuelle - -1. Téléchargez le contenu de ce dépôt. -2. Copiez le dossier `sncf_trains` dans le répertoire `config/custom_components/` de votre Home Assistant. -3. Redémarrez Home Assistant. - ---- - -## ⚙️ Configuration initiale - -1. Dans Home Assistant, allez dans **Paramètres** → **Appareils et services** → **Ajouter une intégration**. -2. Recherchez **SNCF Trains**. -3. Renseignez votre **Clé API SNCF** _(voir section suivante)_. -4. Configurez votre premier trajet en indiquant : - - La gare de départ. - - La gare d'arrivée. - - La plage horaire que vous souhaitez surveiller. - -_Astuce : Vous pouvez configurer autant de trajets différents que vous le souhaitez !_ - ---- - -## 🔐 Obtenir sa Clé API SNCF (Gratuit) - -Pour que l'intégration fonctionne, vous avez besoin d'une clé API officielle fournie par la SNCF : - -1. Rendez-vous sur le [portail API SNCF](https://www.digital.sncf.com/startup/api). -2. Créez un compte gratuitement ou connectez-vous. -3. Générez votre clé API (celle-ci autorise jusqu'à 5 000 requêtes par jour, ce qui est largement suffisant). -4. Copiez-la et collez-la lors de la configuration dans Home Assistant. - -> _Pour changer de clé plus tard, il vous suffira de cliquer sur **Reconfigurer** depuis la page de l'intégration._ - ---- - -## 🧩 Options et Personnalisation - -Vous pouvez ajuster le comportement de l'intégration sans avoir à redémarrer Home Assistant : - -**Options globales de l'intégration :** - -- ⏱ **Intervalle de rafraîchissement (actif) :** Fréquence de mise à jour pendant vos heures de trajet (défaut : 2 min). -- 🕰 **Intervalle de rafraîchissement (repos) :** Fréquence de mise à jour hors de vos heures de trajet (défaut : 60 min). - -**Options spécifiques à chaque trajet :** - -- 🚆 **Nombre de trains à afficher :** Choisissez combien de départs simultanés vous souhaitez surveiller **(jusqu'à 20 trains par ligne maximum !)**. -- 🕗 **Heures exactes de début et fin de surveillance.** - -_(Le mode actif se déclenche automatiquement 2 heures avant l'heure de début que vous avez configurée)._ - ---- - -## 📊 Données et Capteurs - -L'intégration crée automatiquement plusieurs capteurs pour vos automatisations : - -- `sensor.sncf__` : Le capteur global résumant votre trajet. -- `sensor.sncf_train_X__` : Un capteur individuel pour chaque train suivi. -- `calendar.trains` : Un calendrier pratique affichant vos prochains départs. - -**Informations disponibles pour chaque train :** - -- Heure de départ prévue et réelle. -- Heure d’arrivée. -- Durée totale du voyage. -- Type de train (TER, TGV...), direction et numéro de ligne. -- Minutes de retard et cause officielle (si applicable). - ---- - -## 🎨 Carte pour le Tableau de Bord (Lovelace) - -Une jolie carte visuelle (`sncf-train-card`) est incluse et prête à l'emploi dès l'installation ! - -### Trouver son `device_id` - -Pour que la carte sache quel trajet afficher, elle a besoin de l'identifiant de l'appareil (`device_id`) : - -1. Allez dans **Paramètres** → **Appareils et services** → **SNCF Trains**. -2. Cliquez sur l'appareil correspondant à votre trajet. -3. Regardez l'URL dans la barre de votre navigateur : la suite de lettres et chiffres à la fin est votre `device_id` (ex: `.../config/devices/device/abc123def456`). - -### Configuration YAML Avancée - -<<<<<<< HEAD -Voici un exemple de configuration complet pour exploiter 100% des capacités de la carte : -======= ---- - -## 🎨 Carte Lovelace — SNCF Train Card - -La carte `sncf-train-card` est **automatiquement disponible** dans le sélecteur de cartes dès l'installation de l'intégration. - -### Ajouter la carte - -Dans un tableau de bord, cliquer sur **+ Ajouter une carte** → chercher **SNCF Train Card**. - -La configuration peut ensuite se faire : - -- via l'éditeur visuel Lovelace -- ou via YAML - -Ou en YAML : ->>>>>>> origin/fetch-evolves - -```yaml -type: custom:sncf-train-card -device_id: VOTRE_DEVICE_ID -<<<<<<< HEAD -======= -``` - -### 🔍 Trouver le `device_id` - -_S'obtient dynamiquement via la configuration visuelle._ - -Le `device_id` correspond à l'appareil créé lors de la configuration du trajet. - -1. Aller dans **Paramètres → Appareils & services → SNCF Trains** -2. Cliquer sur le trajet souhaité -3. L'URL contient l'identifiant : `.../config/devices/device/XXXX` - -> ![Exemple d'identifiant](./assets/device_id_url.png) - -### ⚙️ Paramètres de la carte - -| Paramètre | Type | Défaut | Description | -|-----------|------|--------|-------------| -| `device_id` | `string` | **obligatoire** | Identifiant de l'appareil SNCF (voir ci-dessus) | -| `title` | `string` | `'Trains SNCF'` | Titre affiché en haut de la carte | -| `train_lines` | `number` | `3` | Nombre de trains affichés simultanément | -| `animation_duration` | `number` | `30` | Nombre de minutes avant l'arrivée en gare à partir duquel l'animation du train se déclenche (ex : `30` = animation active dans les 30 dernières minutes, `60` = dans la dernière heure) | -| `update_interval` | `number` | `30000` | Intervalle de rafraîchissement de la carte en **millisecondes** | -| `train_emoji_axial_symmetry` | `boolean` | `true` | Retourne l'emoji du train horizontalement | -| `train_emoji` | `string` | `'🚅'` | Emoji du train animé sur la barre | -| `show_departure_station` | `boolean` | `true` | Affiche ou masque les informations de départ | -| `departure_station_emoji` | `string` | `''` | Emoji de la station de départ | -| `show_arrival_station` | `boolean` | `true` | Affiche ou masque les informations d'arrivée | -| `arrival_station_emoji` | `string` | `'🚉'` | Emoji de la station d'arrivée | - -### Exemple complet - -```yaml -type: custom:sncf-train-card -device_id: abc123def456 ->>>>>>> origin/fetch-evolves -title: "Paris → Lyon" -train_lines: 5 -train_emoji: "🚆" -train_emoji_axial_symmetry: true -show_departure_station: true -departure_station_emoji: "🚉" -show_arrival_station: true -arrival_station_emoji: "🏙️" -animation_duration: 0 -update_interval: 60000 -show_route_details: true -use_real_duration: true -show_real_stop_times: true -show_delay_cause: true -``` - -**🔍 QUE FAIT CHAQUE OPTION ?** - -<<<<<<< HEAD -- train_lines: 5 : Affiche les 5 prochains départs sur votre tableau de bord. -- train_emoji: "🚆" : Remplace l'icône du train par défaut par l'emoji de votre choix. -- train_emoji_axial_symmetry: true : Retourne l'emoji horizontalement (très utile si vous voulez donner l'impression que le train roule vers la gauche). -- train_station_emoji: "🏙️" : Affiche cet emoji à côté du nom de la gare. -- animation_duration: 45 : L'animation du train qui avance sur la ligne démarrera exactement 45 minutes avant le départ. -- update_interval: 60000 : La carte se rafraîchit visuellement toutes les 60 secondes (60000 ms). -- show_route_details: true : Active le Radar de Ligne ! Affiche une timeline sous le trajet principal avec tous les arrêts intermédiaires de votre train. -- use_real_duration: true : Ajuste la vitesse de l'animation en fonction du temps de trajet réel. Un trajet de 2h paraîtra visuellement plus lent qu'un trajet de 15 minutes. -- show_real_stop_times: true : Sur le radar de ligne, en cas de retard, affiche l'heure initiale (barrée) suivie de la nouvelle heure estimée (en orange) pour chaque arrêt intermédiaire. -- show_delay_cause: true : Affiche clairement le motif du retard (ex: Panne de signalisation, Obstacle sur les voies) juste en dessous du temps de retard. -======= -![Exemple d'affichage](./assets/card_example.png) -![Exemple d'affichage](./assets/card_example.png) ->>>>>>> origin/fetch-evolves - ---- - -## 🔮 Roadmap / À venir - -🛤️ Pour les grands voyageurs : L'ajout de l'affichage des voies de départ et d'arrivée est actuellement en cours de réflexion. C'est une fonctionnalité qui s'avère beaucoup plus complexe à mettre en place de manière fiable . Restez à l'écoute ! - -## 👨‍💻 Développement et Contribution - -Compatible avec Home Assistant 2025.8 et supérieur. - -Développé par Master13011. - -Les contributions sont les bienvenues ! N'hésitez pas à ouvrir une Issue pour signaler un problème ou soumettre une Pull Request. - -## 📄 LICENCE - -Ce projet est open-source et distribué sous la licence MIT. diff --git a/custom_components/sncf_trains/www/sncf-train-card.new.js b/custom_components/sncf_trains/www/sncf-train-card.new.js deleted file mode 100644 index 6b7da79..0000000 --- a/custom_components/sncf_trains/www/sncf-train-card.new.js +++ /dev/null @@ -1,912 +0,0 @@ -// Ajouter au registre des cartes personnalisées -globalThis.customCards = globalThis.customCards || [] -globalThis.customCards.push({ - type: 'sncf-train-card', - name: 'SNCF Train Card', - description: 'Carte personnalisée animée pour afficher les trains SNCF en temps réel', - preview: true, - configurable: true -}); - -class SncfTrainCard extends HTMLElement { - constructor() { - super(); - this.attachShadow({mode: 'open'}); - this.updateInterval = null; - this.lastTrainSignature = null; - this._lastRenderTime = 0; - } - - /** - * Méthode héritée
- * Permet de définir la configuration de la carte, avec validation et gestion des changements de device_id pour forcer une mise à jour immédiate - * @param {Object} config - La configuration de la carte, qui doit inclure au minimum un device_id valide pour fonctionner correctement, et peut inclure d'autres paramètres pour personnaliser l'affichage - * @throws {Error} Si le device_id n'est pas défini, une erreur est levée pour informer l'utilisateur de la nécessité de fournir cette information essentielle - */ - setConfig(config) { - if (!config.device_id) { - throw new Error('You need to define device_id'); - } - - // Normaliser device_id en tableau (rétrocompatibilité) - let normalizedDeviceId = config.device_id; - if (typeof normalizedDeviceId === 'string') { - normalizedDeviceId = [normalizedDeviceId]; - } else if (!Array.isArray(normalizedDeviceId)) { - // FIXME : custom error ? - throw new TypeError('device_id must be a string or an array of strings'); - } - - // Vérifier qu'il y a au moins un device_id non-vide - if (!normalizedDeviceId.length || !normalizedDeviceId.some(id => typeof id === 'string' && id.trim() !== '')) { - // FIXME : custom error ? - throw new TypeError('You need to define at least one valid device_id'); - } - - const previousDeviceId = this.config ? this.config.device_id : null; - const deviceIdChanged = previousDeviceId && JSON.stringify(previousDeviceId) !== JSON.stringify(normalizedDeviceId); - - // Créer une copie de la config avec le device_id normalisé - this.config = { ...config, device_id: normalizedDeviceId }; - - // Forcer la mise à jour immédiate si device_id a changé - if (deviceIdChanged) { - this.stopUpdateTimer(); - this.startUpdateTimer(); - } - - // Toujours forcer un nouveau rendu - this.render(); - } - - /** - * Méthode héritée
- * Fournit la configuration du formulaire pour l'éditeur de Lovelace, avec des labels et des aides personnalisés - */ - static getConfigForm() { - return { - schema: [ - { - name: "device_id", - required: true, - selector: { - device: { - multiple: true, - filter: { - integration: "sncf_trains" - } - } - } - }, - { - name: "title", - selector: {text: {}}, - }, - { - name: "train_lines", - selector: { - number: { - min: 1, - max: 10, - step: 1, - }, - }, - }, - { - name: "animation_duration", - selector: { - number: { - min: 0, - max: 100, - step: 1, - }, - }, - }, - { - name: "update_interval", - selector: { - number: { - min: 5000, - step: 1000, - }, - }, - }, - { - name: "show_route_details", - selector: { boolean: {} } - }, - { - type: "grid", - name: "", - column_min_width: "150px", - schema: [ - { - name: "train_emoji_axial_symmetry", - selector: {boolean: {}}, - }, - { - name: "train_emoji", - selector: { - icon: {}, - }, - }, - { - name: "show_departure_station", - selector: {boolean: {}}, - }, - { - name: "departure_station_emoji", - selector: { - icon: {}, - }, - }, - { - name: "show_arrival_station", - selector: {boolean: {}}, - }, - { - name: "arrival_station_emoji", - selector: { - icon: {}, - }, - }, - ] - }, - ], - computeLabel: (schema) => { - const labels = { - device_id: "IDs des Devices (obligatoire - tableau de devices)", - title: "Titre de la carte", - train_emoji: "Emoji du train", - train_lines: "Nombre de trains à afficher", - animation_duration: "Durée d'animation (minutes)", - update_interval: "Intervalle de mise à jour (ms)", - departure_station_emoji: "Emoji de la gare de départ", - arrival_station_emoji: "Emoji de la gare d'arrivée", - show_departure_station: "Afficher les informations de départ", - show_arrival_station: "Afficher les informations d'arrivée", - train_emoji_axial_symmetry: "Symétrie axiale du train", - }; - return labels[schema.name] || undefined; - }, - computeHelper: (schema) => { - const helpers = { - device_id: "Les identifiants uniques des devices SNCF à afficher (tableau de devices)", - title: "Le titre affiché en haut de la carte", - train_emoji: "L'emoji représentant le train", - train_lines: "Le nombre de trains à afficher (1-10)", - animation_duration: "Nombre de minutes avant le départ pour que le train apparaisse", - update_interval: "Fréquence de rafraîchissement en millisecondes (ex: 30000 pour 30s)", - departure_station_emoji: "L'emoji pour la gare de départ", - arrival_station_emoji: "L'emoji pour la gare d'arrivée", - show_departure_station: "Affiche ou masque la gare de départ", - show_arrival_station: "Affiche ou masque la gare d'arrivée", - train_emoji_axial_symmetry: "Retourner l'emoji du train horizontalement", - }; - return helpers[schema.name] || undefined; - }, - }; - } - - /** - * Méthode héritée
- * Fournit une configuration par défaut pour le mode aperçu dans l'éditeur de Lovelace - */ - static getStubConfig() { - return { - device_id: ['', ''], - title: 'Trains SNCF', - train_lines: 5, - animation_duration: 30, - update_interval: 30000, - train_emoji_axial_symmetry: true, - train_emoji: '🚅', - show_departure_station: true, - departure_station_emoji: '', - show_arrival_station: true, - arrival_station_emoji: '🚉', - // TODO rename to show_route or show_timeline ? - show_route_details: false - }; - } - - /** - * Méthode héritée
- * Permet de recevoir l'objet Home Assistant et de déclencher une vérification des mises à jour des trains pour éviter les rendus inutiles - * @param {Object} hass - L'objet Home Assistant fourni par le système, utilisé pour accéder aux états et aux services, et pour déclencher des mises à jour de la carte lorsque les données des trains changent - */ - set hass(hass) { - const previousHass = this._hass; - this._hass = hass; - - // Vérifier si les données des trains ont changé - if (this.config && previousHass) { - this.checkForTrainUpdates(previousHass, hass); - } else { - this.render(); - } - } - - /** - * Méthode héritée
- * Démarre un timer pour forcer des mises à jour régulières, ce qui est nécessaire pour capturer les changements de données en temps réel - */ - connectedCallback() { - this.startUpdateTimer(); - } - - /** - * Méthode héritée
- * Arrête le timer de mise à jour pour éviter les fuites de mémoire lorsque la carte est retirée du DOM - */ - disconnectedCallback() { - this.stopUpdateTimer(); - } - - /** - * Méthode héritée
- * Calcule la taille de la carte en fonction du nombre de lignes de train à afficher, avec une taille minimale pour éviter les problèmes d'affichage - */ - getCardSize() { - return Math.max(3, this.config.train_lines + 1); - } - - /** - * Vérifie si les données des trains ont changé en comparant une signature des données actuelles avec la dernière signature connue, et ne fait un rendu que si nécessaire pour optimiser les performances - * @param {Object} previousHass - L'objet Home Assistant précédent pour comparer les données - * @param {Object} currentHass - L'objet Home Assistant actuel pour récupérer les données fraîches - */ - async checkForTrainUpdates(previousHass, currentHass) { - try { - // Récupérer les entités actuelles - const currentTrains = await this.getTrainEntities(); - - // Créer une signature des données actuelles - const currentSignature = this.createTrainSignature(currentTrains); - - // Comparer avec la signature précédente - if (currentSignature !== this.lastTrainSignature) { - this.lastTrainSignature = currentSignature; - this.render(); - } - } catch (error) { - // En cas d'erreur, faire un rendu quand même - console.error(error); - this.render(); - } - } - - /** - * Crée une signature unique pour les données des trains en concaténant les informations clés de chaque train, ce qui permet de détecter facilement les changements sans faire un rendu complet à chaque fois - * @param {Array} trains - Un tableau d'entités de train - * @returns {string} Une chaîne de caractères représentant la signature des données des trains - */ - createTrainSignature(trains) { - return trains.map(train => - `${train.entity_id}:${train.attributes.departure_time}:${train.attributes.delay_minutes || 0}:${train.attributes.has_delay || false}` - ).join('|'); - } - - /** - * Démarre un timer qui force un rendu de la carte à intervalles réguliers, ce qui est nécessaire pour capturer les changements de données en temps réel, surtout pour les données de train qui peuvent changer fréquemment - */ - startUpdateTimer() { - this.stopUpdateTimer(); - this.updateInterval = setInterval(async () => { - if (this._hass) { - // Force un nouveau rendu à intervalles réguliers pour capturer les changements - this._lastRenderTime = 0; // Reset du throttle - await this.render(); - } - }, this.config.update_interval); - } - - /** - * Arrête le timer de mise à jour pour éviter les fuites de mémoire lorsque la carte est retirée du DOM ou lorsque le device_id change, ce qui est important pour maintenir les performances et éviter les rendus inutiles - */ - stopUpdateTimer() { - if (this.updateInterval) { - clearInterval(this.updateInterval); - this.updateInterval = null; - } - } - - /** - * Récupère les entités de train associées aux device_id configurés en utilisant l'API WebSocket de Home Assistant pour obtenir des données fraîches, filtre les trains qui ne sont pas encore passés, et trie les résultats par heure de départ pour n'afficher que les trains à venir, ce qui garantit que les informations affichées sont toujours à jour et pertinentes pour l'utilisateur - * @returns {Promise} Un tableau d'entités de train avec des données fraîches, fusionnées de tous les devices et triées par date d'arrivée - */ - async getTrainEntities() { - if (!this._hass || !this.config.device_id) return []; - - try { - // Utiliser l'API Home Assistant pour récupérer toutes les entités - const allEntityRegistry = await this._hass.callWS({ type: 'config/entity_registry/list' }); - // Récupérer les entités pour tous les device_id - const allTrainEntities = []; - - for (const deviceId of this.config.device_id) { - if (!deviceId) continue; - - // Filtrer les entités par device_id - const deviceEntities = allEntityRegistry.filter(entityInfo => - entityInfo.device_id === deviceId - ); - - if (!deviceEntities || deviceEntities.length === 0) { - console.warn(`⚠️ Aucune entité trouvée pour le device_id: ${deviceId}`); - continue; - } - - // Récupérer les états des entités train trouvées avec données fraîches - const trainEntities = deviceEntities - .filter(entityInfo => entityInfo.entity_id.includes('train')) - .map(entityInfo => { - // Forcer la récupération de l'état frais - return this._hass.states[entityInfo.entity_id]; - }) - .filter(entity => entity?.attributes?.departure_time); - - allTrainEntities.push(...trainEntities); - } - - // Source - https://stackoverflow.com/a/1214753 - // Posted by Kip, modified by community. See post 'Timeline' for change history - // Retrieved 2026-05-15, License - CC BY-SA 4.0 - const addMinutes = (date, minutes) => { - return new Date(date.getTime() + minutes*60000); - } - - // Filtrer les trains qui ne sont pas encore passés - const currentTime = new Date(); - const upcomingTrains = allTrainEntities.filter(entity => { - // TODO : paramétrer le temps d'affichage max d'un train arrivé en gare - const arrivalTime = addMinutes(this.parseTime(entity.attributes.arrival_time), 30); - return arrivalTime >= currentTime; - }); - - return upcomingTrains.toSorted((a, b) => { - const aTime = this.parseTime(a.attributes.arrival_time); - const bTime = this.parseTime(b.attributes.arrival_time); - return aTime - bTime; - }) - .slice(0, this.config.train_lines); - - } catch (error) { - console.error('❌ Erreur lors de la récupération via API:', error); - return []; - } - } - - /** - * Parse une chaîne de temps au format spécifique de la SNCF (ex: "19/11/2025 - 08:20") et retourne un objet Date, ou une date par défaut si le format est invalide ou si la chaîne est vide, ce qui permet de gérer correctement les données de temps fournies par les entités de train et d'éviter les erreurs d'affichage - * @param {string} departureTime - La chaîne de temps à parser, qui peut être au format SNCF ou un format standard reconnu par JavaScript - * @returns {Date} Un objet Date représentant le temps de départ, ou une date par défaut si le parsing échoue - */ - parseTime(departureTime) { - if (!departureTime) { - return new Date(0); - } - - // Format SNCF: "19/11/2025 - 08:20" - if (departureTime.includes('/') && departureTime.includes(' - ')) { - const parts = departureTime.split(' - '); - if (parts.length === 2) { - const datePart = parts[0]; // "19/11/2025" - const timePart = parts[1]; // "08:20" - - const dateComponents = datePart.split('/'); - if (dateComponents.length === 3) { - const day = Number.parseInt(dateComponents[0]); - const month = Number.parseInt(dateComponents[1]) - 1; // Mois 0-indexé - const year = Number.parseInt(dateComponents[2]); - - const timeComponents = timePart.split(':'); - if (timeComponents.length === 2) { - const hour = Number.parseInt(timeComponents[0]); - const minute = Number.parseInt(timeComponents[1]); - - return new Date(year, month, day, hour, minute); - } - } - } - } - - // Fallback vers Date classique - return new Date(departureTime); - } - - /** - * Calcule la position du train sur la barre de progression en fonction de l'heure actuelle et de l'heure de départ, en affichant le train 30 minutes avant le départ et en le faisant avancer vers la droite à mesure que l'heure de départ approche, ce qui crée une animation visuelle intuitive pour les utilisateurs afin de suivre l'approche du train vers la gare, et retourne une position en pourcentage (0% = train à gauche, 100% = train arrivé) ou une valeur négative pour indiquer que le train n'est pas encore visible, ce qui permet de gérer l'affichage du train de manière dynamique en fonction du temps restant avant le départ - * @param {object} trainAttributes - Les attributs du train, qui doivent inclure au minimum une heure de départ valide pour que le calcul fonctionne correctement, et peuvent inclure d'autres informations pour personnaliser l'affichage - * @returns {number} Un nombre représentant la position du train en pourcentage (0-100) ou une valeur négative si le train n'est pas encore visible - */ - calculateTrainPosition(trainAttributes) { - if (!trainAttributes.departure_time || !trainAttributes.arrival_time) { - return -10; - } - - const departure = this.parseTime(trainAttributes.departure_time); - const arrival = this.parseTime(trainAttributes.arrival_time); - const travelTime = (arrival - departure) / (1000 * 60); - - if (Number.isNaN(departure.getTime()) || Number.isNaN(arrival.getTime()) || travelTime < 0) { - return -10; - } - - const now = new Date(); - const diffMinutes = (arrival - now) / (1000 * 60); - - if (diffMinutes > travelTime) { - // TODO : tester et s'assurer de la véracité / nom du param animation_duration - if (this.config.animation_duration === 0 || this.config.animation_duration > diffMinutes - travelTime) { - // Train apparaît X minutes avant l'heure - return 0; - } - // Hors de la barre - return -10; - } - if (diffMinutes <= 0) { - // Arrivé à la gare - return 100; - } - - // Position sur la barre (0% = gauche, 100% = droite) - return ((travelTime - diffMinutes) / travelTime) * 100; - } - - /** - * Formate une chaîne de temps en une heure lisible au format français (ex: "08:20"), ou retourne "N/A" si la chaîne est vide, ou "Format invalide" si le parsing échoue, ce qui permet d'afficher les heures de départ et d'arrivée de manière claire et compréhensible pour les utilisateurs, tout en gérant les cas où les données de temps peuvent être manquantes ou mal formatées - * @param {string} timeString - La chaîne de temps à formater, qui doit être au format reconnu par la méthode parseTime - * @returns {string} Une chaîne représentant l'heure formatée ou un message d'erreur si le format est invalide - */ - formatTime(timeString) { - if (!timeString) { - return 'N/A'; - } - - const time = this.parseTime(timeString); - - if (Number.isNaN(time.getTime())) { - return 'Format invalide'; - } - - return time.toLocaleTimeString('fr-FR', { - hour: '2-digit', - minute: '2-digit' - }); - } - - /** - * Calcule la couleur du train en fonction du retard - * @param {number} delayMinutes - Le nombre de minutes de retard - * @param {boolean} hasDelay - Indique si le train a du retard ou non - * @returns {string} La couleur correspondante - */ - getTrainColor(delayMinutes, hasDelay) { - if (!hasDelay || delayMinutes === 0) return '#4caf50'; // Vert à l'heure - return '#f44336'; // Rouge en retard (peu importe le nombre de minutes) - } - - /** - * Méthode héritée
- * Génération du rendu de l'ensemble de la carte, incluant le css et l'html - */ - async render() { - if (!this._hass || !this.config) { - return; - } - - // Éviter les rendus trop fréquents (max 1 par seconde) - const now = Date.now(); - if (now - this._lastRenderTime < 1000) { - return; - } - this._lastRenderTime = now; - - const trains = await this.getTrainEntities(); - - if (trains.length === 0) { - this.shadowRoot.innerHTML = ` - -
-
Aucun train trouvé pour ce device. Vérifiez la configuration.
-
- - `; - return; - } - - this.shadowRoot.innerHTML = ` - ${this.renderCss()} - - -
-
-
${this.config.title}
-
- - ${this.renderTrainLines(trains)} - -
- - `; - } - - /** - * Rendu des icônes en fonction de la configuration, en vérifiant si l'icône est un emoji simple ou une icône HA (mdi:, fa:, ic:, ...), et en retournant le HTML approprié pour chaque cas. - * @param icone - La chaîne de caractères représentant l'icône configurée, qui peut être un emoji simple ou une icône HA avec un préfixe spécifique, et qui doit être traitée différemment pour s'assurer qu'elle s'affiche correctement dans la carte - * @return {string} Une chaîne HTML représentant l'icône à afficher, soit en utilisant la balise pour les icônes HA, soit en affichant directement l'emoji pour les emojis simples, ce qui permet de gérer une grande variété d'icônes de manière flexible et personnalisable - */ - renderIcone(icone) { - if (icone?.includes(':')) { - return ``; - } - return icone; - } - - /** - * Rendu des lignes de train en fonction des données fournies, en calculant la position de chaque train sur la barre de progression, en affichant les informations de départ et d'arrivée selon la configuration, et en appliquant des styles différents pour les trains en retards. - * @param {Array} trains - Un tableau d'entités de train à afficher, avec leurs attributs contenant les informations nécessaires pour le rendu - * @returns {string} Une chaîne HTML représentant la section complète du train - */ - renderTrainLines(trains) { - return trains.map(train => { - const TA = train.attributes; - const position = this.calculateTrainPosition(TA); - const delayMinutes = TA.delay_minutes || 0; - const hasDelay = TA.has_delay; - const isRunning = this.parseTime(TA.departure_time) < new Date() && new Date() < this.parseTime(TA.arrival_time) - const isArrived = new Date() > this.parseTime(TA.arrival_time) - const trainColor = this.getTrainColor(delayMinutes, hasDelay); - - const theme = isArrived ? 'arrived' : hasDelay ? 'delayed' : isRunning ? 'running' : ''; - return ` -
- ${this.config.show_departure_station ? this.renderDeparture(TA) : ''} - -
- ${ position >= 0 ? - `
- ${this.renderIcone(this.config.train_emoji)} -
` : '' - } -
- - ${this.config.show_arrival_station ? this.renderArrival(TA) : ''} - - ${this.config.show_route_details && TA.stops_schedule ? this.renderTimeline(TA) : ''} -
`; - }).join(''); - } - - /** - * - * @param trainAttributes - * @return {string} - */ - renderTimeline(trainAttributes) { - return ` -
-
-
- ${this.renderStops(trainAttributes.stops_schedule)} -
-
- `; - } - - /** - * - * @param stops - * @return {*} - */ - renderStops(stops) { - return stops.map(stop => { - const isDeleted = stop.effect === 'deleted'; - const isAdded = stop.effect === 'added'; - const isStopDelayed = this.config.show_route_details && stop.amended_time && stop.base_time && (stop.amended_time !== stop.base_time); - - const displayTime = isStopDelayed ? - `${stop.base_time}${stop.amended_time}` : - `${stop.base_time || stop.time}`; - - let statusBadge = ""; - if (isDeleted) { - statusBadge = ' SUPPRIMÉ'; - } else if (isAdded) { - statusBadge = ' RAJOUTÉ'; - } - - return ` -
-
-
- ${displayTime} -
-
- ${stop.name}${statusBadge} -
-
- `; - }).join(''); - } - - /** - * Rendu de la section de départ pour un train donné, en affichant l'heure de départ prévue, l'heure de départ réelle si le train a du retard. - * @param {object} trainAttributes - Les attributs du train - * @returns {string} Une chaîne HTML représentant la section de départ du train - */ - renderDeparture(trainAttributes) { - const hasDelay = trainAttributes.has_delay || false; - const isGone = new Date() > this.parseTime(trainAttributes.departure_time) - const delayMinutes = trainAttributes.delay_minutes || 0; - const departureTime = this.formatTime(trainAttributes.base_departure_time); - const realDepartureTime = this.formatTime(trainAttributes.departure_time); - - return ` -
-
-
- ${hasDelay && realDepartureTime ? ` -
${departureTime}
-
${realDepartureTime}
- ` : ` -
${departureTime}
- `} -
-
- ${hasDelay ? `+${delayMinutes}min` : isGone ? 'Parti' : 'À l\'heure'} -
-
-
${this.renderIcone(this.config.departure_station_emoji)}
-
- ` - } - - /** - * Rendu de la section d'arrivée pour un train donné, en affichant l'heure d'arrivée prévue, l'heure d'arrivée réelle si le train a du retard. - * @param {object} trainAttributes - Les attributs du train - * @returns {string} Une chaîne HTML représentant la section d'arrivée du train - */ - renderArrival(trainAttributes) { - const hasDelay = trainAttributes.has_delay || false; - const isArrived = new Date() > this.parseTime(trainAttributes.arrival_time) - const delayMinutes = trainAttributes.delay_minutes || 0; - const arrivalTime = this.formatTime(trainAttributes.base_arrival_time); - const realArrivalTime = this.formatTime(trainAttributes.arrival_time); - - return ` -
-
${this.renderIcone(this.config.arrival_station_emoji)}
-
-
- ${hasDelay && realArrivalTime ? ` -
${arrivalTime}
-
${realArrivalTime}
- ` : ` -
${arrivalTime}
- `} -
-
- ${hasDelay ? `+${delayMinutes}min` : isArrived ? 'Arrivé' : 'À l\'heure'} -
- ${trainAttributes.delay_cause ? `
${trainAttributes.delay_cause}
` : ''} -
-
- `; - } - - /** - * Rendu du CSS pour la carte, en définissant les styles de base pour la carte, les lignes de train, les barres de progression, les emojis, et les informations de station - * @return {string} Une chaîne HTML contenant les styles CSS pour la carte. - */ - renderCss() { - return ` - - `; - } - -} - -// Définir l'élément custom -customElements.define('sncf-train-card', SncfTrainCard); From 4b16f224839832e36d91944eeab786c1a4588dab Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 01:32:21 +0200 Subject: [PATCH 19/23] cleanup 2 --- custom_components/sncf_trains/api.py | 28 +++--- custom_components/sncf_trains/config_flow.py | 14 +-- custom_components/sncf_trains/coordinator.py | 6 +- custom_components/sncf_trains/sensor.py | 6 +- .../sncf_trains/tests/test_config_flow.py | 90 ------------------- .../sncf_trains/tests/test_coordinator.py | 78 ---------------- .../sncf_trains/www/sncf-train-card.js | 82 +---------------- 7 files changed, 29 insertions(+), 275 deletions(-) delete mode 100644 custom_components/sncf_trains/tests/test_config_flow.py delete mode 100644 custom_components/sncf_trains/tests/test_coordinator.py diff --git a/custom_components/sncf_trains/api.py b/custom_components/sncf_trains/api.py index 85a4dd8..b61f3b1 100644 --- a/custom_components/sncf_trains/api.py +++ b/custom_components/sncf_trains/api.py @@ -22,7 +22,7 @@ def __init__(self, session: ClientSession, api_key: str, timeout: int = 10): self._timeout = timeout async def fetch_departures( - self, stop_id: str, max_results: int = 10 + self, stop_id: str, max_results: int = 10 ) -> Optional[List[dict]]: if stop_id.startswith("stop_area:"): url = f"{API_BASE}/v1/coverage/sncf/stop_areas/{stop_id}/departures" @@ -41,10 +41,10 @@ async def fetch_departures( try: async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), ) as resp: if resp.status == 401: # vrai problème d'auth @@ -64,7 +64,7 @@ async def fetch_departures( return None async def fetch_journeys( - self, from_id: str, to_id: str, datetime_str: str, count: int = 5 + self, from_id: str, to_id: str, datetime_str: str, count: int = 5 ) -> Optional[Dict[str, Any]]: url = f"{API_BASE}/v1/coverage/sncf/journeys" params_raw: dict[str, object] = { @@ -80,10 +80,10 @@ async def fetch_journeys( headers = {"Authorization": f"Basic {self._token}"} try: async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), ) as resp: if resp.status == 401: raise ConfigEntryAuthFailed("Unauthorized: check your API key.") @@ -106,10 +106,10 @@ async def search_stations(self, query: str) -> Optional[List[dict]]: headers = {"Authorization": f"Basic {self._token}"} try: async with self._session.get( - url, - headers=headers, - params=params, - timeout=ClientTimeout(total=self._timeout), + url, + headers=headers, + params=params, + timeout=ClientTimeout(total=self._timeout), ) as resp: resp.raise_for_status() data = await resp.json() diff --git a/custom_components/sncf_trains/config_flow.py b/custom_components/sncf_trains/config_flow.py index 27941f4..3014b36 100644 --- a/custom_components/sncf_trains/config_flow.py +++ b/custom_components/sncf_trains/config_flow.py @@ -81,7 +81,7 @@ async def _validate_api_key(self, api: SncfApiClient): @classmethod @callback def async_get_supported_subentry_types( - cls, config_entry: ConfigEntry + cls, config_entry: ConfigEntry ) -> dict[str, type[ConfigSubentryFlow]]: """Return subentries supported by this integration.""" return { @@ -140,7 +140,7 @@ class TrainSubentryFlowHandler(ConfigSubentryFlow): config_entry: ConfigEntry | None = None async def async_step_departure_city( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the departure city step.""" errors = {} @@ -166,7 +166,7 @@ async def async_step_departure_city( ) async def async_step_departure_station( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the departure station step.""" if user_input is not None: @@ -184,7 +184,7 @@ async def async_step_departure_station( ) async def async_step_arrival_city( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the arrival city step.""" errors = {} @@ -203,7 +203,7 @@ async def async_step_arrival_city( ) async def async_step_arrival_station( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the arrival station step.""" if user_input is not None: @@ -221,7 +221,7 @@ async def async_step_arrival_station( ) async def async_step_time_range( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """Handle the time range step.""" if user_input is not None: @@ -262,7 +262,7 @@ async def async_step_time_range( ) async def async_step_reconfigure( - self, user_input: dict[str, Any] | None = None + self, user_input: dict[str, Any] | None = None ) -> SubentryFlowResult: """User flow to modify an existing entry.""" config_subentry = self._get_reconfigure_subentry() diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index 1d68190..bbb67be 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -63,8 +63,8 @@ async def _async_setup(self) -> None: _LOGGER.error("Erreur lors de la récupération des trajets SNCF: %s", err) raise UpdateFailed(err) from err - def _build_datetime_param(self, time_start: str, time_end: str) -> str: - """Construit le paramètre datetime pour l'API""" + def _build_datetime_param(self, time_start, time_end) -> str: + """Construit le paramètre datetime pour l'API.""" now = dt_util.now() h_start, m_start = map(int, time_start.split(":")) h_end, m_end = map(int, time_end.split(":")) @@ -181,6 +181,6 @@ async def _async_update_data(self) -> dict[str, Any]: _LOGGER.debug( "Coordinator update interval set to %s minutes", self.update_interval.total_seconds() / 60, - ) + ) return trains diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index d879fd6..8a2ef33 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -22,9 +22,9 @@ async def async_setup_entry( - hass: HomeAssistant, - entry: SncfDataConfigEntry, - async_add_entities: AddEntitiesCallback, + hass: HomeAssistant, + entry: SncfDataConfigEntry, + async_add_entities: AddEntitiesCallback, ) -> None: """Set up SNCF entities from a config entry.""" diff --git a/custom_components/sncf_trains/tests/test_config_flow.py b/custom_components/sncf_trains/tests/test_config_flow.py deleted file mode 100644 index d9f2395..0000000 --- a/custom_components/sncf_trains/tests/test_config_flow.py +++ /dev/null @@ -1,90 +0,0 @@ -import pytest -from unittest.mock import AsyncMock, patch - -from homeassistant import config_entries -from custom_components.sncf_trains.const import DOMAIN, CONF_API_KEY - - -@pytest.mark.asyncio -async def test_config_flow_happy_path(hass): - """Test config flow with valid API key and stations.""" - mock_api = AsyncMock() - mock_api.search_stations = AsyncMock( - side_effect=[ - [{"id": "stop_area:dep", "name": "Paris Gare de Lyon"}], # departure city - [{"id": "stop_area:arr", "name": "Lyon Part Dieu"}], # arrival city - ] - ) - - with patch( - "custom_components.sncf_trains.config_flow.SncfApiClient", return_value=mock_api - ): - # Step 1: saisie API key - result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": config_entries.SOURCE_USER} - ) - assert result["type"] == "form" - assert result["step_id"] == "user" - - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {CONF_API_KEY: "valid_key"} - ) - assert result["type"] == "form" - assert result["step_id"] == "departure_city" - - # Step 2: ville départ - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {"departure_city": "Paris"} - ) - assert result["type"] == "form" - assert result["step_id"] == "departure_station" - - # Step 3: station départ - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {"departure_station": "stop_area:dep"} - ) - assert result["type"] == "form" - assert result["step_id"] == "arrival_city" - - # Step 4: ville arrivée - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {"arrival_city": "Lyon"} - ) - assert result["type"] == "form" - assert result["step_id"] == "arrival_station" - - # Step 5: station arrivée - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {"arrival_station": "stop_area:arr"} - ) - assert result["type"] == "form" - assert result["step_id"] == "time_range" - - # Step 6: plage horaire + finalisation - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {"time_start": "07:00", "time_end": "10:00"} - ) - assert result["type"] == "create_entry" - assert result["title"] == "SNCF: Paris Gare de Lyon → Lyon Part Dieu" - assert result["data"]["departure_name"] == "Paris Gare de Lyon" - - -@pytest.mark.asyncio -async def test_config_flow_invalid_api_key(hass): - """Test config flow with invalid API key.""" - mock_api = AsyncMock() - mock_api.search_stations = AsyncMock(return_value=None) - - with patch( - "custom_components.sncf_trains.config_flow.SncfApiClient", return_value=mock_api - ): - result = await hass.config_entries.flow.async_init( - DOMAIN, context={"source": config_entries.SOURCE_USER} - ) - - result = await hass.config_entries.flow.async_configure( - result["flow_id"], {CONF_API_KEY: "bad_key"} - ) - - assert result["type"] == "form" - assert result["errors"]["base"] == "invalid_api_key" diff --git a/custom_components/sncf_trains/tests/test_coordinator.py b/custom_components/sncf_trains/tests/test_coordinator.py deleted file mode 100644 index ca6d964..0000000 --- a/custom_components/sncf_trains/tests/test_coordinator.py +++ /dev/null @@ -1,78 +0,0 @@ -import pytest -from unittest.mock import AsyncMock -from datetime import timedelta -from homeassistant.helpers.update_coordinator import UpdateFailed - -from custom_components.sncf_trains.coordinator import SncfUpdateCoordinator - - -@pytest.mark.asyncio -async def test_coordinator_success(hass): - """Test coordinator fetches journeys successfully.""" - mock_api = AsyncMock() - mock_api.fetch_journeys = AsyncMock(return_value=[{"id": "j1"}]) - - coordinator = SncfUpdateCoordinator( - hass=hass, - api_client=mock_api, - departure="stop_area:dep", - arrival="stop_area:arr", - time_start="06:00", - time_end="09:00", - update_interval=5, - outside_interval=30, - ) - - data = await coordinator._async_update_data() - assert data == [{"id": "j1"}] - mock_api.fetch_journeys.assert_called_once() - assert isinstance(coordinator.update_interval, timedelta) - - -@pytest.mark.asyncio -async def test_coordinator_api_failure(hass): - """Test coordinator raises UpdateFailed when API fails.""" - mock_api = AsyncMock() - mock_api.fetch_journeys = AsyncMock(side_effect=Exception("API error")) - - coordinator = SncfUpdateCoordinator( - hass=hass, - api_client=mock_api, - departure="stop_area:dep", - arrival="stop_area:arr", - time_start="06:00", - time_end="09:00", - ) - - with pytest.raises(UpdateFailed): - await coordinator._async_update_data() - - -@pytest.mark.asyncio -async def test_coordinator_adjust_interval(hass): - """Test that update interval adjusts inside and outside time range.""" - - mock_api = AsyncMock() - mock_api.fetch_journeys = AsyncMock(return_value=[{"id": "j1"}]) - - coordinator = SncfUpdateCoordinator( - hass=hass, - api_client=mock_api, - departure="stop_area:dep", - arrival="stop_area:arr", - time_start="00:00", - time_end="23:59", - update_interval=5, - outside_interval=30, - ) - - # Forcing inside time range (always true here) - await coordinator._async_update_data() - assert coordinator.update_interval == timedelta(minutes=5) - - # Fake outside range by setting opposite times - coordinator.time_start = "23:59" - coordinator.time_end = "00:00" - - await coordinator._async_update_data() - assert coordinator.update_interval == timedelta(minutes=30) diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index 487b07d..86ed3f8 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -1,5 +1,5 @@ // Ajouter au registre des cartes personnalisées -globalThis.customCards = globalThis.customCards || [] +globalThis.customCards ||= [] globalThis.customCards.push({ type: 'sncf-train-card', name: 'SNCF Train Card', @@ -382,83 +382,6 @@ class SncfTrainCard extends HTMLElement { allTrainEntities.push(...trainEntities); } - const d = new Date(); - if (d.getMinutes() < 30) d.setHours(d.getHours()-1) - allTrainEntities.push({ - entity_id: "sensor.nantes_le_pouliguen_train_11", - attributes: { - arrival_stop_id : "stop_point:SNCF:87481002:Train", - arrival_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()+1}:32`, - attribution : "Data provided by api.sncf.com", - base_arrival_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()+1}:02`, - base_departure_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()}:00`, - commercial_mode : "Aléop", - delay_cause: "Perturbation de lignes férroviaires", - delay_minutes : 24, - departure_stop_id : "stop_point:SNCF:87481762:Train", - departure_time : `${d.getDate()}/0${d.getMonth()+1}/${d.getFullYear()} - ${d.getHours()}:30`, - device_class : "timestamp", - direction : "Nantes (Nantes)", - duration_minutes : 67, - friendly_name : "Le Pouliguen → Nantes Train 7", - has_delay : true, - icon : "mdi:train", - physical_mode : "TER / Intercités", - train_num: "858060", - stops_schedule: [ - { - "name": "Le Pouliguen", - "time": `${d.getHours()}:30`, - "base_time": `${d.getHours()}:00`, - "amended_time": `${d.getHours()}:30`, - "effect": "unchanged" - }, - { - "name": "La Baule-Escoublac", - "time": `${d.getHours()}:35`, - "base_time": `${d.getHours()}:05`, - "amended_time": `${d.getHours()}:35`, - "effect": "unchanged" - }, - { - "name": "La Baule Les Pins", - "time": `${d.getHours()}:38`, - "base_time": `${d.getHours()}:08`, - "amended_time": `${d.getHours()}:38`, - "effect": "unchanged" - }, - { - "name": "Pornichet", - "time": `${d.getHours()}:42`, - "base_time": `${d.getHours()}:12`, - "amended_time": `${d.getHours()}:42`, - "effect": "unchanged" - }, - { - "name": "Saint-Nazaire", - "time": `${d.getHours()}:54`, - "base_time": `${d.getHours()}:24`, - "amended_time": `${d.getHours()}:54`, - "effect": "unchanged" - }, - { - "name": "Savenay", - "time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:08`, - "base_time": `${d.getHours()}:38`, - "amended_time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:08`, - "effect": "unchanged" - }, - { - "name": "Nantes", - "time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:32`, - "base_time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:02`, - "amended_time": `${d.getHours()+1 >= 24 ? '0' + (d.getHours()-23) : d.getHours()+1}:32`, - "effect": "unchanged" - } - ] - } - }); - // Source - https://stackoverflow.com/a/1214753 // Posted by Kip, modified by community. See post 'Timeline' for change history // Retrieved 2026-05-15, License - CC BY-SA 4.0 @@ -478,8 +401,7 @@ class SncfTrainCard extends HTMLElement { const aTime = this.parseTime(a.attributes.arrival_time); const bTime = this.parseTime(b.attributes.arrival_time); return aTime - bTime; - }) - .slice(0, this.config.settings.train_lines); + }).slice(0, this.config.settings.train_lines); } catch (error) { console.error('❌ Erreur lors de la récupération via API:', error); From b9c95e7aa83af7f52808cf6569e96cd180972a15 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 01:35:06 +0200 Subject: [PATCH 20/23] rollback tests --- .../sncf_trains/tests}/test_config_flow.py | 0 .../sncf_trains/tests}/test_coordinator.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {tests => custom_components/sncf_trains/tests}/test_config_flow.py (100%) rename {tests => custom_components/sncf_trains/tests}/test_coordinator.py (100%) diff --git a/tests/test_config_flow.py b/custom_components/sncf_trains/tests/test_config_flow.py similarity index 100% rename from tests/test_config_flow.py rename to custom_components/sncf_trains/tests/test_config_flow.py diff --git a/tests/test_coordinator.py b/custom_components/sncf_trains/tests/test_coordinator.py similarity index 100% rename from tests/test_coordinator.py rename to custom_components/sncf_trains/tests/test_coordinator.py From e7825cd006794e1b69e41fc900ea5ecade504f52 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 01:43:42 +0200 Subject: [PATCH 21/23] Linter --- custom_components/sncf_trains/sensor.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/custom_components/sncf_trains/sensor.py b/custom_components/sncf_trains/sensor.py index 8a2ef33..b9e9186 100644 --- a/custom_components/sncf_trains/sensor.py +++ b/custom_components/sncf_trains/sensor.py @@ -107,8 +107,6 @@ def __init__(self, coordinator, train_id: str, journey_id: int) -> None: self.journey = coordinator.data[train_id][journey_id] self.sections = self.journey.get("sections", [{}])[0] departure_time = parse_datetime(self.sections.get("base_departure_date_time", "")) - dep_name = entry.data[CONF_DEPARTURE_NAME] - arr_name = entry.data[CONF_ARRIVAL_NAME] self.departure = entry.data[CONF_FROM] self.arrival = entry.data[CONF_TO] From ba4e7a7535e357f41736605fe09f2540ecbddd1a Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 14:14:56 +0200 Subject: [PATCH 22/23] =?UTF-8?q?Gestion=20des=20erreurs=20+=20r=C3=A9troc?= =?UTF-8?q?ompatibilit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sncf_trains/www/sncf-train-card.js | 85 +++++++++++++++---- 1 file changed, 68 insertions(+), 17 deletions(-) diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index 86ed3f8..9859162 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -8,6 +8,9 @@ globalThis.customCards.push({ configurable: true }); +class MissingConfigError extends Error {} +class InvalidConfigTypeError extends TypeError {} + class SncfTrainCard extends HTMLElement { constructor() { super(); @@ -28,35 +31,83 @@ class SncfTrainCard extends HTMLElement { throw new Error('You need to define device_id'); } + config = this.migrateConfig(config); + + const previousDeviceId = this.config?.device_id ?? null; + const deviceIdChanged = previousDeviceId && JSON.stringify(previousDeviceId) !== JSON.stringify(config.device_id); + + this.config = { ...config }; + + // Forcer la mise à jour immédiate si device_id a changé + if (deviceIdChanged) { + this.stopUpdateTimer(); + this.startUpdateTimer(); + } + + // Toujours forcer un nouveau rendu + this.render(); + } + + /** + * Permet de migrer une configuration ancienne vers la nouvelle structure attendue. + * Pour le moment, la migration gère uniquement le bon affichage de la carte sans mettre à jour le code yaml de la carte. + * À voir s'il est possible de gérer une vraie migration des données. + * @param {object} config - La configuration actuelle de la carte à adapter + * @return {object} La configuration adaptée. + */ + migrateConfig(config) { + const migrated = {...config}; + + // Créer `settings` si absent et transférer les champs legacy + if (!migrated.settings) { + const maybeSettings = {}; + maybeSettings.title = migrated.title; + maybeSettings.train_lines = migrated.train_lines; + maybeSettings.show_route_details = migrated.show_route_details ?? false; + + migrated.settings = {...maybeSettings}; + } + + // Créer `display` si absent et transférer les champs legacy + if (!migrated.display) { + const maybeDisplay = {}; + maybeDisplay.number_of_stops = migrated.number_of_stops ?? 7; + maybeDisplay.train_emoji_axial_symmetry = migrated.train_emoji_axial_symmetry; + maybeDisplay.train_emoji = migrated.train_emoji; + maybeDisplay.show_departure_station = migrated.show_departure_station; + maybeDisplay.departure_station_emoji = migrated.departure_station_emoji; + maybeDisplay.show_arrival_station = migrated.show_arrival_station; + maybeDisplay.arrival_station_emoji = migrated.arrival_station_emoji; + + migrated.display = {...maybeDisplay}; + } + // Normaliser device_id en tableau (rétrocompatibilité) let normalizedDeviceId = config.device_id; if (typeof normalizedDeviceId === 'string') { normalizedDeviceId = [normalizedDeviceId]; } else if (!Array.isArray(normalizedDeviceId)) { - // FIXME : custom error ? - throw new TypeError('device_id must be a string or an array of strings'); + throw new InvalidConfigTypeError('device_id must be a string or an array of strings'); } // Vérifier qu'il y a au moins un device_id non-vide if (!normalizedDeviceId.length || !normalizedDeviceId.some(id => typeof id === 'string' && id.trim() !== '')) { - // FIXME : custom error ? - throw new TypeError('You need to define at least one valid device_id'); + throw new MissingConfigError('You need to define at least one valid device_id'); } - const previousDeviceId = this.config ? this.config.device_id : null; - const deviceIdChanged = previousDeviceId && JSON.stringify(previousDeviceId) !== JSON.stringify(normalizedDeviceId); - - // Créer une copie de la config avec le device_id normalisé - this.config = { ...config, device_id: normalizedDeviceId }; - - // Forcer la mise à jour immédiate si device_id a changé - if (deviceIdChanged) { - this.stopUpdateTimer(); - this.startUpdateTimer(); + // Nettoyer les clés legacy si nous les avons migrées + const legacyKeys = [ + 'title', 'train_lines', 'show_route_details', + 'number_of_stops', 'train_emoji_axial_symmetry', 'train_emoji', + 'show_departure_station', 'departure_station_emoji', 'show_arrival_station', 'arrival_station_emoji' + ]; + for (const k of legacyKeys) { + if (k in migrated && (migrated.settings || migrated.display)) { + delete migrated[k]; + } } - // Toujours forcer un nouveau rendu - this.render(); + return { ...migrated, device_id: normalizedDeviceId}; } /** @@ -222,7 +273,7 @@ class SncfTrainCard extends HTMLElement { */ static getStubConfig() { return { - device_id: ['', ''], + device_id: [''], settings: { title: 'Trains SNCF', train_lines: 5, From ee7c4c5bf8ae2fcbce8b5d31dc9bfa31bbb5c855 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre MARTIN Date: Mon, 25 May 2026 14:46:44 +0200 Subject: [PATCH 23/23] =?UTF-8?q?Ajout=20des=20arr=C3=AAts=20pass=C3=A9s?= =?UTF-8?q?=20+=20disparition=20des=20trains=20d=C3=A9j=C3=A0=20partis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom_components/sncf_trains/coordinator.py | 2 -- .../sncf_trains/www/sncf-train-card.js | 25 ++++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/custom_components/sncf_trains/coordinator.py b/custom_components/sncf_trains/coordinator.py index bbb67be..eaf9482 100644 --- a/custom_components/sncf_trains/coordinator.py +++ b/custom_components/sncf_trains/coordinator.py @@ -73,8 +73,6 @@ def _build_datetime_param(self, time_start, time_end) -> str: if now > dt_end: dt_start += timedelta(days=1) - elif now > dt_start: - dt_start = now return dt_start.strftime("%Y%m%dT%H%M%S") diff --git a/custom_components/sncf_trains/www/sncf-train-card.js b/custom_components/sncf_trains/www/sncf-train-card.js index 9859162..512b4d1 100644 --- a/custom_components/sncf_trains/www/sncf-train-card.js +++ b/custom_components/sncf_trains/www/sncf-train-card.js @@ -728,11 +728,13 @@ class SncfTrainCard extends HTMLElement { }).map(stop => { const isDeleted = stop.effect === 'deleted'; const isAdded = stop.effect === 'added'; + const isPassed = now > this.parseTime(stop.time); // TODO : s'assurer de l'utilité de amended_time par rapport à time / base_time const isStopDelayed = this.config.settings.show_route_details && stop.amended_time && stop.base_time && (stop.amended_time !== stop.base_time); + const theme = isPassed ? 'passed' : isDeleted ? 'deleted' : isAdded ? 'added' : isStopDelayed ? 'delayed' : ''; const displayTime = isStopDelayed ? - `${stop.base_time}${stop.amended_time}` : + `${stop.base_time}${stop.amended_time}` : `${stop.base_time || stop.time}`; let statusBadge = ""; @@ -744,12 +746,13 @@ class SncfTrainCard extends HTMLElement { return `
-
+
${displayTime}
-
- ${stop.name}${statusBadge} +
+ ${stop.name} + ${statusBadge}
`; @@ -1025,14 +1028,18 @@ class SncfTrainCard extends HTMLElement { .timeline-container { display: flex; justify-content: space-between; position: relative; z-index: 2; } .timeline-stop { display: flex; flex-direction: column; align-items: center; width: 90px; } .timeline-dot { width: 14px; height: 14px; border-radius: 50%; background: var(--card-background-color); border: 3px solid var(--primary-color); margin-bottom: 6px; box-sizing: border-box; } - .timeline-dot.delayed-dot { border-color: #ff9800; } - .timeline-dot.deleted-dot { background: #f44336; border-color: #f44336; } - .timeline-dot.added-dot { border-color: #ff9800; border-style: dashed; } + .timeline-dot.delayed { border-color: #ff9800; } + .timeline-dot.passed { border-color: #747474; } + .timeline-dot.deleted { background: #f44336; border-color: #f44336; } + .timeline-dot.added { border-color: #ff9800; border-style: dashed; } .timeline-time { font-size: 0.75em; font-weight: bold; display: contents; } .base-time-radar { text-decoration: line-through; opacity: 0.5; font-size: 0.9em; } + .base-time-radar.passed { display: none; } .amended-time-radar { color: #ff9800; font-weight: bold; } - .timeline-name { font-size: 0.65em; text-align: center; color: var(--secondary-text-color); line-height: 1.2; } - .badge-stop { font-size: 0.8em; font-weight: bold; padding: 1px 3px; border-radius: 3px; color: white; } + .amended-time-radar.passed { color: #747474; font-weight: bold; } + .timeline-name { font-size: 0.65em; text-align: center; color: var(--secondary-text-color); line-height: 1.2; display: flex; flex-direction: column; align-items: center; } + .timeline-name.deleted { text-decoration: line-through; opacity: 0.5; } + .badge-stop { font-size: 0.8em; font-weight: bold; padding: 1px 3px; border-radius: 3px; color: white; width: fit-content; } .badge-stop.deleted { background: #f44336; } .badge-stop.added { background: #ff9800; }