CubeCraft-Creations/remote-rig
11
0
Fork 0
generated from CubeCraft-Creations/Tracehound
Code Issues 9 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Dev #26

Open
overseer wants to merge 65 commits from dev into main
pull from: dev
merge into: CubeCraft-Creations:main
Conversation 0 Commits 65 Files Changed 59
+4 -2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8e6cd11d9c - Show all commits
internal/api/cameras.go
+4 -2
View File
@@ -31,7 +31,7 @@ func ListCameras(database *db.DB) http.HandlerFunc {
s.resolution, s.resolution,
s.fps, s.fps,
COALESCE(s.online, 0), COALESCE(s.online, 0),
COALESCE(s.recorded_at, c.created_at) s.recorded_at
FROM cameras c FROM cameras c
LEFT JOIN ( LEFT JOIN (
SELECT camera_id, battery_pct, video_remaining_sec, recording_state, SELECT camera_id, battery_pct, video_remaining_sec, recording_state,
@@ -52,15 +52,17 @@ func ListCameras(database *db.DB) http.HandlerFunc {
for rows.Next() { for rows.Next() {
var sl models.StatusLog var sl models.StatusLog
var c models.Camera var c models.Camera
var recordedAt sql.NullTime // NULL for a camera with no status yet
if err := rows.Scan( if err := rows.Scan(
&c.CameraID, &c.FriendlyName, &c.CameraID, &c.FriendlyName,
&sl.BatteryPct, &sl.VideoRemainingSec, &sl.BatteryPct, &sl.VideoRemainingSec,
&sl.RecordingState, &sl.Mode, &sl.Resolution, &sl.FPS, &sl.RecordingState, &sl.Mode, &sl.Resolution, &sl.FPS,
&sl.Online, &sl.RecordedAt, &sl.Online, &recordedAt,
); err != nil { ); err != nil {
log.Printf("Error scanning camera row: %v", err) log.Printf("Error scanning camera row: %v", err)
continue continue
} }
sl.RecordedAt = recordedAt.Time // zero time if no status
statuses = append(statuses, models.NewCameraStatus(c, sl)) statuses = append(statuses, models.NewCameraStatus(c, sl))
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {