mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-05-28 03:18:27 +01:00
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
This commit is contained in:
@@ -20,12 +20,12 @@ namespace MediaBrowser.Providers.Manager
|
||||
where TIdType : ItemLookupInfo, new()
|
||||
{
|
||||
protected readonly IServerConfigurationManager ServerConfigurationManager;
|
||||
protected readonly ILogger Logger;
|
||||
protected readonly ILogger<MetadataService<TItemType, TIdType>> Logger;
|
||||
protected readonly IProviderManager ProviderManager;
|
||||
protected readonly IFileSystem FileSystem;
|
||||
protected readonly ILibraryManager LibraryManager;
|
||||
|
||||
protected MetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, ILibraryManager libraryManager)
|
||||
protected MetadataService(IServerConfigurationManager serverConfigurationManager, ILogger<MetadataService<TItemType, TIdType>> logger, IProviderManager providerManager, IFileSystem fileSystem, ILibraryManager libraryManager)
|
||||
{
|
||||
ServerConfigurationManager = serverConfigurationManager;
|
||||
Logger = logger;
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace MediaBrowser.Providers.Manager
|
||||
/// </summary>
|
||||
public class ProviderManager : IProviderManager, IDisposable
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<ProviderManager> _logger;
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILibraryMonitor _libraryMonitor;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
IPreRefreshProvider,
|
||||
IHasItemChangeMonitor
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<FFProbeProvider> _logger;
|
||||
private readonly IIsoManager _isoManager;
|
||||
private readonly IMediaEncoder _mediaEncoder;
|
||||
private readonly IItemRepository _itemRepo;
|
||||
|
||||
@@ -25,7 +25,8 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
_subtitleManager = subtitleManager;
|
||||
}
|
||||
|
||||
public async Task<List<string>> DownloadSubtitles(Video video,
|
||||
public async Task<List<string>> DownloadSubtitles(
|
||||
Video video,
|
||||
List<MediaStream> mediaStreams,
|
||||
bool skipIfEmbeddedSubtitlesPresent,
|
||||
bool skipIfAudioTrackMatches,
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
private readonly IServerConfigurationManager _config;
|
||||
private readonly ISubtitleManager _subtitleManager;
|
||||
private readonly IMediaSourceManager _mediaSourceManager;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<SubtitleScheduledTask> _logger;
|
||||
private readonly IJsonSerializer _json;
|
||||
private readonly ILocalizationManager _localization;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||
public class VideoImageProvider : IDynamicImageProvider, IHasOrder
|
||||
{
|
||||
private readonly IMediaEncoder _mediaEncoder;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<VideoImageProvider> _logger;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
|
||||
public VideoImageProvider(IMediaEncoder mediaEncoder, ILogger<VideoImageProvider> logger, IFileSystem fileSystem)
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace MediaBrowser.Providers.Playlists
|
||||
IPreRefreshProvider,
|
||||
IHasItemChangeMonitor
|
||||
{
|
||||
private ILogger _logger;
|
||||
private readonly ILogger<PlaylistItemsProvider> _logger;
|
||||
private IFileSystem _fileSystem;
|
||||
|
||||
public PlaylistItemsProvider(IFileSystem fileSystem, ILogger<PlaylistItemsProvider> logger)
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace MediaBrowser.Providers.Music
|
||||
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly IApplicationHost _appHost;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<MusicBrainzAlbumProvider> _logger;
|
||||
|
||||
private readonly string _musicBrainzBaseUrl;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
||||
public class TvdbEpisodeImageProvider : IRemoteImageProvider
|
||||
{
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TvdbEpisodeImageProvider> _logger;
|
||||
private readonly TvdbClientManager _tvdbClientManager;
|
||||
|
||||
public TvdbEpisodeImageProvider(IHttpClient httpClient, ILogger<TvdbEpisodeImageProvider> logger, TvdbClientManager tvdbClientManager)
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
||||
public class TvdbEpisodeProvider : IRemoteMetadataProvider<Episode, EpisodeInfo>, IHasOrder
|
||||
{
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TvdbEpisodeProvider> _logger;
|
||||
private readonly TvdbClientManager _tvdbClientManager;
|
||||
|
||||
public TvdbEpisodeProvider(IHttpClient httpClient, ILogger<TvdbEpisodeProvider> logger, TvdbClientManager tvdbClientManager)
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
||||
public class TvdbPersonImageProvider : IRemoteImageProvider, IHasOrder
|
||||
{
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TvdbPersonImageProvider> _logger;
|
||||
private readonly ILibraryManager _libraryManager;
|
||||
private readonly TvdbClientManager _tvdbClientManager;
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
||||
public class TvdbSeasonImageProvider : IRemoteImageProvider, IHasOrder
|
||||
{
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TvdbSeasonImageProvider> _logger;
|
||||
private readonly TvdbClientManager _tvdbClientManager;
|
||||
|
||||
public TvdbSeasonImageProvider(IHttpClient httpClient, ILogger<TvdbSeasonImageProvider> logger, TvdbClientManager tvdbClientManager)
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
||||
public class TvdbSeriesImageProvider : IRemoteImageProvider, IHasOrder
|
||||
{
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TvdbSeriesImageProvider> _logger;
|
||||
private readonly TvdbClientManager _tvdbClientManager;
|
||||
|
||||
public TvdbSeriesImageProvider(IHttpClient httpClient, ILogger<TvdbSeriesImageProvider> logger, TvdbClientManager tvdbClientManager)
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
||||
internal static TvdbSeriesProvider Current { get; private set; }
|
||||
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TvdbSeriesProvider> _logger;
|
||||
private readonly ILibraryManager _libraryManager;
|
||||
private readonly ILocalizationManager _localizationManager;
|
||||
private readonly TvdbClientManager _tvdbClientManager;
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
|
||||
|
||||
internal static TmdbBoxSetProvider Current;
|
||||
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TmdbBoxSetProvider> _logger;
|
||||
private readonly IJsonSerializer _json;
|
||||
private readonly IServerConfigurationManager _config;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
private readonly IServerConfigurationManager _configurationManager;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TmdbMovieProvider> _logger;
|
||||
private readonly ILibraryManager _libraryManager;
|
||||
private readonly IApplicationHost _appHost;
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
|
||||
private readonly IFileSystem _fileSystem;
|
||||
private readonly IServerConfigurationManager _configurationManager;
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TmdbPersonProvider> _logger;
|
||||
|
||||
public TmdbPersonProvider(
|
||||
IFileSystem fileSystem,
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||
private readonly IJsonSerializer _jsonSerializer;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
private readonly ILocalizationManager _localization;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TmdbEpisodeProviderBase> _logger;
|
||||
|
||||
protected TmdbEpisodeProviderBase(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
|
||||
{
|
||||
@@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||
_jsonSerializer = jsonSerializer;
|
||||
_fileSystem = fileSystem;
|
||||
_localization = localization;
|
||||
_logger = loggerFactory.CreateLogger(GetType().Name);
|
||||
_logger = loggerFactory.CreateLogger<TmdbEpisodeProviderBase>();
|
||||
}
|
||||
|
||||
protected ILogger Logger => _logger;
|
||||
|
||||
@@ -29,18 +29,18 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||
private readonly IJsonSerializer _jsonSerializer;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
private readonly ILocalizationManager _localization;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TmdbSeasonProvider> _logger;
|
||||
|
||||
internal static TmdbSeasonProvider Current { get; private set; }
|
||||
|
||||
public TmdbSeasonProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, ILoggerFactory loggerFactory)
|
||||
public TmdbSeasonProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, ILogger<TmdbSeasonProvider> logger)
|
||||
{
|
||||
_httpClient = httpClient;
|
||||
_configurationManager = configurationManager;
|
||||
_fileSystem = fileSystem;
|
||||
_localization = localization;
|
||||
_jsonSerializer = jsonSerializer;
|
||||
_logger = loggerFactory.CreateLogger(GetType().Name);
|
||||
_logger = logger;
|
||||
Current = this;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
|
||||
private readonly IJsonSerializer _jsonSerializer;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
private readonly IServerConfigurationManager _configurationManager;
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<TmdbSeriesProvider> _logger;
|
||||
private readonly ILocalizationManager _localization;
|
||||
private readonly IHttpClient _httpClient;
|
||||
private readonly ILibraryManager _libraryManager;
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace MediaBrowser.Providers.Subtitles
|
||||
{
|
||||
public class SubtitleManager : ISubtitleManager
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly ILogger<SubtitleManager> _logger;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
private readonly ILibraryMonitor _monitor;
|
||||
private readonly IMediaSourceManager _mediaSourceManager;
|
||||
|
||||
@@ -42,7 +42,8 @@ namespace MediaBrowser.Providers.TV
|
||||
await seasonProvider.Run(item, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
// TODO why does it not register this itself omg
|
||||
var provider = new MissingEpisodeProvider(Logger,
|
||||
var provider = new MissingEpisodeProvider(
|
||||
Logger,
|
||||
ServerConfigurationManager,
|
||||
LibraryManager,
|
||||
_localization,
|
||||
|
||||
Reference in New Issue
Block a user