Fix status for grabbed episodes part of grouped calendar events

This commit is contained in:
Bogdan 2025-05-29 01:19:23 +03:00 committed by Mark McDowall
parent 030910babc
commit 90c4791d5f
3 changed files with 9 additions and 15 deletions

View file

@ -22,9 +22,9 @@ function createIsDownloadingSelector(episodeIds: number[]) {
return createSelector(
(state: AppState) => state.queue.details,
(details) => {
return details.items.some((item) => {
return !!(item.episodeId && episodeIds.includes(item.episodeId));
});
return details.items.some(
(item) => item.episodeId && episodeIds.includes(item.episodeId)
);
}
);
}
@ -61,10 +61,10 @@ function CalendarEventGroup({
const endTime = moment(lastEpisode.airDateUtc).add(series.runtime, 'minutes');
const seasonNumber = firstEpisode.seasonNumber;
const { allDownloaded, anyQueued, anyMonitored, allAbsoluteEpisodeNumbers } =
const { allDownloaded, anyGrabbed, anyMonitored, allAbsoluteEpisodeNumbers } =
useMemo(() => {
let files = 0;
let queued = 0;
let grabbed = 0;
let monitored = 0;
let absoluteEpisodeNumbers = 0;
@ -73,8 +73,8 @@ function CalendarEventGroup({
files++;
}
if (event.queued) {
queued++;
if (event.grabbed) {
grabbed++;
}
if (series.monitored && event.monitored) {
@ -88,13 +88,13 @@ function CalendarEventGroup({
return {
allDownloaded: files === events.length,
anyQueued: queued > 0,
anyGrabbed: grabbed > 0,
anyMonitored: monitored > 0,
allAbsoluteEpisodeNumbers: absoluteEpisodeNumbers === events.length,
};
}, [series, events]);
const anyDownloading = isDownloading || anyQueued;
const anyDownloading = isDownloading || anyGrabbed;
const statusStyle = getStatusStyle(
allDownloaded,

View file

@ -22,10 +22,6 @@ interface Episode extends ModelBase {
monitored: boolean;
grabbed?: boolean;
unverifiedSceneNumbering: boolean;
endTime?: string;
grabDate?: string;
seriesTitle?: string;
queued?: boolean;
series?: Series;
finaleType?: string;
}

View file

@ -33,8 +33,6 @@ public class EpisodeResource : RestResource
public int? SceneEpisodeNumber { get; set; }
public int? SceneSeasonNumber { get; set; }
public bool UnverifiedSceneNumbering { get; set; }
public DateTime? EndTime { get; set; }
public DateTime? GrabDate { get; set; }
public SeriesResource Series { get; set; }
public List<MediaCover> Images { get; set; }