shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "core: refactor http webclient part 14 #8529"

Browse Source 
This reverts commit 4b983162fc.
This commit is contained in:
ngosang
2020-09-21 08:02:41 +02:00
parent bfcfe855bc
commit 9d5636cc19
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Jackett.Common/Plumbing/JackettModule.cs
View File

@@ -42,10 +42,15 @@ namespace Jackett.Common.Plumbing
// Register the best web client for the platform or the override // Register the best web client for the platform or the override
switch (_runtimeSettings.ClientOverride) switch (_runtimeSettings.ClientOverride)
{ {
case "httpclientnetcore":
case "httpclient":
RegisterWebClient<HttpWebClient>(builder);
break;
case "httpclient2netcore":
case "httpclient2": case "httpclient2":
RegisterWebClient<HttpWebClient2>(builder); RegisterWebClient<HttpWebClient2>(builder);
break; break;
default: // "httpclient" default:
RegisterWebClient<HttpWebClient>(builder); RegisterWebClient<HttpWebClient>(builder);
break; break;
} }

2
src/Jackett.Server/Initialisation.cs
View File

@@ -11,7 +11,7 @@ namespace Jackett.Server
{ {
public static void ProcessSettings(RuntimeSettings runtimeSettings, Logger logger) public static void ProcessSettings(RuntimeSettings runtimeSettings, Logger logger)
{ {
if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2") if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2" && runtimeSettings.ClientOverride != "httpclientnetcore" && runtimeSettings.ClientOverride != "httpclient2netcore")
{ {
logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments"); logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments");
Environment.Exit(1); Environment.Exit(1);

11
src/Jackett.Server/Program.cs
View File

@@ -46,7 +46,16 @@ namespace Jackett.Server
optionsResult.WithParsed(options => optionsResult.WithParsed(options =>
{ {
if (string.IsNullOrEmpty(options.Client)) if (string.IsNullOrEmpty(options.Client))
options.Client = DotNetCoreUtil.IsRunningOnDotNetCore ? "httpclient2" : "httpclient"; {
if (DotNetCoreUtil.IsRunningOnDotNetCore)
{
options.Client = "httpclient2netcore";
}
else
{
options.Client = "httpclient";
}
}
Settings = options.ToRunTimeSettings(); Settings = options.ToRunTimeSettings();
consoleOptions = options; consoleOptions = options;