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

Move HttpWebClientNetCore to Jackett.Common

Browse Source
This commit is contained in:
flightlevel
2018-08-31 20:04:36 +10:00
parent 50a09189e4
commit 9e78f46010
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ namespace Jackett.Common.Plumbing
switch (_runtimeSettings.ClientOverride) switch (_runtimeSettings.ClientOverride)
{ {
case "httpclientnetcore": case "httpclientnetcore":
// do nothing, registered by the netcore app RegisterWebClient<HttpWebClientNetCore>(builder);
break; break;
case "httpclient": case "httpclient":
RegisterWebClient<HttpWebClient>(builder); RegisterWebClient<HttpWebClient>(builder);

0
src/Jackett.Server/HttpWebClientNetCore.cs → src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
View File

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

@@ -47,7 +47,6 @@ namespace Jackett.Server
{ {
if (string.IsNullOrEmpty(options.Client)) if (string.IsNullOrEmpty(options.Client))
{ {
//TODO: Remove libcurl once off owin
bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("Core", StringComparison.OrdinalIgnoreCase) >= 0; bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("Core", StringComparison.OrdinalIgnoreCase) >= 0;
if (runningOnDotNetCore) if (runningOnDotNetCore)

3
src/Jackett.Server/Startup.cs
View File

@@ -3,7 +3,6 @@ using Autofac.Extensions.DependencyInjection;
using Jackett.Common.Models.Config; using Jackett.Common.Models.Config;
using Jackett.Common.Plumbing; using Jackett.Common.Plumbing;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using Jackett.Common.Utils.Clients;
using Jackett.Server.Middleware; using Jackett.Server.Middleware;
using Jackett.Server.Services; using Jackett.Server.Services;
using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.Cookies;
@@ -84,8 +83,6 @@ namespace Jackett.Server
builder.RegisterType<ServerService>().As<IServerService>(); builder.RegisterType<ServerService>().As<IServerService>();
builder.RegisterType<ProtectionService>().As<IProtectionService>(); builder.RegisterType<ProtectionService>().As<IProtectionService>();
builder.RegisterType<ServiceConfigService>().As<IServiceConfigService>(); builder.RegisterType<ServiceConfigService>().As<IServiceConfigService>();
if (runtimeSettings.ClientOverride == "httpclientnetcore")
builder.RegisterType<HttpWebClientNetCore>().As<WebClient>();
IContainer container = builder.Build(); IContainer container = builder.Build();
Helper.ApplicationContainer = container; Helper.ApplicationContainer = container;