git_admin
24155a8492
Add a separate `record` field so a camera can be registered but fully
off, or on but not recording:
- enabled (Вкл): camera on/off. Disabled = no go2rtc stream (no live),
no recording; entry is just stored. build_streams/sync_all/reconcile
skip disabled cameras; live grid shows "камера выключена".
- record (REC): write segments to disk. Recorder runs only when
enabled AND record.
Unified POST /api/cameras/{id}/toggle {enabled?, record?} (replaces the
/record endpoint); go2rtc is touched only when `enabled` changes, so
flipping REC doesn't blip live. Camera table gets Вкл + Запись toggle
columns; add/edit forms get both switches.
load_config migrates the old schema (no `record` key): old `enabled`
meant "record" with live always on -> enabled=True, record=old enabled.
VERSION -> 0.0.126.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
81 lines
3.0 KiB
Python
81 lines
3.0 KiB
Python
"""Супервизор: владеет набором RecorderTask по всем включённым камерам."""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
|
|
from ..config import Camera, Config
|
|
from ..models import CameraStatus
|
|
from ..services import go2rtc
|
|
from .recorder_task import RecorderTask
|
|
|
|
log = logging.getLogger("nvr.supervisor")
|
|
|
|
|
|
class Supervisor:
|
|
def __init__(self, config: Config, on_status=None):
|
|
self.config = config
|
|
self.on_status = on_status
|
|
self.tasks: dict[str, RecorderTask] = {}
|
|
|
|
def _input_url(self, cam: Camera) -> str:
|
|
# запись основного потока идёт через рестрим go2rtc (одна сессия к камере)
|
|
return go2rtc.restream_main_url(self.config, cam.id)
|
|
|
|
def start_all(self) -> None:
|
|
for cam in self.config.cameras:
|
|
task = RecorderTask(cam, self.config.storage, on_status=self.on_status,
|
|
input_url=self._input_url(cam))
|
|
self.tasks[cam.id] = task
|
|
if cam.enabled and cam.record:
|
|
task.start()
|
|
log.info("recorder started: %s", cam.id)
|
|
else:
|
|
log.info("recorder skipped (enabled=%s record=%s): %s", cam.enabled, cam.record, cam.id)
|
|
|
|
async def stop_all(self) -> None:
|
|
for task in self.tasks.values():
|
|
await task.stop()
|
|
|
|
def statuses(self) -> list[CameraStatus]:
|
|
return [t.status for t in self.tasks.values()]
|
|
|
|
def status(self, cam_id: str) -> CameraStatus | None:
|
|
task = self.tasks.get(cam_id)
|
|
return task.status if task else None
|
|
|
|
def log_tail(self, cam_id: str) -> list[str]:
|
|
task = self.tasks.get(cam_id)
|
|
return task.log_tail if task else []
|
|
|
|
async def restart(self, cam_id: str) -> bool:
|
|
task = self.tasks.get(cam_id)
|
|
if not task:
|
|
return False
|
|
await task.stop()
|
|
task.start()
|
|
return True
|
|
|
|
def add_camera(self, cam: Camera) -> None:
|
|
"""Создаёт задачу записи для новой камеры и запускает (если включена)."""
|
|
task = RecorderTask(cam, self.config.storage, on_status=self.on_status,
|
|
input_url=self._input_url(cam))
|
|
self.tasks[cam.id] = task
|
|
if cam.enabled and cam.record:
|
|
task.start()
|
|
log.info("recorder added: %s", cam.id)
|
|
|
|
async def remove_camera(self, cam_id: str) -> None:
|
|
task = self.tasks.pop(cam_id, None)
|
|
if task:
|
|
await task.stop()
|
|
log.info("recorder removed: %s", cam_id)
|
|
|
|
async def replace_camera(self, cam: Camera) -> None:
|
|
await self.remove_camera(cam.id)
|
|
self.add_camera(cam)
|
|
|
|
async def restart_all(self) -> None:
|
|
"""Пересоздаёт все задачи (например, после смены настроек хранилища)."""
|
|
for cam in list(self.config.cameras):
|
|
await self.replace_camera(cam)
|