Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-04 10:02:40 +01:00
Code Issues Releases Wiki Activity

Fixed: Sort episodes on the api by episode number when they air at the same time.

Browse Source
This commit is contained in:
Taloth Saldono 2016-03-06 00:41:26 +01:00
parent b598add64e
commit 9ffc0ec521
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
View File

@ -51,7 +51,7 @@ private Response GetCalendarFeed()
var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
var icalCalendar = new iCalendar();
foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
foreach (var episode in episodes)
{
var occurrence = icalCalendar.Create<Event>();
occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString();

2
src/NzbDrone.Api/Calendar/CalendarModule.cs
View File

@ -35,7 +35,7 @@ private List<EpisodeResource> GetCalendar()
var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
return resources.OrderBy(e => e.AirDateUtc).ToList();
return resources;
}
}
}

9
src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
View File

@ -79,8 +79,15 @@ protected override List<EpisodeResource> ToListResource<TModel>(IEnumerable<TMod
{
var resources = base.ToListResource(modelList);
return LoadSeries(resources);
var withSeries = LoadSeries(resources);
return withSeries.OrderByDescending(e => e.AirDateUtc.HasValue)
.ThenBy(e => e.AirDateUtc.Value)
.ThenBy(e => e.SeriesTitle)
.ThenByDescending(e => e.SeasonNumber != 0)
.ThenBy(e => e.SeasonNumber)
.ThenBy(e => e.EpisodeNumber)
.ToList();
}
public void Handle(EpisodeGrabbedEvent message)