mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Never allow empty episode formats to be saved

This commit is contained in:
Mark McDowall 2013-11-22 09:17:04 -08:00
parent c90d010cd8
commit 767586304a
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Api/Config/NamingModule.cs
View File

@ -37,12 +37,8 @@ namespace NzbDrone.Api.Config
Get["/samples"] = x => GetExamples(this.Bind<NamingConfigResource>()); Get["/samples"] = x => GetExamples(this.Bind<NamingConfigResource>());
SharedValidator.RuleFor(c => c.MultiEpisodeStyle).InclusiveBetween(0, 3); SharedValidator.RuleFor(c => c.MultiEpisodeStyle).InclusiveBetween(0, 3);
SharedValidator.RuleFor(c => c.StandardEpisodeFormat).ValidEpisodeFormat();
SharedValidator.When(spec => spec.RenameEpisodes, () => SharedValidator.RuleFor(c => c.DailyEpisodeFormat).ValidDailyEpisodeFormat();
{
SharedValidator.RuleFor(c => c.StandardEpisodeFormat).ValidEpisodeFormat();
SharedValidator.RuleFor(c => c.DailyEpisodeFormat).ValidDailyEpisodeFormat();
});
} }
private void UpdateNamingConfig(NamingConfigResource resource) private void UpdateNamingConfig(NamingConfigResource resource)

6
src/NzbDrone.Integration.Test/NamingConfigTests.cs
View File

@ -81,10 +81,8 @@ namespace NzbDrone.Integration.Test
config.StandardEpisodeFormat = ""; config.StandardEpisodeFormat = "";
config.DailyEpisodeFormat = ""; config.DailyEpisodeFormat = "";
var result = NamingConfig.Put(config); var errors = NamingConfig.InvalidPut(config);
result.RenameEpisodes.Should().BeFalse(); errors.Should().NotBeEmpty();
result.StandardEpisodeFormat.Should().Be(config.StandardEpisodeFormat);
result.DailyEpisodeFormat.Should().Be(config.DailyEpisodeFormat);
} }
[Test] [Test]