mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-10 07:40:34 +02:00
Merge pull request #3118 from barronpm/fix-regressions
Fix regressions introduced by #3098
This commit is contained in:
commit
cb249cc171
|
@ -21,7 +21,7 @@ namespace MediaBrowser.Api
|
||||||
public abstract class BaseApiService : IService, IRequiresRequest
|
public abstract class BaseApiService : IService, IRequiresRequest
|
||||||
{
|
{
|
||||||
public BaseApiService(
|
public BaseApiService(
|
||||||
ILogger logger,
|
ILogger<BaseApiService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory)
|
IHttpResultFactory httpResultFactory)
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@ namespace MediaBrowser.Api
|
||||||
/// Gets the logger.
|
/// Gets the logger.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The logger.</value>
|
/// <value>The logger.</value>
|
||||||
protected ILogger Logger { get; }
|
protected ILogger<BaseApiService> Logger { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the server configuration manager.
|
/// Gets or sets the server configuration manager.
|
||||||
|
|
|
@ -319,11 +319,14 @@ namespace MediaBrowser.Api.Library
|
||||||
private readonly ILocalizationManager _localization;
|
private readonly ILocalizationManager _localization;
|
||||||
private readonly ILibraryMonitor _libraryMonitor;
|
private readonly ILibraryMonitor _libraryMonitor;
|
||||||
|
|
||||||
|
private readonly ILogger<MoviesService> _moviesServiceLogger;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="LibraryService" /> class.
|
/// Initializes a new instance of the <see cref="LibraryService" /> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public LibraryService(
|
public LibraryService(
|
||||||
ILogger<LibraryService> logger,
|
ILogger<LibraryService> logger,
|
||||||
|
ILogger<MoviesService> moviesServiceLogger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IProviderManager providerManager,
|
IProviderManager providerManager,
|
||||||
|
@ -344,6 +347,7 @@ namespace MediaBrowser.Api.Library
|
||||||
_activityManager = activityManager;
|
_activityManager = activityManager;
|
||||||
_localization = localization;
|
_localization = localization;
|
||||||
_libraryMonitor = libraryMonitor;
|
_libraryMonitor = libraryMonitor;
|
||||||
|
_moviesServiceLogger = moviesServiceLogger;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string[] GetRepresentativeItemTypes(string contentType)
|
private string[] GetRepresentativeItemTypes(string contentType)
|
||||||
|
@ -543,7 +547,7 @@ namespace MediaBrowser.Api.Library
|
||||||
if (item is Movie || (program != null && program.IsMovie) || item is Trailer)
|
if (item is Movie || (program != null && program.IsMovie) || item is Trailer)
|
||||||
{
|
{
|
||||||
return new MoviesService(
|
return new MoviesService(
|
||||||
Logger,
|
_moviesServiceLogger,
|
||||||
ServerConfigurationManager,
|
ServerConfigurationManager,
|
||||||
ResultFactory,
|
ResultFactory,
|
||||||
_userManager,
|
_userManager,
|
||||||
|
|
|
@ -82,7 +82,7 @@ namespace MediaBrowser.Api.Movies
|
||||||
/// Initializes a new instance of the <see cref="MoviesService" /> class.
|
/// Initializes a new instance of the <see cref="MoviesService" /> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public MoviesService(
|
public MoviesService(
|
||||||
ILogger logger,
|
ILogger<MoviesService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
|
|
|
@ -81,7 +81,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(
|
||||||
ILogger logger,
|
ILogger<BaseStreamingService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
public abstract class BaseHlsService : BaseStreamingService
|
public abstract class BaseHlsService : BaseStreamingService
|
||||||
{
|
{
|
||||||
public BaseHlsService(
|
public BaseHlsService(
|
||||||
ILogger logger,
|
ILogger<BaseHlsService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
|
|
|
@ -94,7 +94,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
public class DynamicHlsService : BaseHlsService
|
public class DynamicHlsService : BaseHlsService
|
||||||
{
|
{
|
||||||
public DynamicHlsService(
|
public DynamicHlsService(
|
||||||
ILogger logger,
|
ILogger<DynamicHlsService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
|
|
|
@ -79,7 +79,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
private readonly IAuthorizationContext _authContext;
|
private readonly IAuthorizationContext _authContext;
|
||||||
|
|
||||||
public MediaInfoService(
|
public MediaInfoService(
|
||||||
ILogger logger,
|
ILogger<MediaInfoService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IMediaSourceManager mediaSourceManager,
|
IMediaSourceManager mediaSourceManager,
|
||||||
|
|
|
@ -33,7 +33,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||||
public class AudioService : BaseProgressiveStreamingService
|
public class AudioService : BaseProgressiveStreamingService
|
||||||
{
|
{
|
||||||
public AudioService(
|
public AudioService(
|
||||||
ILogger logger,
|
ILogger<AudioService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IHttpClient httpClient,
|
IHttpClient httpClient,
|
||||||
|
|
|
@ -28,7 +28,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||||
protected IHttpClient HttpClient { get; private set; }
|
protected IHttpClient HttpClient { get; private set; }
|
||||||
|
|
||||||
public BaseProgressiveStreamingService(
|
public BaseProgressiveStreamingService(
|
||||||
ILogger logger,
|
ILogger<BaseProgressiveStreamingService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IHttpClient httpClient,
|
IHttpClient httpClient,
|
||||||
|
|
|
@ -75,9 +75,11 @@ namespace MediaBrowser.Api.Playback
|
||||||
public class UniversalAudioService : BaseApiService
|
public class UniversalAudioService : BaseApiService
|
||||||
{
|
{
|
||||||
private readonly EncodingHelper _encodingHelper;
|
private readonly EncodingHelper _encodingHelper;
|
||||||
|
private readonly ILoggerFactory _loggerFactory;
|
||||||
|
|
||||||
public UniversalAudioService(
|
public UniversalAudioService(
|
||||||
ILogger<UniversalAudioService> logger,
|
ILogger<UniversalAudioService> logger,
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IHttpClient httpClient,
|
IHttpClient httpClient,
|
||||||
|
@ -108,6 +110,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
AuthorizationContext = authorizationContext;
|
AuthorizationContext = authorizationContext;
|
||||||
NetworkManager = networkManager;
|
NetworkManager = networkManager;
|
||||||
_encodingHelper = encodingHelper;
|
_encodingHelper = encodingHelper;
|
||||||
|
_loggerFactory = loggerFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected IHttpClient HttpClient { get; private set; }
|
protected IHttpClient HttpClient { get; private set; }
|
||||||
|
@ -233,7 +236,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
AuthorizationContext.GetAuthorizationInfo(Request).DeviceId = request.DeviceId;
|
AuthorizationContext.GetAuthorizationInfo(Request).DeviceId = request.DeviceId;
|
||||||
|
|
||||||
var mediaInfoService = new MediaInfoService(
|
var mediaInfoService = new MediaInfoService(
|
||||||
Logger,
|
_loggerFactory.CreateLogger<MediaInfoService>(),
|
||||||
ServerConfigurationManager,
|
ServerConfigurationManager,
|
||||||
ResultFactory,
|
ResultFactory,
|
||||||
MediaSourceManager,
|
MediaSourceManager,
|
||||||
|
@ -277,7 +280,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
|
if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var service = new DynamicHlsService(
|
var service = new DynamicHlsService(
|
||||||
Logger,
|
_loggerFactory.CreateLogger<DynamicHlsService>(),
|
||||||
ServerConfigurationManager,
|
ServerConfigurationManager,
|
||||||
ResultFactory,
|
ResultFactory,
|
||||||
UserManager,
|
UserManager,
|
||||||
|
@ -331,7 +334,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var service = new AudioService(
|
var service = new AudioService(
|
||||||
Logger,
|
_loggerFactory.CreateLogger<AudioService>(),
|
||||||
ServerConfigurationManager,
|
ServerConfigurationManager,
|
||||||
ResultFactory,
|
ResultFactory,
|
||||||
HttpClient,
|
HttpClient,
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace MediaBrowser.Api.UserLibrary
|
||||||
public class ArtistsService : BaseItemsByNameService<MusicArtist>
|
public class ArtistsService : BaseItemsByNameService<MusicArtist>
|
||||||
{
|
{
|
||||||
public ArtistsService(
|
public ArtistsService(
|
||||||
ILogger<GenresService> logger,
|
ILogger<ArtistsService> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
|
|
|
@ -28,7 +28,7 @@ namespace MediaBrowser.Api.UserLibrary
|
||||||
/// <param name="userDataRepository">The user data repository.</param>
|
/// <param name="userDataRepository">The user data repository.</param>
|
||||||
/// <param name="dtoService">The dto service.</param>
|
/// <param name="dtoService">The dto service.</param>
|
||||||
protected BaseItemsByNameService(
|
protected BaseItemsByNameService(
|
||||||
ILogger logger,
|
ILogger<BaseItemsByNameService<TItemType>> logger,
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
IHttpResultFactory httpResultFactory,
|
IHttpResultFactory httpResultFactory,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
|
|
Loading…
Reference in a new issue