boneio 1.4.0.dev11__tar.gz → 1.4.0.dev12__tar.gz

{boneio-1.4.0.dev11/boneio.egg-info → boneio-1.4.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.4.0.dev11
+Version: 1.4.0.dev12
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.4.0.dev11 → boneio-1.4.0.dev12}/boneio/components/irrigation/controller.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import datetime as dt
 import logging
 import time
 import traceback
@@ -1058,9 +1059,32 @@ class IrrigationController:
 
             await self.start_full_cycle()
 
+def _local_now() -> datetime:
+    """Return the current time in the system's local timezone.
+
+    Extracted as a module-level function so tests can mock it easily.
+    """
+    local_tz = dt.datetime.now().astimezone().tzinfo
+    return dt.datetime.now(local_tz)
+
 
 def _next_fire_time(time_str: str, days: str) -> datetime:
-    now = utcnow()
+    """Compute next fire time for a schedule entry.
+
+    The user-configured ``time_str`` (e.g. "18:00") is in **local time**.
+    We build the candidate in the system's local timezone and then convert
+    to UTC so that comparisons with ``utcnow()`` and HA's
+    ``device_class: timestamp`` work correctly.
+
+    Args:
+        time_str: Schedule time in "HH:MM" format (local time).
+        days: Day filter string ("daily", "weekdays", "weekends", "mon,wed,fri", etc.).
+
+    Returns:
+        Next fire time as a timezone-aware UTC datetime.
+    """
+    now_local = _local_now()
+
     try:
         hh, mm = time_str.split(":", 1)
         target_h = int(hh)
@@ -1071,18 +1095,21 @@ def _next_fire_time(time_str: str, days: str) -> datetime:
     allowed_days = _DAYS_MAP.get(days, _DAYS_MAP["daily"])
 
     for plus_days in range(0, 8):
-        candidate = (now + timedelta(days=plus_days)).replace(
+        candidate_local = (now_local + timedelta(days=plus_days)).replace(
             hour=target_h,
             minute=target_m,
             second=0,
             microsecond=0,
         )
-        if candidate.weekday() in allowed_days and candidate > now:
-            return candidate
+        if candidate_local.weekday() in allowed_days and candidate_local > now_local:
+            # Convert to UTC for consistent comparison with utcnow()
+            return candidate_local.astimezone(dt.UTC)
 
-    return (now + timedelta(days=1)).replace(
+    fallback_local = (now_local + timedelta(days=1)).replace(
         hour=target_h,
         minute=target_m,
         second=0,
         microsecond=0,
     )
+    return fallback_local.astimezone(dt.UTC)
+

boneio-1.4.0.dev12/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "1.4.0dev12"

{boneio-1.4.0.dev11 → boneio-1.4.0.dev12/boneio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.4.0.dev11
+Version: 1.4.0.dev12
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

boneio-1.4.0.dev11/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "1.4.0dev11"