From 0c326b7ccc92d4099f31451311aa89479214e5d6 Mon Sep 17 00:00:00 2001 From: OwsleyJr Date: Wed, 23 Jul 2025 20:19:12 -0400 Subject: [PATCH] fix: add download progress for deleted badge fix: check if not processing first for movies --- server/lib/scanners/baseScanner.ts | 13 +++---- src/components/StatusBadge/index.tsx | 58 +++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/server/lib/scanners/baseScanner.ts b/server/lib/scanners/baseScanner.ts index 5cf03f1a2..d837da272 100644 --- a/server/lib/scanners/baseScanner.ts +++ b/server/lib/scanners/baseScanner.ts @@ -110,13 +110,12 @@ class BaseScanner { if (existing) { let changedExisting = false; - if ( - existing[is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE && - existing[is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED - ) { - existing[is4k ? 'status4k' : 'status'] = processing - ? MediaStatus.PROCESSING - : MediaStatus.AVAILABLE; + if (existing[is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE) { + existing[is4k ? 'status4k' : 'status'] = !processing + ? MediaStatus.AVAILABLE + : existing[is4k ? 'status4k' : 'status'] === MediaStatus.DELETED + ? MediaStatus.DELETED + : MediaStatus.PROCESSING; if (mediaAddedAt) { existing.mediaAddedAt = mediaAddedAt; } diff --git a/src/components/StatusBadge/index.tsx b/src/components/StatusBadge/index.tsx index e86d07f9e..45d56f027 100644 --- a/src/components/StatusBadge/index.tsx +++ b/src/components/StatusBadge/index.tsx @@ -139,7 +139,11 @@ const StatusBadge = ({
- - {intl.formatMessage(is4k ? messages.status4k : messages.status, { - status: intl.formatMessage(globalMessages.deleted), - })} + + + {inProgress && badgeDownloadProgress} +
+ + {intl.formatMessage( + is4k ? messages.status4k : messages.status, + { + status: inProgress + ? intl.formatMessage(globalMessages.processing) + : intl.formatMessage(globalMessages.deleted), + } + )} + + {inProgress && ( + <> + {mediaType === 'tv' && downloadItem[0].episode && ( + + {intl.formatMessage(messages.seasonepisodenumber, { + seasonNumber: downloadItem[0].episode.seasonNumber, + episodeNumber: downloadItem[0].episode.episodeNumber, + })} + + )} + + + )} +
);