fix(output): split a History status at its earliest warning marker

split_status_warning() tried ', warn:' before ', error:' and so on, rather
than taking whichever came first. A status like 'Charging, Error: ... , Warn: ...'
was cut at the later marker, so the flag's tooltip showed only the tail of
the error and the state part kept the error text. Take the minimum index
across all markers instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: chalfontchubby

apps/predbat/output.py

@@ -105,10 +105,11 @@ def split_status_warning(status):
     # recognised, bare and behind a state alike.
     if lowered.startswith("warn:") or lowered.startswith("warn -") or lowered.startswith("error:"):
         return "", status
-    for marker in (", warn:", ", warn -", ", error:"):
-        index = lowered.find(marker)
-        if index >= 0:
-            return status[:index].strip(), status[index + 2 :].strip()
+    # Split at the earliest marker, whichever kind: the warning text may itself mention another one.
+    indices = [index for index in (lowered.find(marker) for marker in (", warn:", ", warn -", ", error:")) if index >= 0]
+    if indices:
+        index = min(indices)
+        return status[:index].strip(), status[index + 2 :].strip()
     return status, ""
 
 

apps/predbat/tests/test_calculate_yesterday.py

@@ -2246,6 +2246,7 @@ def _test_split_status_warning(my_predbat, failed):
         ("Freeze exporting, Hold for car, Error: Inverter 0 unable to read Export window", "Freeze exporting, Hold for car"),
         ("Warn - Unable to fetch data from sensor.outdoor_temperature", ""),
         ("Exporting, Warn - Unable to fetch data from sensor.outdoor_temperature", "Exporting"),
+        ("Charging, Error: Exception raised in fetch, Warn: retrying", "Charging"),
     ]
     for status, expected in cases:
         result = split_status_warning(status)[0]
@@ -2259,6 +2260,10 @@ def _test_split_status_warning(my_predbat, failed):
         ("Warn - Unable to fetch data from sensor.outdoor_temperature", "Warn - Unable to fetch data from sensor.outdoor_temperature"),
         ("Exporting, Warn - Unable to fetch data from sensor.outdoor_temperature", "Warn - Unable to fetch data from sensor.outdoor_temperature"),
         ("Exporting, Warn: Return bad float value unavailable from car_charging_soc", "Warn: Return bad float value unavailable from car_charging_soc"),
+        # The split is at the first marker, whichever kind it is, so a warning that mentions another
+        # marker later on is kept whole rather than cut at that later marker
+        ("Charging, Error: Exception raised in fetch, Warn: retrying", "Error: Exception raised in fetch, Warn: retrying"),
+        ("Charging, Warn - Unable to fetch data, Error: timeout", "Warn - Unable to fetch data, Error: timeout"),
     ]
     for status, expected in warning_cases:
         result = split_status_warning(status)[1]