From 51aa6fdf130d868c60f3ce39152ab3abe10a03ac Mon Sep 17 00:00:00 2001
From: flightlevel <flightlevel@users.noreply.github.com>
Date: Sat, 14 Jul 2018 14:44:23 +1000
Subject: [PATCH] Deprecate libcurl

---
 src/Jackett.Common/Plumbing/JackettModule.cs | 17 +----------------
 src/Jackett.Console/Program.cs               |  8 ++++++++
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs
index 2a405182c..bbf6883d3 100644
--- a/src/Jackett.Common/Plumbing/JackettModule.cs
+++ b/src/Jackett.Common/Plumbing/JackettModule.cs
@@ -62,24 +62,9 @@ namespace Jackett.Common.Plumbing
                 case "httpclient2":
                     RegisterWebClient<HttpWebClient2>(builder);
                     break;
-                case "safecurl":
-                    RegisterWebClient<UnixSafeCurlWebClient>(builder);
-                    break;
-                case "libcurl":
-                    RegisterWebClient<UnixLibCurlWebClient>(builder);
-                    break;
-                case "automatic":
                 default:
-                    if (System.Environment.OSVersion.Platform != PlatformID.Unix)
-                    {
-                        RegisterWebClient<HttpWebClient>(builder);
-                        break;
-                    }
                     var usehttpclient = DetectMonoCompatabilityWithHttpClient();
-                    if (usehttpclient)
-                        RegisterWebClient<HttpWebClient>(builder);
-                    else
-                        RegisterWebClient<UnixLibCurlWebClient>(builder);
+                    RegisterWebClient<HttpWebClient>(builder);
                     break;
             }
         }
diff --git a/src/Jackett.Console/Program.cs b/src/Jackett.Console/Program.cs
index 92a2b2b9a..2f618f393 100644
--- a/src/Jackett.Console/Program.cs
+++ b/src/Jackett.Console/Program.cs
@@ -65,6 +65,14 @@ namespace Jackett.Console
                         Engine.Logger.Info("Jackett Data will be stored in: " + runtimeSettings.CustomDataFolder);
                     }
 
+                    if(!string.IsNullOrEmpty(runtimeSettings.ClientOverride))
+                    {
+                        if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2" && runtimeSettings.ClientOverride != "httpclientnetcore")
+                        {
+                            Engine.Logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments");
+                            Environment.Exit(1);
+                        }
+                    }
 
                     // Use Proxy
                     if (options.ProxyConnection != null)