self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

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

Browse Source 
This reverts commit 9ffc0ec521.
This commit is contained in:
Taloth Saldono 2016-03-11 16:53:22 +01:00
parent f2784d3ec2
commit e6ab4196de
3 changed files with 3 additions and 10 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 episodes = _episodeService.EpisodesBetweenDates(start, end, false);
var icalCalendar = new iCalendar(); var icalCalendar = new iCalendar();
foreach (var episode in episodes) foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
{ {
var occurrence = icalCalendar.Create<Event>(); var occurrence = icalCalendar.Create<Event>();
occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString(); 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)); var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
return resources; return resources.OrderBy(e => e.AirDateUtc).ToList();
} }
} }
} }

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

@ -79,15 +79,8 @@ protected override List<EpisodeResource> ToListResource<TModel>(IEnumerable<TMod
{ {
var resources = base.ToListResource(modelList); var resources = base.ToListResource(modelList);
var withSeries = LoadSeries(resources); return 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) public void Handle(EpisodeGrabbedEvent message)