Fixed: All preferred words being added to filename

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -328,6 +328,7 @@
     <Compile Include="Profiles\Metadata\MetadataProfileRepositoryFixture.cs" />
     <Compile Include="Profiles\Qualities\QualityIndexCompareToFixture.cs" />
     <Compile Include="Profiles\Releases\PreferredWordService\CalculateFixture.cs" />
+    <Compile Include="Profiles\Releases\PreferredWordService\GetMatchingPreferredWordsFixture.cs" />
     <Compile Include="Qualities\RevisionComparableFixture.cs" />
     <Compile Include="QueueTests\QueueServiceFixture.cs" />
     <Compile Include="RemotePathMappingsTests\RemotePathMappingServiceFixture.cs" />

src/NzbDrone.Core.Test/Profiles/Releases/PreferredWordService/GetMatchingPreferredWordsFixture.cs

@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Profiles.Releases;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Music;
+
+namespace NzbDrone.Core.Test.Profiles.Releases.PreferredWordService
+{
+    [TestFixture]
+    public class GetMatchingPreferredWordsFixture : CoreTest<Core.Profiles.Releases.PreferredWordService>
+    {
+        private Artist _artist = null;
+        private List<ReleaseProfile> _releaseProfiles = null;
+        private string _title = "Artist.Name-Album.Name-2018-Flac-Vinyl-Lidarr";
+
+        [SetUp]
+        public void Setup()
+        {
+            _artist = Builder<Artist>.CreateNew()
+                                     .With(s => s.Tags = new HashSet<int>(new[] { 1, 2 }))
+                                     .Build();
+
+            _releaseProfiles = new List<ReleaseProfile>();
+
+            _releaseProfiles.Add(new ReleaseProfile
+            {
+                Preferred = new List<KeyValuePair<string, int>>
+                                                 {
+                                                     new KeyValuePair<string, int>("Vinyl", 5),
+                                                     new KeyValuePair<string, int>("CD", -10)
+                                                 }
+            });
+
+
+            Mocker.GetMock<ITermMatcherService>()
+                  .Setup(s => s.MatchingTerm(It.IsAny<string>(), _title))
+                  .Returns<string, string>((term, title) => title.Contains(term) ? term : null);
+        }
+
+
+        private void GivenReleaseProfile()
+        {
+            Mocker.GetMock<IReleaseProfileService>()
+                  .Setup(s => s.AllForTags(It.IsAny<HashSet<int>>()))
+                  .Returns(_releaseProfiles);
+        }
+
+        [Test]
+        public void should_return_empty_list_when_there_are_no_release_profiles()
+        {
+            Mocker.GetMock<IReleaseProfileService>()
+                  .Setup(s => s.AllForTags(It.IsAny<HashSet<int>>()))
+                  .Returns(new List<ReleaseProfile>());
+
+            Subject.GetMatchingPreferredWords(_artist, _title).Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_return_empty_list_when_there_are_no_matching_preferred_words()
+        {
+            _releaseProfiles.First().Preferred.RemoveAt(0);
+            GivenReleaseProfile();
+
+            Subject.GetMatchingPreferredWords(_artist, _title).Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_return_list_of_matching_terms()
+        {
+            GivenReleaseProfile();
+
+            Subject.GetMatchingPreferredWords(_artist, _title).Should().Contain(new[] { "Vinyl" });
+        }
+    }
+}

src/NzbDrone.Core/Profiles/Releases/TermMatchers/CaseInsensitiveTermMatcher.cs

@@ -16,7 +16,12 @@ namespace NzbDrone.Core.Profiles.Releases.TermMatchers
 
         public string MatchingTerm(string value)
         {
-            return _term;
+            if (value.ToLowerInvariant().Contains(_term))
+            {
+                return _term;
+            }
+
+            return null;
         }
     }
 }