diff --git a/wake_alarm/_evening_policy.py b/wake_alarm/_evening_policy.py index 1e0d235..8ad5a42 100644 --- a/wake_alarm/_evening_policy.py +++ b/wake_alarm/_evening_policy.py @@ -24,8 +24,7 @@ from __future__ import annotations from dataclasses import dataclass from typing import TYPE_CHECKING -from wake_alarm._constants import FALLBACK_RING_CAP -from wake_alarm._fallback_policy import CAP, Decision +from wake_alarm._fallback_policy import CAP, Decision, latch_capped if TYPE_CHECKING: from datetime import datetime @@ -65,13 +64,7 @@ def in_evening(now: datetime) -> bool: def is_capped(facts: EveningFacts) -> bool: """Whether tonight's ring has used its 30 minutes.""" - latch = facts.latch - if latch is None: - return False - if latch.stop_reason == CAP: - return True - started = latch.started() - return started is not None and facts.now >= started + FALLBACK_RING_CAP + return latch_capped(facts.latch, facts.now) def needs_fetch(facts: EveningFacts) -> bool: diff --git a/wake_alarm/_fallback_policy.py b/wake_alarm/_fallback_policy.py index 26968a5..0299c6f 100644 --- a/wake_alarm/_fallback_policy.py +++ b/wake_alarm/_fallback_policy.py @@ -135,15 +135,19 @@ def needs_facts(now: datetime, alarm_at: datetime, latch: Latch | None) -> bool: return alarm_at - FALLBACK_WINDOW_START <= now < alarm_at + BYPASS_WATCH -def is_capped(facts: Facts) -> bool: - """Whether today's ring has used its 30 minutes.""" - latch = facts.latch +def latch_capped(latch: Latch | None, now: datetime) -> bool: + """Whether the ring this latch records has used its 30 minutes.""" if latch is None: return False if latch.stop_reason == CAP: return True started = latch.started() - return started is not None and facts.now >= started + FALLBACK_RING_CAP + return started is not None and now >= started + FALLBACK_RING_CAP + + +def is_capped(facts: Facts) -> bool: + """Whether today's ring has used its 30 minutes.""" + return latch_capped(facts.latch, facts.now) def day_off(facts: Facts) -> str | None: