From 363048e68edf3a0b0fc7d8eebbde045f9ff5c7f0 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 16 Feb 2017 13:29:21 -0500 Subject: [PATCH] Roll back some code on Net Import (#772) --- .../CouchPotato/CouchPotatoImport.cs | 20 ++++++++++++++++++- .../NetImport/RSSImport/RSSImport.cs | 6 +++--- .../NetImport/StevenLu/StevenLuImport.cs | 4 ++-- .../NetImport/TMDb/TMDbImport.cs | 6 +++--- .../NetImport/Trakt/TraktImport.cs | 4 ++-- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs index 18cc850bf..969b927db 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs @@ -16,13 +16,31 @@ namespace NzbDrone.Core.NetImport.CouchPotato public class CouchPotatoImport : HttpNetImportBase { public override string Name => "CouchPotato"; - public override bool Enabled => false; + public override bool Enabled => true; public override bool EnableAuto => false; public CouchPotatoImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, configService, parsingService, logger) { } + /*public new virtual IEnumerable DefaultDefinitions + { + get + { + var config = (CouchPotatoSettings)new CouchPotatoSettings(); + config.Link = "http://localhost"; + config.Port = "5050"; + + yield return new NetImportDefinition + { + Name = "Localhost", + Enabled = config.Validate().IsValid && Enabled, + Implementation = GetType().Name, + Settings = config + }; + } + }*/ + public override INetImportRequestGenerator GetRequestGenerator() { return new CouchPotatoRequestGenerator() { Settings = Settings }; diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs index cb675271d..d7d9dde09 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs @@ -15,9 +15,9 @@ namespace NzbDrone.Core.NetImport.RSSImport { public class RSSImport : HttpNetImportBase { - public override string Name => "RSS"; - public override bool Enabled => false; - public override bool EnableAuto => false; + public override string Name => "RSSList"; + public override bool Enabled => true; + public override bool EnableAuto => true; public RSSImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, configService, parsingService, logger) diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs index 86179fd82..95c1d9b9e 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs @@ -16,8 +16,8 @@ namespace NzbDrone.Core.NetImport.StevenLu public class StevenLuImport : HttpNetImportBase { public override string Name => "StevenLu"; - public override bool Enabled => false; - public override bool EnableAuto => false; + public override bool Enabled => true; + public override bool EnableAuto => true; public StevenLuImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, configService, parsingService, logger) diff --git a/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs b/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs index 14f484e79..d7a20303c 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs @@ -8,8 +8,8 @@ namespace NzbDrone.Core.NetImport.TMDb { public class TMDbImport : HttpNetImportBase { - public override string Name => "TMDb"; - public override bool Enabled => false; + public override string Name => "TMDb Lists"; + public override bool Enabled => true; public override bool EnableAuto => false; private readonly IHttpClient _httpClient; private readonly Logger _logger; @@ -37,4 +37,4 @@ namespace NzbDrone.Core.NetImport.TMDb return new TMDbParser(Settings); } } -} +} \ No newline at end of file diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs index a879927d7..2add8de16 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs @@ -15,8 +15,8 @@ namespace NzbDrone.Core.NetImport.Trakt { public class TraktImport : HttpNetImportBase { - public override string Name => "Trakt"; - public override bool Enabled => false; + public override string Name => "Trakt List"; + public override bool Enabled => true; public override bool EnableAuto => false; public TraktImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)