sosokker/HomieCare
1
0
Fork 0
mirror of https://github.com/Sosokker/HomieCare.git synced 2025-12-19 02:04:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused conifg

Browse Source
This commit is contained in:
sosokker 2024-05-14 01:03:33 +07:00
parent a99f316604
commit 7c8029635a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
StreamServer/src/config.py
View File

@ -23,7 +23,6 @@ MINIO_ENDPOINT = config('MINIO_ENDPOINT')
MINIO_ACCESS_KEY = config('MINIO_ACCESS_KEY') MINIO_ACCESS_KEY = config('MINIO_ACCESS_KEY')
MINIO_SECRET_KEY = config('MINIO_SECRET_KEY') MINIO_SECRET_KEY = config('MINIO_SECRET_KEY')
VIDEO_BUCKET = config('VIDEO_BUCKET') VIDEO_BUCKET = config('VIDEO_BUCKET')
TEMP_VIDEO_FILE = config('TEMP_VIDEO_FILE')
CONFIG_FILE = config('CONFIG_FILE') CONFIG_FILE = config('CONFIG_FILE')
YOLO_WEIGHT_FILE = config('YOLO_WEIGHT_FILE') YOLO_WEIGHT_FILE = config('YOLO_WEIGHT_FILE')
SPPE_WEIGHT_FILE = config('SPPE_WEIGHT_FILE') SPPE_WEIGHT_FILE = config('SPPE_WEIGHT_FILE')

8
StreamServer/src/routers/video.py
View File

@ -16,7 +16,7 @@ from fastapi.responses import StreamingResponse
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.jobstores.memory import MemoryJobStore from apscheduler.jobstores.memory import MemoryJobStore
from database import minio_client from database import minio_client
from config import TEMP_VIDEO_FILE, VIDEO_BUCKET, LINE_NOTIFY_TOKEN from config import VIDEO_BUCKET, LINE_NOTIFY_TOKEN
from scheme import Camera from scheme import Camera
from utils import save_to_config, read_cameras_from_config from utils import save_to_config, read_cameras_from_config
from models import ActionData from models import ActionData
@ -142,6 +142,7 @@ def check_falldown_action():
@router.post("/add", response_model=dict) @router.post("/add", response_model=dict)
async def add_camera(link: str): async def add_camera(link: str):
"""Add a new camera to the system."""
if link: if link:
id = generate_camera_id() id = generate_camera_id()
camera = Camera(camera_id=id, link=link, status=False) camera = Camera(camera_id=id, link=link, status=False)
@ -154,11 +155,13 @@ async def add_camera(link: str):
@router.get("/list", response_model=list[Camera]) @router.get("/list", response_model=list[Camera])
async def list_cameras() -> list[Camera]: async def list_cameras() -> list[Camera]:
"""List all available cameras."""
return cameras return cameras
@router.get("/stream/{camera_id}") @router.get("/stream/{camera_id}")
async def stream_video(camera_id: int) -> StreamingResponse: async def stream_video(camera_id: int) -> StreamingResponse:
"""Stream video from the camera with the given camera_id."""
camera = next((c for c in cameras if c.camera_id == camera_id), None) camera = next((c for c in cameras if c.camera_id == camera_id), None)
if not camera: if not camera:
raise HTTPException(status_code=404, detail="Camera not found") raise HTTPException(status_code=404, detail="Camera not found")
@ -185,6 +188,7 @@ async def stream_video(camera_id: int) -> StreamingResponse:
@router.get("/stream/action/{camera_id}") @router.get("/stream/action/{camera_id}")
async def stream_action_video(camera_id: int) -> StreamingResponse: async def stream_action_video(camera_id: int) -> StreamingResponse:
"""Stream video from the camera with the given camera_id with action model."""
camera = next((c for c in cameras if c.camera_id == camera_id), None) camera = next((c for c in cameras if c.camera_id == camera_id), None)
if not camera: if not camera:
raise HTTPException(status_code=404, detail="Camera not found") raise HTTPException(status_code=404, detail="Camera not found")
@ -201,6 +205,7 @@ async def stream_action_video(camera_id: int) -> StreamingResponse:
@router.delete("/remove/{camera_id}", response_model=dict) @router.delete("/remove/{camera_id}", response_model=dict)
async def disconnect_camera(camera_id: int) -> dict: async def disconnect_camera(camera_id: int) -> dict:
"""Disconnect the camera with the given camera_id."""
global video_writer global video_writer
for camera in cameras: for camera in cameras:
if camera.camera_id == camera_id: if camera.camera_id == camera_id:
@ -212,6 +217,7 @@ async def disconnect_camera(camera_id: int) -> dict:
@router.websocket("/ws/{camera_id}") @router.websocket("/ws/{camera_id}")
async def websocket_endpoint(camera_id: int, websocket: WebSocket): async def websocket_endpoint(camera_id: int, websocket: WebSocket):
"""Stream video from the camera with the given camera_id using WebSocket."""
camera = next((c for c in cameras if c.camera_id == camera_id), None) camera = next((c for c in cameras if c.camera_id == camera_id), None)
if not camera: if not camera:
await websocket.close(code=1000) await websocket.close(code=1000)