From 1b00ac2e37b9c9be855921f65d71b8e69667d5f0 Mon Sep 17 00:00:00 2001 From: Don Reece Date: Fri, 4 Nov 2022 13:46:01 -0400 Subject: [PATCH 1/4] Add HDHomeRun widget - Tracking Channels, and HD Channels --- public/locales/en/common.json | 4 ++++ src/widgets/components.js | 1 + src/widgets/hdhomerun/component.jsx | 36 +++++++++++++++++++++++++++++ src/widgets/hdhomerun/widget.js | 15 ++++++++++++ src/widgets/widgets.js | 2 ++ 5 files changed, 58 insertions(+) create mode 100644 src/widgets/hdhomerun/component.jsx create mode 100644 src/widgets/hdhomerun/widget.js diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 0afa49421..05c0fe5de 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -334,5 +334,9 @@ "public_ip": "Public IP", "region": "Region", "country": "Country" + }, + "hdhomerun": { + "channels": "Channels", + "hd": "HD" } } diff --git a/src/widgets/components.js b/src/widgets/components.js index a8a06e770..b781172bf 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -11,6 +11,7 @@ const components = { emby: dynamic(() => import("./emby/component")), gluetun: dynamic(() => import("./gluetun/component")), gotify: dynamic(() => import("./gotify/component")), + hdhomerun: dynamic(() => import("./hdhomerun/component")), homebridge: dynamic(() => import("./homebridge/component")), jackett: dynamic(() => import("./jackett/component")), jellyfin: dynamic(() => import("./emby/component")), diff --git a/src/widgets/hdhomerun/component.jsx b/src/widgets/hdhomerun/component.jsx new file mode 100644 index 000000000..9af8ca33a --- /dev/null +++ b/src/widgets/hdhomerun/component.jsx @@ -0,0 +1,36 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: channelsData, error: channelsError } = useWidgetAPI(widget, "lineup.json"); + + if (channelsError) { + return ; + } + + if (!channelsData) { + return ( + + + + + ); + } + +const hdChannels = channelsData?.filter((channel) => channel.HD === 1); + + return ( + + + + + + ); +} diff --git a/src/widgets/hdhomerun/widget.js b/src/widgets/hdhomerun/widget.js new file mode 100644 index 000000000..e94198a8b --- /dev/null +++ b/src/widgets/hdhomerun/widget.js @@ -0,0 +1,15 @@ +import genericProxyHandler from "utils/proxy/handlers/generic"; +import { jsonArrayFilter } from "utils/proxy/api-helpers"; + +const widget = { + api: "{url}/{endpoint}", + proxyHandler: genericProxyHandler, + + mappings: { + "lineup.json": { + endpoint: "lineup.json", + } + }, +}; + +export default widget; diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 66e29086a..fe4328320 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -7,6 +7,7 @@ import coinmarketcap from "./coinmarketcap/widget"; import emby from "./emby/widget"; import gluetun from "./gluetun/widget"; import gotify from "./gotify/widget"; +import hdhomerun from "./hdhomerun/widget"; import homebridge from "./homebridge/widget"; import jackett from "./jackett/widget"; import jellyseerr from "./jellyseerr/widget"; @@ -49,6 +50,7 @@ const widgets = { emby, gluetun, gotify, + hdhomerun, homebridge, jackett, jellyfin: emby, From b5d5b7c552025a56feefcd100dd64494ae09ae46 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 4 Nov 2022 15:07:08 -0700 Subject: [PATCH 2/4] lint HDHomeRun widget --- src/widgets/hdhomerun/widget.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/widgets/hdhomerun/widget.js b/src/widgets/hdhomerun/widget.js index e94198a8b..18204a815 100644 --- a/src/widgets/hdhomerun/widget.js +++ b/src/widgets/hdhomerun/widget.js @@ -1,5 +1,4 @@ import genericProxyHandler from "utils/proxy/handlers/generic"; -import { jsonArrayFilter } from "utils/proxy/api-helpers"; const widget = { api: "{url}/{endpoint}", From fe4a967a155edb82938efc1272c0e1263b7cc8f4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 4 Nov 2022 15:25:48 -0700 Subject: [PATCH 3/4] rename hdhomerun lineup endpoint --- src/widgets/hdhomerun/component.jsx | 2 +- src/widgets/hdhomerun/widget.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/hdhomerun/component.jsx b/src/widgets/hdhomerun/component.jsx index 9af8ca33a..bd1fb7489 100644 --- a/src/widgets/hdhomerun/component.jsx +++ b/src/widgets/hdhomerun/component.jsx @@ -9,7 +9,7 @@ export default function Component({ service }) { const { widget } = service; - const { data: channelsData, error: channelsError } = useWidgetAPI(widget, "lineup.json"); + const { data: channelsData, error: channelsError } = useWidgetAPI(widget, "lineup"); if (channelsError) { return ; diff --git a/src/widgets/hdhomerun/widget.js b/src/widgets/hdhomerun/widget.js index 18204a815..b36b9b1cf 100644 --- a/src/widgets/hdhomerun/widget.js +++ b/src/widgets/hdhomerun/widget.js @@ -5,7 +5,7 @@ const widget = { proxyHandler: genericProxyHandler, mappings: { - "lineup.json": { + "lineup": { endpoint: "lineup.json", } }, From 3393cbcfc1c4213c0f0ba2c8125094f73f131456 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 18 Nov 2022 22:22:41 -0800 Subject: [PATCH 4/4] update to new widgets API error handling --- src/widgets/hdhomerun/component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/hdhomerun/component.jsx b/src/widgets/hdhomerun/component.jsx index bd1fb7489..0ec917960 100644 --- a/src/widgets/hdhomerun/component.jsx +++ b/src/widgets/hdhomerun/component.jsx @@ -12,7 +12,7 @@ export default function Component({ service }) { const { data: channelsData, error: channelsError } = useWidgetAPI(widget, "lineup"); if (channelsError) { - return ; + return ; } if (!channelsData) {