mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-01-03 22:04:43 +00:00
Code Issues Releases Wiki Activity

Fixed: Don't collapse episode titles when episode titles contain Part x only

Browse source
This commit is contained in:
Mark McDowall 2016-02-16 21:28:32 -08:00
parent cb43888496
commit f0ca2bc11e
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EpisodeTitleCollapseFixture.cs
View file

@ -97,5 +97,17 @@ public void should_not_collapse_episode_titles_when_episode_titles_are_not_the_s
Subject.BuildFileName(new List<Episode> { _episode1, _episode2 }, _series, _episodeFile) Subject.BuildFileName(new List<Episode> { _episode1, _episode2 }, _series, _episodeFile)
.Should().Be("South Park - S15E06-E07 - Hello + World"); .Should().Be("South Park - S15E06-E07 - Hello + World");
} }
[Test]
public void should_not_collaspe_when_result_is_empty()
{
_namingConfig.StandardEpisodeFormat = "{Episode Title}";
_episode1.Title = "Part 1";
_episode2.Title = "Part 2";
Subject.BuildFileName(new List<Episode> { _episode1, _episode2 }, _series, _episodeFile)
.Should().Be("Part 1 + Part 2");
}
} }
} }

15
src/NzbDrone.Core/Organizer/FileNameBuilder.cs
View file

@ -684,10 +684,17 @@ private string GetEpisodeTitle(List<Episode> episodes, string separator)
return episodes.First().Title.TrimEnd(EpisodeTitleTrimCharacters); return episodes.First().Title.TrimEnd(EpisodeTitleTrimCharacters);
} }
var titles = episodes var titles = episodes.Select(c => c.Title.TrimEnd(EpisodeTitleTrimCharacters))
.Select(c => c.Title.TrimEnd(EpisodeTitleTrimCharacters)) .Select(CleanupEpisodeTitle)
.Select(CleanupEpisodeTitle) .Distinct()
.Distinct(); .ToList();
if (titles.All(t => t.IsNullOrWhiteSpace()))
{
titles = episodes.Select(c => c.Title.TrimEnd(EpisodeTitleTrimCharacters))
.Distinct()
.ToList();
}
return string.Join(separator, titles); return string.Join(separator, titles);
} }