mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 03:52:33 +02:00
Fixed: Sort episodes on the api by episode number when they air at the same time.
This commit is contained in:
parent
b598add64e
commit
9ffc0ec521
@ -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();
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user