diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts index 2571b01..6be0959 100644 --- a/frontend/src/types/index.ts +++ b/frontend/src/types/index.ts @@ -111,7 +111,7 @@ export enum LiveStreamStatus { } export type LiveStreamProgress = Record \ No newline at end of file diff --git a/frontend/src/views/Livestream.tsx b/frontend/src/views/Livestream.tsx index e6577d5..4a7f026 100644 --- a/frontend/src/views/Livestream.tsx +++ b/frontend/src/views/Livestream.tsx @@ -101,17 +101,17 @@ const LiveStreamMonitorView: React.FC = () => { > {k} - {mapStatusToChip(progress[k].Status)} + {mapStatusToChip(progress[k].status)} - {progress[k].Status === LiveStreamStatus.WAITING - ? formatMicro(Number(progress[k].WaitTime)) + {progress[k].status === LiveStreamStatus.WAITING + ? formatMicro(Number(progress[k].waitTime)) : "-" } - {progress[k].Status === LiveStreamStatus.WAITING - ? new Date(progress[k].LiveDate).toLocaleString() + {progress[k].status === LiveStreamStatus.WAITING + ? new Date(progress[k].liveDate).toLocaleString() : "-" } diff --git a/server/internal/livestream/monitor.go b/server/internal/livestream/monitor.go index e995f1a..1007e6c 100644 --- a/server/internal/livestream/monitor.go +++ b/server/internal/livestream/monitor.go @@ -5,7 +5,6 @@ import ( "log/slog" "os" "path/filepath" - "time" "github.com/marcopeocchi/yt-dlp-web-ui/server/config" "github.com/marcopeocchi/yt-dlp-web-ui/server/internal" @@ -63,11 +62,7 @@ func (m *Monitor) Status() LiveStreamStatus { // continue // } - status[k] = struct { - Status int - WaitTime time.Duration - LiveDate time.Time - }{ + status[k] = Status{ Status: v.status, WaitTime: v.waitTime, LiveDate: v.liveDate, diff --git a/server/internal/livestream/status.go b/server/internal/livestream/status.go index 86d8f8c..d4331e5 100644 --- a/server/internal/livestream/status.go +++ b/server/internal/livestream/status.go @@ -5,7 +5,7 @@ import "time" type LiveStreamStatus = map[string]Status type Status = struct { - Status int - WaitTime time.Duration - LiveDate time.Time + Status int `json:"status"` + WaitTime time.Duration `json:"waitTime"` + LiveDate time.Time `json:"liveDate"` }