Simplify sonarr / radarr queues, better handle some errors

This commit is contained in:
shamoon 2023-06-05 22:21:26 -07:00
parent 5b3d1cc6e0
commit dd4ee44302
8 changed files with 64 additions and 116 deletions

View file

@ -5,9 +5,12 @@ import QueueEntry from "../../components/widgets/queue/queueEntry";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import BlockList from "components/services/widget/block-list";
import useWidgetAPI from "utils/proxy/use-widget-api";
function getProgress(sizeLeft, size) {
return sizeLeft === 0 ? 100 : (1 - sizeLeft / size) * 100
}
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
@ -16,7 +19,6 @@ export default function Component({ service }) {
const { data: queuedData, error: queuedError } = useWidgetAPI(widget, "queue/status");
const { data: queueDetailsData, error: queueDetailsError } = useWidgetAPI(widget, "queue/details");
// information taken from the Radarr docs: https://radarr.video/docs/api/
const formatDownloadState = useCallback((downloadState) => {
switch (downloadState) {
case "importPending":
@ -33,26 +35,19 @@ export default function Component({ service }) {
return <Container service={service} error={finalError} />;
}
const enableQueue = widget?.enableQueue;
if (!moviesData || !queuedData || !queueDetailsData) {
return (
<>
<Container service={service}>
<Block label="radarr.wanted" />
<Block label="radarr.missing" />
<Block label="radarr.queued" />
<Block label="radarr.movies" />
</Container>
{ enableQueue &&
<Container service={service}>
<BlockList label="radarr.queued" />
</Container>
}
</>
<Container service={service}>
<Block label="radarr.wanted" />
<Block label="radarr.missing" />
<Block label="radarr.queued" />
<Block label="radarr.movies" />
</Container>
);
}
const enableQueue = widget?.enableQueue && Array.isArray(queueDetailsData) && queueDetailsData.length > 0;
return (
<>
<Container service={service}>
@ -61,21 +56,16 @@ export default function Component({ service }) {
<Block label="radarr.queued" value={t("common.number", { value: queuedData.totalCount })} />
<Block label="radarr.movies" value={t("common.number", { value: moviesData.have })} />
</Container>
{ enableQueue &&
<Container service={service}>
<BlockList label="radarr.queue" childHeight={24}>
{Array.isArray(queueDetailsData) ? queueDetailsData.map((queueEntry) => (
<QueueEntry
progress={(1 - queueEntry.sizeLeft / queueEntry.size) * 100}
status={queueEntry.status}
timeLeft={queueEntry.timeLeft}
title={moviesData.all.find((entry) => entry.id === queueEntry.movieId)?.title}
activity={formatDownloadState(queueEntry.trackedDownloadState)}
key={queueEntry.movieId}
/>
)) : undefined}
</BlockList>
</Container>
{enableQueue &&
queueDetailsData.map((queueEntry) => (
<QueueEntry
progress={getProgress(queueEntry.sizeLeft, queueEntry.size)}
timeLeft={queueEntry.timeLeft}
title={moviesData.all.find((entry) => entry.id === queueEntry.movieId)?.title ?? t("radarr.unknown")}
activity={formatDownloadState(queueEntry.trackedDownloadState)}
key={`${queueEntry.movieId}-${queueEntry.sizeLeft}`}
/>
))
}
</>
);

View file

@ -29,7 +29,7 @@ const widget = {
timeLeft: entry.timeleft,
size: entry.size,
sizeLeft: entry.sizeleft,
movieId: entry.movieId,
movieId: entry.movieId ?? entry.id,
status: entry.status
})).sort((a, b) => {
const downloadingA = a.trackedDownloadState === "downloading"