platypush/platypush
platypush
/
platypush
2
2
Fork 4
Code Issues 47 Pull Requests Packages Projects 4 Releases Wiki Activity

Refactored camera stream route

This commit is contained in:
Fabio Manganiello 2022-03-28 12:44:04 +02:00
parent 128b45686a
commit 5ee47902f4
Signed by: blacklight
GPG Key ID: D90FBA7F76362774
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
platypush/backend/http/app/routes/plugins/camera/__init__.py
View File

@ -1,7 +1,8 @@
import json import json
from typing import Optional from typing import Optional
from flask import Response, Blueprint, request from flask import Blueprint, request
from flask.wrappers import Response
from platypush.backend.http.app import template_folder from platypush.backend.http.app import template_folder
from platypush.backend.http.app.utils import authenticate from platypush.backend.http.app.utils import authenticate
@ -17,19 +18,22 @@ __routes__ = [
def get_camera(plugin: str) -> CameraPlugin: def get_camera(plugin: str) -> CameraPlugin:
return get_plugin('camera.' + plugin) plugin_name = f'camera.{plugin}'
p = get_plugin(plugin_name)
assert p, f'No such plugin: {plugin_name}'
return p
def get_frame(session: Camera, timeout: Optional[float] = None) -> bytes: def get_frame(session: Camera, timeout: Optional[float] = None) -> Optional[bytes]:
with session.stream.ready: if session.stream:
session.stream.ready.wait(timeout=timeout) with session.stream.ready:
return session.stream.frame session.stream.ready.wait(timeout=timeout)
return session.stream.frame
def feed(plugin: str, **kwargs): def feed(camera: CameraPlugin, **kwargs):
plugin = get_camera(plugin) with camera.open(**kwargs) as session:
with plugin.open(stream=True, **kwargs) as session: camera.start_camera(session)
plugin.start_camera(session)
while True: while True:
frame = get_frame(session, timeout=5.0) frame = get_frame(session, timeout=5.0)
if frame: if frame:
@ -77,8 +81,12 @@ def get_photo(plugin, extension):
@authenticate() @authenticate()
def get_video(plugin, extension): def get_video(plugin, extension):
stream_class = StreamWriter.get_class_by_name(extension) stream_class = StreamWriter.get_class_by_name(extension)
return Response(feed(plugin, stream_format=extension, frames_dir=None, **get_args(request.args)), camera = get_camera(plugin)
mimetype=stream_class.mimetype) return Response(
feed(camera, stream=True, stream_format=extension, frames_dir=None,
**get_args(request.args)
), mimetype=stream_class.mimetype
)
@camera.route('/camera/<plugin>/photo', methods=['GET']) @camera.route('/camera/<plugin>/photo', methods=['GET'])