Merge branch 'feature/indexers' of github.com:lidarr/lidarr into feature/indexers

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs

@@ -13,7 +13,6 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
     {
         private SingleEpisodeSearchCriteria _singleEpisodeSearchCriteria;
         private AlbumSearchCriteria _singleAlbumSearchCriteria;
-        private AnimeEpisodeSearchCriteria _animeSearchCriteria;
         private NewznabCapabilities _capabilities;
 
         [SetUp]
@@ -23,7 +22,6 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             {
                  Url = "http://127.0.0.1:1234/",
                  Categories = new [] { 1, 2 },
-                 //AnimeCategories = new [] { 3, 4 },
                  ApiKey = "abcd",
             };
 
@@ -42,12 +40,6 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 
             };
 
-            _animeSearchCriteria = new AnimeEpisodeSearchCriteria()
-            {
-                SceneTitles = new List<string>() { "Monkey+Island" },
-                AbsoluteEpisodeNumber = 100
-            };
-
             _capabilities = new NewznabCapabilities();
 
             Mocker.GetMock<INewznabCapabilitiesProvider>()

src/NzbDrone.Core/Indexers/Newznab/Newznab.cs

@@ -109,6 +109,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 if (capabilities.SupportedAudioSearchParameters != null &&
                     new[] { "artist", "album" }.All(v => capabilities.SupportedAudioSearchParameters.Contains(v)))
                 {
+                    return null;
                 }
 
                 if (capabilities.SupportedTvSearchParameters != null &&