From 1286466669963e1956721404fe3db6f7884580db Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:02:57 -0700 Subject: [PATCH] Use Radarr wanted logic See https://github.com/Radarr/Radarr/blob/9b3770a018a2fd9f6a5af71930bbb2a2180c2cce/frontend/src/Store/Actions/movieActions.js#L67 --- src/widgets/radarr/component.jsx | 2 +- src/widgets/radarr/widget.js | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/widgets/radarr/component.jsx b/src/widgets/radarr/component.jsx index 4b16f75f2..9a95f1b7a 100644 --- a/src/widgets/radarr/component.jsx +++ b/src/widgets/radarr/component.jsx @@ -30,7 +30,7 @@ export default function Component({ service }) { - + ); } diff --git a/src/widgets/radarr/widget.js b/src/widgets/radarr/widget.js index d57f1b18d..7bc492c7e 100644 --- a/src/widgets/radarr/widget.js +++ b/src/widgets/radarr/widget.js @@ -1,18 +1,6 @@ import genericProxyHandler from "utils/proxy/handlers/generic"; import { jsonArrayFilter } from "utils/proxy/api-helpers"; -function isAvailable(item) { - // isAvailable means that a digital image exists - // E.g. it's available to stream or on DVD, etc - if (item.isAvailable === false) { - return false; - } - - // sizeOnDisk is how much of that digital image you currently have - // movieFile.size is how large the requested digital image is - return item.sizeOnDisk === item.movieFile?.size; -} - const widget = { api: "{url}/api/v3/{endpoint}?apikey={key}", proxyHandler: genericProxyHandler, @@ -21,8 +9,8 @@ const widget = { movie: { endpoint: "movie", map: (data) => ({ - wanted: jsonArrayFilter(data, (item) => !isAvailable(item)).length, - have: jsonArrayFilter(data, (item) => isAvailable(item)).length, + wanted: jsonArrayFilter(data, (item) => item.monitored && !item.hasFile && item.isAvailable).length, + all: jsonArrayFilter(data, (item) => item.isAvailable).length, }), }, "queue/status": {