core: refactor http webclient part 14 #8529

Remove old http webclients references
Jackett · Sep 19, 2020 · 4b98316 · 4b98316
1 parent 4d63fa8
commit 4b98316
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs
@@ -42,15 +42,10 @@ protected override void Load(ContainerBuilder builder)
             // Register the best web client for the platform or the override
             switch (_runtimeSettings.ClientOverride)
             {
-                case "httpclientnetcore":
-                case "httpclient":
-                    RegisterWebClient<HttpWebClient>(builder);
-                    break;
-                case "httpclient2netcore":
                 case "httpclient2":
                     RegisterWebClient<HttpWebClient2>(builder);
                     break;
-                default:
+                default: // "httpclient"
                     RegisterWebClient<HttpWebClient>(builder);
                     break;
             }

diff --git a/src/Jackett.Server/Initialisation.cs b/src/Jackett.Server/Initialisation.cs
@@ -11,7 +11,7 @@ public static class Initialisation
     {
         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
@@ -46,16 +46,7 @@ public static void Main(string[] args)
             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;