3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webcam: make sure db values are type correct 

A previous bug in the webcam module could have set boolean
values as integers.  Make sure they are type correct when
reading webcams from the db.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-07-28 16:28:04 -04:00
parent a22033ac49
commit f487de77bc
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
moonraker/components/webcam.py
View File

@ -399,19 +399,19 @@ class WebCam:
@classmethod
def from_database(cls, server: Server, cam_data: Dict[str, Any]) -> WebCam:
webcam: Dict[str, Any] = {}
webcam["name"] = cam_data["name"]
webcam["enabled"] = cam_data.get("enabled", True)
webcam["icon"] = cam_data.get("icon", "mdiWebcam")
webcam["aspect_ratio"] = cam_data.get("aspectRatio", "4:3")
webcam["location"] = cam_data.get("location", "printer")
webcam["service"] = cam_data.get("service", "mjpegstreamer")
webcam["target_fps"] = cam_data.get("targetFps", 15)
webcam["target_fps_idle"] = cam_data.get("targetFpsIdle", 5)
webcam["stream_url"] = cam_data.get("urlStream", "")
webcam["snapshot_url"] = cam_data.get("urlSnapshot", "")
webcam["flip_horizontal"] = cam_data.get("flipX", False)
webcam["flip_vertical"] = cam_data.get("flipY", False)
webcam["rotation"] = cam_data.get("rotation", webcam.get("rotate", 0))
webcam["name"] = str(cam_data["name"])
webcam["enabled"] = bool(cam_data.get("enabled", True))
webcam["icon"] = str(cam_data.get("icon", "mdiWebcam"))
webcam["aspect_ratio"] = str(cam_data.get("aspectRatio", "4:3"))
webcam["location"] = str(cam_data.get("location", "printer"))
webcam["service"] = str(cam_data.get("service", "mjpegstreamer"))
webcam["target_fps"] = int(cam_data.get("targetFps", 15))
webcam["target_fps_idle"] = int(cam_data.get("targetFpsIdle", 5))
webcam["stream_url"] = str(cam_data.get("urlStream", ""))
webcam["snapshot_url"] = str(cam_data.get("urlSnapshot", ""))
webcam["flip_horizontal"] = bool(cam_data.get("flipX", False))
webcam["flip_vertical"] = bool(cam_data.get("flipY", False))
webcam["rotation"] = int(cam_data.get("rotation", webcam.get("rotate", 0)))
webcam["extra_data"] = cam_data.get("extra_data", {})
webcam["source"] = "database"
return cls(server, **webcam)