Backup_Repos/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-12-06 08:28:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix status for grabbed episodes part of grouped calendar events

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/Calendar/Events/CalendarEventGroup.tsx
View file

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

4
frontend/src/Episode/Episode.ts
View file

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

2
src/Sonarr.Api.V3/Episodes/EpisodeResource.cs
View file

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