Fixed: Saving IndexerSettings into DB which confuses the datamapper.

Fixes #2945

src/NzbDrone.Core.Test/DecisionEngineTests/Search/TorrentSeedingSpecificationFixture.cs

@@ -33,9 +33,18 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.Search
                     IndexerId = 1,
                     Title = "Series.Title.S01.720p.BluRay.X264-RlsGrp",
                     Seeders = 0,
-                    IndexerSettings = new TorrentRssIndexerSettings {MinimumSeeders = 5}
+                    //IndexerSettings = new TorrentRssIndexerSettings {MinimumSeeders = 5}
                 }
             };
+
+            _indexerDefinition = new IndexerDefinition
+            {
+                Settings = new TorrentRssIndexerSettings { MinimumSeeders = 5 }
+            };
+
+            Mocker.GetMock<IIndexerFactory>()
+                .Setup(v => v.Get(1))
+                .Returns(_indexerDefinition);
         }
 
         private void GivenReleaseSeeders(int? seeders)
@@ -56,7 +65,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.Search
         }
 
         // These tests are not needed anymore, since indexer settings are saved on the release itself!
-        /*
+
         [Test]
         public void should_return_true_if_indexer_not_specified()
         {
@@ -73,7 +82,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.Search
                   .Callback<int>(i => { throw new ModelNotFoundException(typeof(IndexerDefinition), i); });
 
             Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
-        }*/
+        }
 
         [Test]
         public void should_return_true_if_seeds_unknown()

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithReleaseInfoFixture.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Rarbg;
+using NzbDrone.Core.Indexers.TorrentRss;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Augmenters;
 using NzbDrone.Core.Parser.Model;
@@ -13,15 +15,31 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
     [TestFixture]
     public class AugmentWithReleaseInfoFixture : AugmentMovieInfoFixture<AugmentWithReleaseInfo>
     {
+        private IndexerDefinition _indexerDefinition;
+
+        [SetUp]
+        public void Setup()
+        {
+
+        }
+
         private ReleaseInfo ReleaseInfoWithLanguages(params Language[] languages)
         {
-            return new ReleaseInfo
+            _indexerDefinition = new IndexerDefinition
             {
-                IndexerSettings = new RarbgSettings
+                Settings = new RarbgSettings { MultiLanguages = languages.ToList().Select(l => (int) l) }
+            };
+
+            Mocker.GetMock<IIndexerFactory>()
+                .Setup(v => v.Get(1))
+                .Returns(_indexerDefinition);
+
+            return new ReleaseInfo
             {
-                    MultiLanguages = languages.ToList().Select(l => (int) l)
+                IndexerId = 1
-                }
             };
+
+
         }
 
         [Test]

src/NzbDrone.Core/DecisionEngine/Specifications/RequiredIndexerFlagsSpecification.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Datastore;
@@ -25,24 +26,33 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
         {
             var torrentInfo = subject.Release;
 
-            if (torrentInfo == null || torrentInfo.IndexerSettings == null)
+
+            IIndexerSettings indexerSettings = null;
+            try {
+                indexerSettings = _indexerFactory.Get(subject.Release.IndexerId)?.Settings as IIndexerSettings;
+            }
+            catch (Exception e)
             {
-                return Decision.Accept();
+                _logger.Debug("Indexer with id {0} does not exist, skipping required indexer flags specs.", subject.Release.IndexerId);
             }
 
-            var torrentIndexerSettings = torrentInfo.IndexerSettings as ITorrentIndexerSettings;
+            if (torrentInfo == null || indexerSettings == null)
+            {
+                return Decision.Accept();
+            }
 
-            if (torrentIndexerSettings != null)
+            if (indexerSettings is ITorrentIndexerSettings torrentIndexerSettings)
             {
                 var requiredFlags = torrentIndexerSettings.RequiredFlags;
                 var requiredFlag = (IndexerFlags) 0;
 
-                if (requiredFlags == null || requiredFlags.Count() == 0)
+                var enumerable = requiredFlags.ToList();
+                if (requiredFlags == null || !enumerable.Any())
                 {
                     return Decision.Accept();
                 }
 
-                foreach (var flag in requiredFlags)
+                foreach (var flag in enumerable)
                 {
                     if (torrentInfo.IndexerFlags.HasFlag((IndexerFlags)flag))
                     {

src/NzbDrone.Core/DecisionEngine/Specifications/TorrentSeedingSpecification.cs

@@ -1,3 +1,4 @@
+using System;
 using NLog;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Indexers;
@@ -24,14 +25,22 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
         {
             var torrentInfo = subject.Release as TorrentInfo;
 
-            if (torrentInfo == null || torrentInfo.IndexerSettings == null)
+            IIndexerSettings indexerSettings = null;
+            try {
+                indexerSettings = _indexerFactory.Get(subject.Release.IndexerId)?.Settings as IIndexerSettings;
+            }
+            catch (Exception e)
             {
-                return Decision.Accept();
+                _logger.Debug("Indexer with id {0} does not exist, skipping minimum seeder checks.", subject.Release.IndexerId);
             }
 
-            var torrentIndexerSettings = torrentInfo.IndexerSettings as ITorrentIndexerSettings;
 
-            if (torrentIndexerSettings != null)
+            if (torrentInfo == null || indexerSettings == null)
+            {
+                return Decision.Accept();
+            }
+
+            if (indexerSettings is ITorrentIndexerSettings torrentIndexerSettings)
             {
                 var minimumSeeders = torrentIndexerSettings.MinimumSeeders;
 

src/NzbDrone.Core/Indexers/IndexerBase.cs

@@ -69,7 +69,6 @@ namespace NzbDrone.Core.Indexers
             {
                 c.IndexerId = Definition.Id;
                 c.Indexer = Definition.Name;
-                c.IndexerSettings = Definition.Settings as IIndexerSettings;
                 c.DownloadProtocol = Protocol;
             });
 

src/NzbDrone.Core/Indexers/IndexerFactory.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Composition;
@@ -84,5 +85,7 @@ namespace NzbDrone.Core.Indexers
                 yield return indexer;
             }
         }
+
+
     }
 }

src/NzbDrone.Core/Parser/Augmenters/AugmentWithHistory.cs

@@ -40,8 +40,8 @@ namespace NzbDrone.Core.Parser.Augmenters
 
                 if (int.TryParse(history.Data.GetValueOrDefault("indexerId"), out var indexerId))
                 {
-                    var indexerSettings = _indexerFactory.Get(indexerId).Settings as IIndexerSettings;
+                    //var indexerSettings = _indexerFactory.Get(indexerId).Settings as IIndexerSettings;
-                    releaseInfo.IndexerSettings = indexerSettings;
+                    releaseInfo.IndexerId = indexerId;
                 }
 
                 if (int.TryParse(history.Data.GetValueOrDefault("size"), out var size))

src/NzbDrone.Core/Parser/Augmenters/AugmentWithReleaseInfo.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Parser.Augmenters
@@ -8,6 +9,13 @@ namespace NzbDrone.Core.Parser.Augmenters
     public class AugmentWithReleaseInfo : IAugmentParsedMovieInfo
 
     {
+        private readonly IIndexerFactory _indexerFactory;
+
+        public AugmentWithReleaseInfo(IIndexerFactory indexerFactory)
+        {
+            _indexerFactory = indexerFactory;
+        }
+
         public Type HelperType
         {
             get
@@ -18,17 +26,23 @@ namespace NzbDrone.Core.Parser.Augmenters
 
         public ParsedMovieInfo AugmentMovieInfo(ParsedMovieInfo movieInfo, object helper)
         {
-            var releaseInfo = helper as ReleaseInfo;
+            if (helper is ReleaseInfo releaseInfo)
+            {
 
-            if (releaseInfo != null)
+                IIndexerSettings indexerSettings = null;
+                try {
+                    indexerSettings = _indexerFactory.Get(releaseInfo.IndexerId)?.Settings as IIndexerSettings;
+                }
+                catch (Exception e)
                 {
-                // First, let's augment the language!
+                    //_logger.Debug("Indexer with id {0} does not exist, skipping minimum seeder checks.", subject.Release.IndexerId);
+                }                // First, let's augment the language!
                 var languageTitle = movieInfo.SimpleReleaseTitle;
                 if (movieInfo.MovieTitle.IsNotNullOrWhiteSpace())
                 {
-                    if (languageTitle.ToLower().Contains("multi") && releaseInfo?.IndexerSettings?.MultiLanguages?.Any() == true)
+                    if (languageTitle.ToLower().Contains("multi") && indexerSettings?.MultiLanguages?.Any() == true)
                     {
-                        foreach (var i in releaseInfo.IndexerSettings.MultiLanguages)
+                        foreach (var i in indexerSettings.MultiLanguages)
                         {
                             var language = (Language) i;
                             if (!movieInfo.Languages.Contains(language))

src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs

@@ -13,7 +13,6 @@ namespace NzbDrone.Core.Parser.Model
         public string InfoUrl { get; set; }
         public string CommentUrl { get; set; }
         public int IndexerId { get; set; }
-        public IIndexerSettings IndexerSettings { get; set; }
         public string Indexer { get; set; }
         public DownloadProtocol DownloadProtocol { get; set; }
         public int TvdbId { get; set; }