Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Extra new line in release restrictions causing all releases to be rejected

This commit is contained in:
Mark McDowall 2014-01-15 12:39:32 -08:00
parent 2dd7fb9fdf
commit 885872ff3a
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/NzbDrone.Core.Test/DecisionEngineTests/NotRestrictedReleaseSpecificationFixture.cs
View File

@ -16,12 +16,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
public void Setup() public void Setup()
{ {
_parseResult = new RemoteEpisode _parseResult = new RemoteEpisode
{ {
Release = new ReleaseInfo Release = new ReleaseInfo
{ {
Title = "Dexter.S08E01.EDITED.WEBRip.x264-KYR" Title = "Dexter.S08E01.EDITED.WEBRip.x264-KYR"
} }
}; };
} }
[Test] [Test]
@ -49,5 +49,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
Mocker.GetMock<IConfigService>().SetupGet(c => c.ReleaseRestrictions).Returns(restrictions); Mocker.GetMock<IConfigService>().SetupGet(c => c.ReleaseRestrictions).Returns(restrictions);
Subject.IsSatisfiedBy(_parseResult, null).Should().BeTrue(); Subject.IsSatisfiedBy(_parseResult, null).Should().BeTrue();
} }
[Test]
public void should_not_try_to_find_empty_string_as_a_match()
{
Mocker.GetMock<IConfigService>().SetupGet(c => c.ReleaseRestrictions).Returns("test\n");
Subject.IsSatisfiedBy(_parseResult, null).Should().BeTrue();
}
} }
} }

4
src/NzbDrone.Core/Configuration/ConfigService.cs
View File

@ -231,8 +231,8 @@ namespace NzbDrone.Core.Configuration
public string ReleaseRestrictions public string ReleaseRestrictions
{ {
get { return GetValue("ReleaseRestrictions", String.Empty); } get { return GetValue("ReleaseRestrictions", String.Empty).Trim('\r', '\n'); }
set { SetValue("ReleaseRestrictions", value); } set { SetValue("ReleaseRestrictions", value.Trim('\r', '\n')); }
} }
public Int32 RssSyncInterval public Int32 RssSyncInterval

2
src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
View File

@ -41,6 +41,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
foreach (var restriction in restrictions) foreach (var restriction in restrictions)
{ {
if (String.IsNullOrWhiteSpace(restriction)) continue;
if (subject.Release.Title.ToLowerInvariant().Contains(restriction.ToLowerInvariant())) if (subject.Release.Title.ToLowerInvariant().Contains(restriction.ToLowerInvariant()))
{ {
_logger.Trace("{0} is restricted: {1}", subject, restriction); _logger.Trace("{0} is restricted: {1}", subject, restriction);