collect: send last 24 h of history on client connect (not same-day only)

Replace load_today_records with load_last_24h_records which computes a
rolling 24 h cutoff, globs log files for both the current and previous
calendar day, and filters records by timestamp — so clients always
receive a full 24 h window regardless of when midnight falls.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-05-26 13:20:41 +02:00
co-authored by Claude Sonnet 4.6
parent 9052323baa
commit b57e2a9cc2
2 changed files with 27 additions and 15 deletions
+3 -3
View File
@@ -57,7 +57,7 @@ from pathlib import Path
from server import log_config, network, we_connect from server import log_config, network, we_connect
from server.data_model import ALL_DOMAINS, collect_snapshot from server.data_model import ALL_DOMAINS, collect_snapshot
from server.storage_helpers import auto_out_path, load_store, load_today_records, save_store from server.storage_helpers import auto_out_path, load_last_24h_records, load_store, save_store
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -95,9 +95,9 @@ def run(args: argparse.Namespace) -> None:
push_clients, push_lock, push_store_ref = network.start_push_server(args.host, args.port) push_clients, push_lock, push_store_ref = network.start_push_server(args.host, args.port)
if logs_dir is not None: if logs_dir is not None:
push_store_ref["preloaded"] = load_today_records(logs_dir, vin) push_store_ref["preloaded"] = load_last_24h_records(logs_dir, vin)
if push_store_ref["preloaded"]: if push_store_ref["preloaded"]:
log.info("Pre-loaded %d record(s) from today's log files", len(push_store_ref["preloaded"])) log.info("Pre-loaded %d record(s) from the last 24 h", len(push_store_ref["preloaded"]))
current_day = datetime.now(timezone.utc).date() current_day = datetime.now(timezone.utc).date()
store = load_store(out, vin, args.interval) store = load_store(out, vin, args.interval)
+24 -12
View File
@@ -1,6 +1,6 @@
import json import json
import logging import logging
from datetime import datetime, timezone from datetime import datetime, timedelta, timezone
from pathlib import Path from pathlib import Path
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -35,17 +35,29 @@ def save_store(path: Path, store: dict, max_records: int | None) -> None:
path.write_text(json.dumps(store, indent=2, default=str)) path.write_text(json.dumps(store, indent=2, default=str))
def load_today_records(logs_dir: Path, vin: str) -> list: def load_last_24h_records(logs_dir: Path, vin: str) -> list:
"""Load and merge all records from today's log files for this VIN.""" """Load records from the last 24 hours across log files (may span midnight)."""
today_prefix = datetime.now(timezone.utc).strftime("%Y_%m_%d_") now = datetime.now(timezone.utc)
cutoff = now - timedelta(hours=24)
cutoff_str = cutoff.isoformat()
# Log files are named YYYY_MM_DD_…_VIN.json; the 24 h window can span two calendar days.
prefixes = {
cutoff.strftime("%Y_%m_%d_"),
now.strftime("%Y_%m_%d_"),
}
records = [] records = []
for path in sorted(logs_dir.glob(f"{today_prefix}*_{vin}.json")): for prefix in sorted(prefixes):
try: for path in sorted(logs_dir.glob(f"{prefix}*_{vin}.json")):
data = json.loads(path.read_text()) try:
if isinstance(data, dict) and "records" in data: data = json.loads(path.read_text())
records.extend(data["records"]) if isinstance(data, dict) and "records" in data:
log.debug("Loaded %d records from %s", len(data["records"]), path.name) kept = [r for r in data["records"] if r.get("ts", "") >= cutoff_str]
except (json.JSONDecodeError, OSError): records.extend(kept)
log.warning("Could not load %s", path) log.debug("Loaded %d/%d records from %s", len(kept), len(data["records"]), path.name)
except (json.JSONDecodeError, OSError):
log.warning("Could not load %s", path)
records.sort(key=lambda r: r.get("ts", "")) records.sort(key=lambda r: r.get("ts", ""))
return records return records