From ad26e48408ecfc1c7f64531d8d0ea33c4e424b4c Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Sun, 22 Jan 2017 14:03:09 +0100 Subject: [PATCH] Fix up presets. --- .../NetImport/CouchPotato/CouchPotatoImport.cs | 4 ++-- src/NzbDrone.Core/NetImport/NetImportBase.cs | 2 +- src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs | 9 +-------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs index c4a0b4dd3..e56d351ec 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Core.NetImport.CouchPotato : base(httpClient, configService, parsingService, logger) { } - public new virtual IEnumerable DefaultDefinitions + /*public new virtual IEnumerable DefaultDefinitions { get { @@ -38,7 +38,7 @@ namespace NzbDrone.Core.NetImport.CouchPotato Settings = config }; } - } + }*/ public override INetImportRequestGenerator GetRequestGenerator() { diff --git a/src/NzbDrone.Core/NetImport/NetImportBase.cs b/src/NzbDrone.Core/NetImport/NetImportBase.cs index 165cd7375..164da2572 100644 --- a/src/NzbDrone.Core/NetImport/NetImportBase.cs +++ b/src/NzbDrone.Core/NetImport/NetImportBase.cs @@ -43,7 +43,7 @@ namespace NzbDrone.Core.NetImport yield return new NetImportDefinition { - Name = GetType().Name, + Name = this.Name, Enabled = config.Validate().IsValid && Enabled, Implementation = GetType().Name, Settings = config diff --git a/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs b/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs index 2d37d55ba..44b58e34d 100644 --- a/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs +++ b/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs @@ -68,16 +68,9 @@ namespace NzbDrone.Core.ThingiProvider { var provider = _providers.First(v => v.GetType().Name == providerDefinition.Implementation); - var defs = provider.DefaultDefinitions.OfType(); - - foreach (var def in defs) - { - _logger.Debug(def); - } - var definitions = provider.DefaultDefinitions .OfType() - .Where(v => v.Name != null && v.Name != provider.GetType().Name) + .Where(v => v.Name != null && v.Name != provider.Name) .ToList(); return definitions;