From edce56f36311767f9bff3f1944ea1f0d929ab0e0 Mon Sep 17 00:00:00 2001 From: Diego Heras Date: Tue, 22 Dec 2020 18:37:16 +0100 Subject: [PATCH] core: remove unused cli argument -j (ProxyConnection). resolves #9467 (#10608) --- README.md | 3 --- src/Jackett.Common/Models/Config/ConsoleOptions.cs | 7 ------- src/Jackett.Common/Models/Config/RuntimeSettings.cs | 2 -- src/Jackett.Server/Initialisation.cs | 3 --- 4 files changed, 15 deletions(-) diff --git a/README.md b/README.md index 4e5bb7e11..f123a2bf0 100644 --- a/README.md +++ b/README.md @@ -737,9 +737,6 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a - `-c, --UseClient` Override web client selection. [automatic(Default)/httpclient/httpclient2] -- `-j, --ProxyConnection` use proxy - e.g. 127.0.0.1:8888 - - - `-x, --ListenPublic` Listen publicly - `-z, --ListenPrivate` Only allow local access diff --git a/src/Jackett.Common/Models/Config/ConsoleOptions.cs b/src/Jackett.Common/Models/Config/ConsoleOptions.cs index f6d295377..275af63f2 100644 --- a/src/Jackett.Common/Models/Config/ConsoleOptions.cs +++ b/src/Jackett.Common/Models/Config/ConsoleOptions.cs @@ -23,9 +23,6 @@ namespace Jackett.Common.Models.Config [Option('c', "UseClient", HelpText = "Override web client selection. [automatic(Default)/httpclient/httpclient2]")] public string Client { get; set; } - [Option('j', "ProxyConnection", HelpText = "use proxy - e.g. 127.0.0.1:8888")] - public string ProxyConnection { get; set; } - [Option('s', "Start", HelpText = "Start the Jacket Windows service (Must be admin)")] public bool StartService { get; set; } @@ -82,10 +79,6 @@ namespace Jackett.Common.Models.Config if (options.Client != null) runtimeSettings.ClientOverride = options.Client.ToLowerInvariant(); - // Use Proxy - if (options.ProxyConnection != null) - runtimeSettings.ProxyConnection = options.ProxyConnection.ToLowerInvariant(); - // Ignore SSL errors on Curl runtimeSettings.IgnoreSslErrors = options.IgnoreSslErrors; diff --git a/src/Jackett.Common/Models/Config/RuntimeSettings.cs b/src/Jackett.Common/Models/Config/RuntimeSettings.cs index 00e9dfd0f..c74dca4f3 100644 --- a/src/Jackett.Common/Models/Config/RuntimeSettings.cs +++ b/src/Jackett.Common/Models/Config/RuntimeSettings.cs @@ -11,8 +11,6 @@ namespace Jackett.Common.Models.Config public string ClientOverride { get; set; } - public string ProxyConnection { get; set; } - public bool? IgnoreSslErrors { get; set; } public string CustomDataFolder { get; set; } diff --git a/src/Jackett.Server/Initialisation.cs b/src/Jackett.Server/Initialisation.cs index 64f3c2ab1..71262919d 100644 --- a/src/Jackett.Server/Initialisation.cs +++ b/src/Jackett.Server/Initialisation.cs @@ -28,9 +28,6 @@ namespace Jackett.Server if (!string.IsNullOrWhiteSpace(runtimeSettings.CustomDataFolder)) logger.Info("Jackett Data will be stored in: " + runtimeSettings.CustomDataFolder); - - if (runtimeSettings.ProxyConnection != null) - logger.Info("Proxy enabled: " + runtimeSettings.ProxyConnection); } public static void ProcessWindowsSpecificArgs(ConsoleOptions consoleOptions, IProcessService processService, ServerConfig serverConfig, Logger logger)