michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3425 from crobibero/revert-baseitem-logger

Browse Source 
Revert ILoggerFactory usage in BaseItem.cs
This commit is contained in:
Bond-009 2020-06-23 16:01:00 +02:00 committed by GitHub
commit 7481c3500a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -560,8 +560,6 @@ namespace MediaBrowser.Controller.Entities
/// <summary> /// <summary>
/// The logger. /// The logger.
/// </summary> /// </summary>
public static ILoggerFactory LoggerFactory { get; set; }
public static ILogger<BaseItem> Logger { get; set; } public static ILogger<BaseItem> Logger { get; set; }
public static ILibraryManager LibraryManager { get; set; } public static ILibraryManager LibraryManager { get; set; }

2
MediaBrowser.Controller/Entities/UserView.cs
View File

@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.Entities
parent = LibraryManager.GetItemById(ParentId) as Folder ?? parent; parent = LibraryManager.GetItemById(ParentId) as Folder ?? parent;
} }
return new UserViewBuilder(UserViewManager, LibraryManager, LoggerFactory.CreateLogger<UserViewBuilder>(), UserDataManager, TVSeriesManager, ConfigurationManager) return new UserViewBuilder(UserViewManager, LibraryManager, Logger, UserDataManager, TVSeriesManager, ConfigurationManager)
.GetUserItems(parent, this, CollectionType, query); .GetUserItems(parent, this, CollectionType, query);
} }

5
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@ -7,6 +7,7 @@ using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.TV; using MediaBrowser.Controller.TV;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying; using MediaBrowser.Model.Querying;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -22,7 +23,7 @@ namespace MediaBrowser.Controller.Entities
{ {
private readonly IUserViewManager _userViewManager; private readonly IUserViewManager _userViewManager;
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
private readonly ILogger<UserViewBuilder> _logger; private readonly ILogger<BaseItem> _logger;
private readonly IUserDataManager _userDataManager; private readonly IUserDataManager _userDataManager;
private readonly ITVSeriesManager _tvSeriesManager; private readonly ITVSeriesManager _tvSeriesManager;
private readonly IServerConfigurationManager _config; private readonly IServerConfigurationManager _config;
@ -30,7 +31,7 @@ namespace MediaBrowser.Controller.Entities
public UserViewBuilder( public UserViewBuilder(
IUserViewManager userViewManager, IUserViewManager userViewManager,
ILibraryManager libraryManager, ILibraryManager libraryManager,
ILogger<UserViewBuilder> logger, ILogger<BaseItem> logger,
IUserDataManager userDataManager, IUserDataManager userDataManager,
ITVSeriesManager tvSeriesManager, ITVSeriesManager tvSeriesManager,
IServerConfigurationManager config) IServerConfigurationManager config)