mirror of
https://github.com/Sonarr/Sonarr
synced 2026-05-08 04:50:56 +02:00
Fixed queue details counter
This commit is contained in:
parent
581e118532
commit
970c0de62f
5 changed files with 11 additions and 18 deletions
|
|
@ -89,15 +89,15 @@ export function useQueueDetailsForSeries(
|
|||
return acc;
|
||||
}
|
||||
|
||||
if (seasonNumber != null && item.seasonNumber !== seasonNumber) {
|
||||
if (
|
||||
seasonNumber != null &&
|
||||
!item.seasonNumbers?.includes(seasonNumber)
|
||||
) {
|
||||
return acc;
|
||||
}
|
||||
|
||||
acc.count++;
|
||||
|
||||
if (item.episodeHasFile) {
|
||||
acc.episodesWithFiles++;
|
||||
}
|
||||
acc.count += item.episodeIds.length;
|
||||
acc.episodesWithFiles += item.episodesWithFilesCount;
|
||||
|
||||
return acc;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ function QueueContent() {
|
|||
selectedIds.every((id: number) => {
|
||||
const item = records.find((i) => i.id === id);
|
||||
|
||||
return !!(item && item.seriesId && item.episodeId);
|
||||
return !!(item && item.seriesId && item.episodeIds.length);
|
||||
})
|
||||
}
|
||||
isPending={
|
||||
|
|
|
|||
|
|
@ -154,10 +154,7 @@ function AgendaEvent(props: AgendaEventProps) {
|
|||
|
||||
{queueItem ? (
|
||||
<span className={styles.statusIcon}>
|
||||
<CalendarEventQueueDetails
|
||||
seasonNumber={seasonNumber}
|
||||
{...queueItem}
|
||||
/>
|
||||
<CalendarEventQueueDetails {...queueItem} />
|
||||
</span>
|
||||
) : null}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,7 @@ const useMissingEpisodeIdsSelector = () => {
|
|||
moment(airDateUtc).isAfter(start) &&
|
||||
moment(airDateUtc).isBefore(end) &&
|
||||
isBefore(episode.airDateUtc) &&
|
||||
!queueDetails.some(
|
||||
(details) => !!details.episode && details.episode.id === episode.id
|
||||
)
|
||||
!queueDetails.some((details) => details.episodeIds?.includes(episode.id))
|
||||
) {
|
||||
acc.push(episode.id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,15 +42,13 @@ interface Queue extends ModelBase {
|
|||
protocol: DownloadProtocol;
|
||||
downloadClient: string;
|
||||
outputPath: string;
|
||||
episodeHasFile: boolean;
|
||||
episodesWithFilesCount: number;
|
||||
seriesId?: number;
|
||||
episodeId?: number;
|
||||
episodeIds: number[];
|
||||
seasonNumber?: number;
|
||||
seasonNumbers: number[];
|
||||
downloadClientHasPostImportCategory: boolean;
|
||||
isFullSeason: boolean;
|
||||
episode?: Episode;
|
||||
episodes?: Episode[];
|
||||
}
|
||||
|
||||
export default Queue;
|
||||
|
|
|
|||
Loading…
Reference in a new issue