diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs index 93c40a802..e4cbc1054 100644 --- a/src/Jackett.Common/Plumbing/JackettModule.cs +++ b/src/Jackett.Common/Plumbing/JackettModule.cs @@ -42,15 +42,10 @@ namespace Jackett.Common.Plumbing // Register the best web client for the platform or the override switch (_runtimeSettings.ClientOverride) { - case "httpclientnetcore": - case "httpclient": - RegisterWebClient(builder); - break; - case "httpclient2netcore": case "httpclient2": RegisterWebClient(builder); break; - default: + default: // "httpclient" RegisterWebClient(builder); break; } diff --git a/src/Jackett.Server/Initialisation.cs b/src/Jackett.Server/Initialisation.cs index ed26c080d..63d2cf6c6 100644 --- a/src/Jackett.Server/Initialisation.cs +++ b/src/Jackett.Server/Initialisation.cs @@ -11,7 +11,7 @@ namespace Jackett.Server { public static void ProcessSettings(RuntimeSettings runtimeSettings, Logger logger) { - if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2" && runtimeSettings.ClientOverride != "httpclientnetcore" && runtimeSettings.ClientOverride != "httpclient2netcore") + if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2") { logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments"); Environment.Exit(1); diff --git a/src/Jackett.Server/Program.cs b/src/Jackett.Server/Program.cs index c94d0ec98..4e44e7282 100644 --- a/src/Jackett.Server/Program.cs +++ b/src/Jackett.Server/Program.cs @@ -46,16 +46,7 @@ namespace Jackett.Server optionsResult.WithParsed(options => { if (string.IsNullOrEmpty(options.Client)) - { - if (DotNetCoreUtil.IsRunningOnDotNetCore) - { - options.Client = "httpclient2netcore"; - } - else - { - options.Client = "httpclient"; - } - } + options.Client = DotNetCoreUtil.IsRunningOnDotNetCore ? "httpclient2" : "httpclient"; Settings = options.ToRunTimeSettings(); consoleOptions = options;