generated from CubeCraft-Creations/Tracehound
Dev #26
@@ -31,7 +31,7 @@ func ListCameras(database *db.DB) http.HandlerFunc {
|
||||
s.resolution,
|
||||
s.fps,
|
||||
COALESCE(s.online, 0),
|
||||
COALESCE(s.recorded_at, c.created_at)
|
||||
s.recorded_at
|
||||
FROM cameras c
|
||||
LEFT JOIN (
|
||||
SELECT camera_id, battery_pct, video_remaining_sec, recording_state,
|
||||
@@ -52,15 +52,17 @@ func ListCameras(database *db.DB) http.HandlerFunc {
|
||||
for rows.Next() {
|
||||
var sl models.StatusLog
|
||||
var c models.Camera
|
||||
var recordedAt sql.NullTime // NULL for a camera with no status yet
|
||||
if err := rows.Scan(
|
||||
&c.CameraID, &c.FriendlyName,
|
||||
&sl.BatteryPct, &sl.VideoRemainingSec,
|
||||
&sl.RecordingState, &sl.Mode, &sl.Resolution, &sl.FPS,
|
||||
&sl.Online, &sl.RecordedAt,
|
||||
&sl.Online, &recordedAt,
|
||||
); err != nil {
|
||||
log.Printf("Error scanning camera row: %v", err)
|
||||
continue
|
||||
}
|
||||
sl.RecordedAt = recordedAt.Time // zero time if no status
|
||||
statuses = append(statuses, models.NewCameraStatus(c, sl))
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user