diff --git a/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs b/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs index 2b689c8..79db127 100644 --- a/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/ActorImageProvider.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Providers; #if __EMBY__ -using MediaBrowser.Common.Net; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Configuration; @@ -17,11 +16,9 @@ namespace Jellyfin.Plugin.JavTube.Providers; public class ActorImageProvider : BaseProvider, IRemoteImageProvider, IHasOrder { #if __EMBY__ - public ActorImageProvider(IHttpClient httpClient, ILogManager logManager) : - base(httpClient, logManager.CreateLogger()) + public ActorImageProvider(ILogManager logManager) : base(logManager.CreateLogger()) #else - public ActorImageProvider(IHttpClientFactory httpClientFactory, ILogger logger) : base( - httpClientFactory, logger) + public ActorImageProvider( ILogger logger) : base(logger) #endif { } diff --git a/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs b/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs index 4abef83..51a8d50 100644 --- a/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/ActorProvider.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Providers; #if __EMBY__ -using MediaBrowser.Common.Net; using MediaBrowser.Model.Logging; #else @@ -16,12 +15,9 @@ namespace Jellyfin.Plugin.JavTube.Providers; public class ActorProvider : BaseProvider, IRemoteMetadataProvider, IHasOrder { #if __EMBY__ - public ActorProvider(IHttpClient httpClient, ILogManager logManager) : base( - httpClient, - logManager.CreateLogger()) + public ActorProvider(ILogManager logManager) : base(logManager.CreateLogger()) #else - public ActorProvider(IHttpClientFactory httpClientFactory, ILogger logger) : base( - httpClientFactory, logger) + public ActorProvider(ILogger logger) : base(logger) #endif { } diff --git a/Jellyfin.Plugin.JavTube/Providers/BaseProvider.cs b/Jellyfin.Plugin.JavTube/Providers/BaseProvider.cs index 8919f97..30e4238 100644 --- a/Jellyfin.Plugin.JavTube/Providers/BaseProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/BaseProvider.cs @@ -2,7 +2,6 @@ using Jellyfin.Plugin.JavTube.Configuration; #if __EMBY__ using MediaBrowser.Common.Net; using MediaBrowser.Model.Logging; -using HttpRequestOptions = MediaBrowser.Common.Net.HttpRequestOptions; #else using Microsoft.Extensions.Logging; @@ -14,24 +13,14 @@ namespace Jellyfin.Plugin.JavTube.Providers; public abstract class BaseProvider { protected readonly ILogger Logger; - protected static PluginConfiguration Configuration => Plugin.Instance.Configuration; -#if __EMBY__ - private readonly IHttpClient _httpClient; - - protected BaseProvider(IHttpClient httpClient, ILogger logger) + protected BaseProvider(ILogger logger) { - _httpClient = httpClient; -#else - private readonly IHttpClientFactory _httpClientFactory; - - protected BaseProvider(IHttpClientFactory httpClientFactory, ILogger logger) - { - _httpClientFactory = httpClientFactory; -#endif Logger = logger; } + protected static PluginConfiguration Configuration => Plugin.Instance.Configuration; + public virtual int Order => 1; public virtual string Name => Plugin.Instance.Name; @@ -43,26 +32,6 @@ public abstract class BaseProvider #endif { Logger.Debug("GetImageResponse for url: {0}", url); - return GetAsync(url, cancellationToken); + return ApiClient.GetImageResponse(url, cancellationToken); } - -#if __EMBY__ - private async Task GetAsync(string url, CancellationToken cancellationToken) - { - return await _httpClient.GetResponse(new HttpRequestOptions - { - Url = url, - CancellationToken = cancellationToken, - UserAgent = Plugin.Instance.UserAgent - }).ConfigureAwait(false); - } -#else - private async Task GetAsync(string url, CancellationToken cancellationToken) - { - var httpClient = _httpClientFactory.CreateClient(Name); - httpClient.DefaultRequestHeaders - .Add("User-Agent", Plugin.Instance.UserAgent); - return await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false); - } -#endif } \ No newline at end of file diff --git a/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs b/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs index 7cd7bdb..e525e96 100644 --- a/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/MovieImageProvider.cs @@ -5,7 +5,6 @@ using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Providers; #if __EMBY__ -using MediaBrowser.Common.Net; using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Logging; @@ -18,12 +17,9 @@ namespace Jellyfin.Plugin.JavTube.Providers; public class MovieImageProvider : BaseProvider, IRemoteImageProvider, IHasOrder { #if __EMBY__ - public MovieImageProvider(IHttpClient httpClient, ILogManager logManager) : base( - httpClient, - logManager.CreateLogger()) + public MovieImageProvider(ILogManager logManager) : base(logManager.CreateLogger()) #else - public MovieImageProvider(IHttpClientFactory httpClientFactory, ILogger logger) : base( - httpClientFactory, logger) + public MovieImageProvider(ILogger logger) : base(logger) #endif { } diff --git a/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs b/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs index 556978e..60657d2 100644 --- a/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs +++ b/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs @@ -8,7 +8,6 @@ using MediaBrowser.Model.Entities; using MediaBrowser.Model.Providers; using MovieInfo = MediaBrowser.Controller.Providers.MovieInfo; #if __EMBY__ -using MediaBrowser.Common.Net; using MediaBrowser.Model.Logging; #else @@ -23,11 +22,9 @@ public class MovieProvider : BaseProvider, IRemoteMetadataProvider()) + public MovieProvider(ILogManager logManager) : base(logManager.CreateLogger()) #else - public MovieProvider(IHttpClientFactory httpClientFactory, ILogger logger) : base( - httpClientFactory, logger) + public MovieProvider(ILogger logger) : base(logger) #endif { }