kaneda/harbour-aira
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.7.1: allineo la copia del bridge (orari dell'impianto letti come UTC)

Browse Source
This commit is contained in:
Carlo
2026-10-11 12:38:27 +02:00
parent 2b397b6c3a
commit f7447900f9
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridge/aira_bridge.py
+5 -1
View File
@@ -698,7 +698,11 @@ def boost_restanti(st: dict) -> int:
# sottrazione con "adesso" (che il fuso ce l'ha) solleva TypeError e
# /summary risponde 502 -- l'app resta senza dati ("Nessun dato").
if quando.tzinfo is None:
quando = quando.replace(tzinfo=PLANT_TZ)
# "Senza fuso" NON vuol dire ora locale: pyairahome converte i Timestamp
# con ts.ToDatetime() (utils/utils.py) che, senza argomenti, restituisce
# un datetime *naive ma in UTC*. Leggerlo come ora dell'impianto
# sbaglierebbe il conto di una o due ore.
quando = quando.replace(tzinfo=timezone.utc)
return max(0, int((quando - datetime.now(timezone.utc)).total_seconds()))
bridge/test_bridge_commands.py
+2 -2
View File
@@ -236,8 +236,8 @@ check("boost mai avviato: zero secondi", b.boost_restanti({}) == 0)
# che ha fatto rispondere 502 a /summary: la sottrazione con "adesso" (che il
# fuso ce l'ha) solleva TypeError, e l'app resta senza dati ("Nessun dato").
# Il conto alla rovescia deve reggere entrambe le forme.
_fine_naive = (datetime.now(b.PLANT_TZ) + timedelta(seconds=1200)).strftime("%Y-%m-%dT%H:%M:%S")
check("boost con fine senza fuso (ora dell'impianto)",
_fine_naive = (datetime.now(timezone.utc) + timedelta(seconds=1200)).replace(tzinfo=None).isoformat()
check("boost con fine senza fuso (forma dell'impianto: naive UTC)",
abs(b.boost_restanti({"hot_water_boost": {"end_time": _fine_naive}}) - 1200) <= 3)
check("riassunto con fine senza fuso (la forma che dava 502)",
(b.summarize({"hot_water_boost": {"end_time": _fine_naive}}) or {}).get("boost_active") is True)
translations/harbour-aira-it.ts
+7 -7
View File
@@ -578,32 +578,32 @@
<translation>Azioni rapide</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="264"/>
<location filename="../qml/pages/MainPage.qml" line="271"/>
<source>Boost</source>
<translation>Boost</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="280"/>
<location filename="../qml/pages/MainPage.qml" line="288"/>
<source>Home</source>
<translation>Torna</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="280"/>
<location filename="../qml/pages/MainPage.qml" line="288"/>
<source>Away</source>
<translation>Assenza</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="286"/>
<location filename="../qml/pages/MainPage.qml" line="294"/>
<source>Away mode off</source>
<translation>Assenza disattivata</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="307"/>
<location filename="../qml/pages/MainPage.qml" line="316"/>
<source>More</source>
<translation>Altro</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="330"/>
<location filename="../qml/pages/MainPage.qml" line="339"/>
<source>Outside %1 °C · Thermostat %2 °C · Zones %3</source>
<translation>Esterno %1 °C · Termostato %2 °C · Zone %3</translation>
</message>
@@ -618,7 +618,7 @@
<translation>Bridge non configurato. Apri le impostazioni e inserisci l&apos;indirizzo del server e il token.</translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="270"/>
<location filename="../qml/pages/MainPage.qml" line="277"/>
<source>Starting DHW boost</source>
<translation>Avvio del boost ACS</translation>
</message>
translations/harbour-aira.ts
+7 -7
View File
@@ -593,37 +593,37 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="264"/>
<location filename="../qml/pages/MainPage.qml" line="271"/>
<source>Boost</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="270"/>
<location filename="../qml/pages/MainPage.qml" line="277"/>
<source>Starting DHW boost</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="280"/>
<location filename="../qml/pages/MainPage.qml" line="288"/>
<source>Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="280"/>
<location filename="../qml/pages/MainPage.qml" line="288"/>
<source>Away</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="307"/>
<location filename="../qml/pages/MainPage.qml" line="316"/>
<source>More</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="286"/>
<location filename="../qml/pages/MainPage.qml" line="294"/>
<source>Away mode off</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="330"/>
<location filename="../qml/pages/MainPage.qml" line="339"/>
<source>Outside %1 °C · Thermostat %2 °C · Zones %3</source>
<translation type="unfinished"></translation>
</message>