mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
add httpClient to appropriate constructors
This commit is contained in:
parent
eb4b705167
commit
d8cb34dbbc
@ -71,7 +71,7 @@ namespace MediaBrowser.Api.Playback
|
|||||||
protected IMediaSourceManager MediaSourceManager { get; private set; }
|
protected IMediaSourceManager MediaSourceManager { get; private set; }
|
||||||
protected IJsonSerializer JsonSerializer { get; private set; }
|
protected IJsonSerializer JsonSerializer { get; private set; }
|
||||||
|
|
||||||
public static IHttpClient HttpClient;
|
public static IHttpClient HttpClient { get; private set; }
|
||||||
protected IAuthorizationContext AuthorizationContext { get; private set; }
|
protected IAuthorizationContext AuthorizationContext { get; private set; }
|
||||||
|
|
||||||
protected EncodingHelper EncodingHelper { get; set; }
|
protected EncodingHelper EncodingHelper { get; set; }
|
||||||
@ -80,6 +80,7 @@ namespace MediaBrowser.Api.Playback
|
|||||||
/// Initializes a new instance of the <see cref="BaseStreamingService" /> class.
|
/// Initializes a new instance of the <see cref="BaseStreamingService" /> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected BaseStreamingService(
|
protected BaseStreamingService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -93,6 +94,7 @@ namespace MediaBrowser.Api.Playback
|
|||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext)
|
IAuthorizationContext authorizationContext)
|
||||||
{
|
{
|
||||||
|
HttpClient = httpClient;
|
||||||
ServerConfigurationManager = serverConfig;
|
ServerConfigurationManager = serverConfig;
|
||||||
UserManager = userManager;
|
UserManager = userManager;
|
||||||
LibraryManager = libraryManager;
|
LibraryManager = libraryManager;
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Devices;
|
using MediaBrowser.Controller.Devices;
|
||||||
using MediaBrowser.Controller.Dlna;
|
using MediaBrowser.Controller.Dlna;
|
||||||
@ -33,6 +34,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||||||
public class AudioService : BaseProgressiveStreamingService
|
public class AudioService : BaseProgressiveStreamingService
|
||||||
{
|
{
|
||||||
public AudioService(
|
public AudioService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -46,7 +48,8 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext,
|
IAuthorizationContext authorizationContext,
|
||||||
IEnvironmentInfo environmentInfo)
|
IEnvironmentInfo environmentInfo)
|
||||||
: base(serverConfig,
|
: base(httpClient,
|
||||||
|
serverConfig,
|
||||||
userManager,
|
userManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
isoManager,
|
isoManager,
|
||||||
|
@ -28,6 +28,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||||||
protected readonly IEnvironmentInfo EnvironmentInfo;
|
protected readonly IEnvironmentInfo EnvironmentInfo;
|
||||||
|
|
||||||
public BaseProgressiveStreamingService(
|
public BaseProgressiveStreamingService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -41,7 +42,8 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext,
|
IAuthorizationContext authorizationContext,
|
||||||
IEnvironmentInfo environmentInfo)
|
IEnvironmentInfo environmentInfo)
|
||||||
: base(serverConfig,
|
: base(httpClient,
|
||||||
|
serverConfig,
|
||||||
userManager,
|
userManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
isoManager,
|
isoManager,
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Devices;
|
using MediaBrowser.Controller.Devices;
|
||||||
using MediaBrowser.Controller.Dlna;
|
using MediaBrowser.Controller.Dlna;
|
||||||
@ -69,6 +70,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||||||
public class VideoService : BaseProgressiveStreamingService
|
public class VideoService : BaseProgressiveStreamingService
|
||||||
{
|
{
|
||||||
public VideoService(
|
public VideoService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -82,7 +84,8 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext,
|
IAuthorizationContext authorizationContext,
|
||||||
IEnvironmentInfo environmentInfo)
|
IEnvironmentInfo environmentInfo)
|
||||||
: base(serverConfig,
|
: base(httpClient,
|
||||||
|
serverConfig,
|
||||||
userManager,
|
userManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
isoManager,
|
isoManager,
|
||||||
|
@ -77,6 +77,7 @@ namespace MediaBrowser.Api.Playback
|
|||||||
public class UniversalAudioService : BaseApiService
|
public class UniversalAudioService : BaseApiService
|
||||||
{
|
{
|
||||||
public UniversalAudioService(
|
public UniversalAudioService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -95,6 +96,7 @@ namespace MediaBrowser.Api.Playback
|
|||||||
IEnvironmentInfo environmentInfo,
|
IEnvironmentInfo environmentInfo,
|
||||||
ILoggerFactory loggerFactory)
|
ILoggerFactory loggerFactory)
|
||||||
{
|
{
|
||||||
|
HttpClient = httpClient;
|
||||||
ServerConfigurationManager = serverConfigurationManager;
|
ServerConfigurationManager = serverConfigurationManager;
|
||||||
UserManager = userManager;
|
UserManager = userManager;
|
||||||
LibraryManager = libraryManager;
|
LibraryManager = libraryManager;
|
||||||
@ -115,6 +117,7 @@ namespace MediaBrowser.Api.Playback
|
|||||||
_logger = loggerFactory.CreateLogger(nameof(UniversalAudioService));
|
_logger = loggerFactory.CreateLogger(nameof(UniversalAudioService));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected IHttpClient HttpClient { get; private set; }
|
||||||
protected IServerConfigurationManager ServerConfigurationManager { get; private set; }
|
protected IServerConfigurationManager ServerConfigurationManager { get; private set; }
|
||||||
protected IUserManager UserManager { get; private set; }
|
protected IUserManager UserManager { get; private set; }
|
||||||
protected ILibraryManager LibraryManager { get; private set; }
|
protected ILibraryManager LibraryManager { get; private set; }
|
||||||
@ -323,7 +326,8 @@ namespace MediaBrowser.Api.Playback
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var service = new AudioService(ServerConfigurationManager,
|
var service = new AudioService(HttpClient,
|
||||||
|
ServerConfigurationManager,
|
||||||
UserManager,
|
UserManager,
|
||||||
LibraryManager,
|
LibraryManager,
|
||||||
IsoManager,
|
IsoManager,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user