alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-26 17:40:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #285 from Bond-009/logging

Browse Source 
Use Serilog to handle logging
This commit is contained in:
Joshua M. Boniface
2018-12-30 17:29:02 -05:00
committed by GitHub
parent 7ad0231430 4c95aee52e
commit 1f02cf4b7e
351 changed files with 1941 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Providers/Books/AudioBookMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using System.Linq;

2
MediaBrowser.Providers/Books/BookMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Linq;
using MediaBrowser.Model.IO;

2
MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
View File

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Providers.Movies;

2
MediaBrowser.Providers/Channels/ChannelMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Chapters/ChapterManager.cs
View File

@@ -10,7 +10,7 @@ using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Threading;

2
MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
View File

@@ -8,7 +8,7 @@ using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
namespace MediaBrowser.Providers.Folders

2
MediaBrowser.Providers/Folders/FolderMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Folders/UserViewMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/GameGenres/GameGenreMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Games/GameMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Games/GameSystemMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Genres/GenreMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using MediaBrowser.Model.IO;

12
MediaBrowser.Providers/Manager/ImageSaver.cs
View File

@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using System;
using System.Collections.Generic;
@@ -164,7 +164,7 @@ namespace MediaBrowser.Providers.Manager
{
var currentPath = currentImagePath;
_logger.Info("Deleting previous image {0}", currentPath);
_logger.LogInformation("Deleting previous image {0}", currentPath);
_libraryMonitor.ReportFileSystemChangeBeginning(currentPath);
@@ -197,7 +197,7 @@ namespace MediaBrowser.Providers.Manager
if (retry)
{
_logger.Error("UnauthorizedAccessException - Access to path {0} is denied. Will retry saving to {1}", path, retryPath);
_logger.LogError("UnauthorizedAccessException - Access to path {0} is denied. Will retry saving to {1}", path, retryPath);
}
else
{
@@ -211,7 +211,7 @@ namespace MediaBrowser.Providers.Manager
if (retry)
{
_logger.Error("IOException saving to {0}. {2}. Will retry saving to {1}", path, retryPath, ex.Message);
_logger.LogError(ex, "IOException saving to {0}. Will retry saving to {1}", path, retryPath);
}
else
{
@@ -233,7 +233,7 @@ namespace MediaBrowser.Providers.Manager
/// <returns>Task.</returns>
private async Task SaveImageToLocation(Stream source, string path, CancellationToken cancellationToken)
{
_logger.Debug("Saving image to {0}", path);
_logger.LogDebug("Saving image to {0}", path);
var parentFolder = _fileSystem.GetDirectoryName(path);
@@ -271,7 +271,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.Error("Error setting hidden attribute on {0} - {1}", path, ex.Message);
_logger.LogError(ex, "Error setting hidden attribute on {0}", path);
}
}

18
MediaBrowser.Providers/Manager/ItemImageProvider.cs
View File

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Providers;
using System;
@@ -126,7 +126,7 @@ namespace MediaBrowser.Providers.Manager
if (!HasImage(item, imageType) || (refreshOptions.IsReplacingImage(imageType) && !downloadedImages.Contains(imageType)))
{
_logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
_logger.LogDebug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
var response = await provider.GetImage(item, imageType, cancellationToken).ConfigureAwait(false);
@@ -136,7 +136,7 @@ namespace MediaBrowser.Providers.Manager
{
if (response.Protocol == MediaProtocol.Http)
{
_logger.Debug("Setting image url into item {0}", item.Id);
_logger.LogDebug("Setting image url into item {0}", item.Id);
item.SetImage(new ItemImageInfo
{
Path = response.Path,
@@ -173,7 +173,7 @@ namespace MediaBrowser.Providers.Manager
catch (Exception ex)
{
result.ErrorMessage = ex.Message;
_logger.ErrorException("Error in {0}", ex, provider.Name);
_logger.LogError(ex, "Error in {provider}", provider.Name);
}
}
@@ -264,7 +264,7 @@ namespace MediaBrowser.Providers.Manager
return;
}
_logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
_logger.LogDebug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name);
var images = await _providerManager.GetAvailableRemoteImages(item, new RemoteImageQuery
{
@@ -310,7 +310,7 @@ namespace MediaBrowser.Providers.Manager
catch (Exception ex)
{
result.ErrorMessage = ex.Message;
_logger.ErrorException("Error in {0}", ex, provider.Name);
_logger.LogError(ex, "Error in {provider}", provider.Name);
}
}
@@ -577,7 +577,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (IOException ex)
{
_logger.ErrorException("Error examining images", ex);
_logger.LogError(ex, "Error examining images");
}
}
@@ -586,7 +586,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (HttpException ex)
{
// Sometimes providers send back bad url's. Just move onto the next image
// Sometimes providers send back bad urls. Just move onto the next image
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
{
continue;
@@ -596,4 +596,4 @@ namespace MediaBrowser.Providers.Manager
}
}
}
}
}

30
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
Logger.ErrorException("Error getting file {0}", ex, path);
Logger.LogError(ex, "Error getting file {path}", path);
return null;
}
}
@@ -73,7 +73,7 @@ namespace MediaBrowser.Providers.Manager
if (requiresRefresh)
{
Logger.Debug("Refreshing {0} {1} because item.RequiresRefresh() returned true", typeof(TItemType).Name, item.Path ?? item.Name);
Logger.LogDebug("Refreshing {0} {1} because item.RequiresRefresh() returned true", typeof(TItemType).Name, item.Path ?? item.Name);
}
}
@@ -96,7 +96,7 @@ namespace MediaBrowser.Providers.Manager
localImagesFailed = true;
if (!(item is IItemByName))
{
Logger.ErrorException("Error validating images for {0}", ex, item.Path ?? item.Name ?? "Unknown name");
Logger.LogError(ex, "Error validating images for {0}", item.Path ?? item.Name ?? "Unknown name");
}
}
@@ -268,7 +268,7 @@ namespace MediaBrowser.Providers.Manager
// }
// catch (Exception ex)
// {
// Logger.ErrorException("Error in AddPersonImage", ex);
// Logger.LogError(ex, "Error in AddPersonImage");
// }
//}
@@ -728,7 +728,7 @@ namespace MediaBrowser.Providers.Manager
foreach (var provider in providers.OfType<ILocalMetadataProvider<TItemType>>().ToList())
{
var providerName = provider.GetType().Name;
Logger.Debug("Running {0} for {1}", providerName, logName);
Logger.LogDebug("Running {0} for {1}", providerName, logName);
var itemInfo = new ItemInfo(item);
@@ -759,7 +759,7 @@ namespace MediaBrowser.Providers.Manager
break;
}
Logger.Debug("{0} returned no metadata for {1}", providerName, logName);
Logger.LogDebug("{0} returned no metadata for {1}", providerName, logName);
}
catch (OperationCanceledException)
{
@@ -767,7 +767,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
Logger.ErrorException("Error in {0}", ex, provider.Name);
Logger.LogError(ex, "Error in {provider}", provider.Name);
// If a local provider fails, consider that a failure
refreshResult.ErrorMessage = ex.Message;
@@ -826,7 +826,7 @@ namespace MediaBrowser.Providers.Manager
private async Task RunCustomProvider(ICustomMetadataProvider<TItemType> provider, TItemType item, string logName, MetadataRefreshOptions options, RefreshResult refreshResult, CancellationToken cancellationToken)
{
Logger.Debug("Running {0} for {1}", provider.GetType().Name, logName);
Logger.LogDebug("Running {0} for {1}", provider.GetType().Name, logName);
try
{
@@ -839,7 +839,7 @@ namespace MediaBrowser.Providers.Manager
catch (Exception ex)
{
refreshResult.ErrorMessage = ex.Message;
Logger.ErrorException("Error in {0}", ex, provider.Name);
Logger.LogError(ex, "Error in {provider}", provider.Name);
}
}
@@ -857,7 +857,7 @@ namespace MediaBrowser.Providers.Manager
foreach (var provider in providers)
{
var providerName = provider.GetType().Name;
Logger.Debug("Running {0} for {1}", providerName, logName);
Logger.LogDebug("Running {0} for {1}", providerName, logName);
if (id != null && !tmpDataMerged)
{
@@ -880,7 +880,7 @@ namespace MediaBrowser.Providers.Manager
}
else
{
Logger.Debug("{0} returned no metadata for {1}", providerName, logName);
Logger.LogDebug("{0} returned no metadata for {1}", providerName, logName);
}
}
catch (OperationCanceledException)
@@ -891,7 +891,7 @@ namespace MediaBrowser.Providers.Manager
{
refreshResult.Failures++;
refreshResult.ErrorMessage = ex.Message;
Logger.ErrorException("Error in {0}", ex, provider.Name);
Logger.LogError(ex, "Error in {provider}", provider.Name);
}
}
@@ -944,14 +944,14 @@ namespace MediaBrowser.Providers.Manager
//if (hasChanged)
//{
// Logger.Debug("{0} reports change to {1}", changeMonitor.GetType().Name, item.Path ?? item.Name);
// logger.LogDebug("{0} reports change to {1}", changeMonitor.GetType().Name, item.Path ?? item.Name);
//}
return hasChanged;
}
catch (Exception ex)
{
Logger.ErrorException("Error in {0}.HasChanged", ex, changeMonitor.GetType().Name);
Logger.LogError(ex, "Error in {0}.HasChanged", changeMonitor.GetType().Name);
return false;
}
}

48
MediaBrowser.Providers/Manager/ProviderManager.cs
View File

@@ -10,7 +10,7 @@ using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using System;
using System.Collections.Generic;
@@ -79,9 +79,9 @@ namespace MediaBrowser.Providers.Manager
/// <summary>
/// Initializes a new instance of the <see cref="ProviderManager" /> class.
/// </summary>
public ProviderManager(IHttpClient httpClient, ISubtitleManager subtitleManager, IServerConfigurationManager configurationManager, ILibraryMonitor libraryMonitor, ILogManager logManager, IFileSystem fileSystem, IServerApplicationPaths appPaths, Func<ILibraryManager> libraryManagerFactory, IJsonSerializer json)
public ProviderManager(IHttpClient httpClient, ISubtitleManager subtitleManager, IServerConfigurationManager configurationManager, ILibraryMonitor libraryMonitor, ILoggerFactory loggerFactory, IFileSystem fileSystem, IServerApplicationPaths appPaths, Func<ILibraryManager> libraryManagerFactory, IJsonSerializer json)
{
_logger = logManager.GetLogger("ProviderManager");
_logger = loggerFactory.CreateLogger("ProviderManager");
_httpClient = httpClient;
ConfigurationManager = configurationManager;
_libraryMonitor = libraryMonitor;
@@ -144,7 +144,7 @@ namespace MediaBrowser.Providers.Manager
return service.RefreshMetadata(item, options, cancellationToken);
}
_logger.Error("Unable to find a metadata service for item of type " + item.GetType().Name);
_logger.LogError("Unable to find a metadata service for item of type {TypeName}", item.GetType().Name);
return Task.FromResult(ItemUpdateType.None);
}
@@ -250,7 +250,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("{0} failed in GetImageInfos for type {1}", ex, provider.GetType().Name, item.GetType().Name);
_logger.LogError(ex, "{0} failed in GetImageInfos for type {1}", provider.GetType().Name, item.GetType().Name);
return new List<RemoteImageInfo>();
}
}
@@ -329,7 +329,11 @@ namespace MediaBrowser.Providers.Manager
var options = GetMetadataOptions(item);
var libraryOptions = _libraryManagerFactory().GetLibraryOptions(item);
return GetImageProviders(item, libraryOptions, options, new ImageRefreshOptions(new DirectoryService(_logger, _fileSystem)), includeDisabled).OfType<IRemoteImageProvider>();
return GetImageProviders(item, libraryOptions, options,
new ImageRefreshOptions(
new DirectoryService(_logger, _fileSystem)),
includeDisabled)
.OfType<IRemoteImageProvider>();
}
private bool CanRefresh(IMetadataProvider provider, BaseItem item, LibraryOptions libraryOptions, MetadataOptions options, bool includeDisabled, bool forceEnableInternetMetadata)
@@ -396,7 +400,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("{0} failed in Supports for type {1}", ex, provider.GetType().Name, item.GetType().Name);
_logger.LogError(ex, "{0} failed in Supports for type {1}", provider.GetType().Name, item.GetType().Name);
return false;
}
}
@@ -506,7 +510,11 @@ namespace MediaBrowser.Providers.Manager
var libraryOptions = new LibraryOptions();
var imageProviders = GetImageProviders(dummy, libraryOptions, options, new ImageRefreshOptions(new DirectoryService(_logger, _fileSystem)), true).ToList();
var imageProviders = GetImageProviders(dummy, libraryOptions, options,
new ImageRefreshOptions(
new DirectoryService(_logger, _fileSystem)),
true)
.ToList();
var pluginList = summary.Plugins.ToList();
@@ -620,7 +628,7 @@ namespace MediaBrowser.Providers.Manager
foreach (var saver in savers.Where(i => IsSaverEnabledForItem(i, item, libraryOptions, updateType, false)))
{
_logger.Debug("Saving {0} to {1}.", item.Path ?? item.Name, saver.Name);
_logger.LogDebug("Saving {0} to {1}.", item.Path ?? item.Name, saver.Name);
var fileSaver = saver as IMetadataFileSaver;
@@ -634,7 +642,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error in {0} GetSavePath", ex, saver.Name);
_logger.LogError(ex, "Error in {0} GetSavePath", saver.Name);
continue;
}
@@ -645,7 +653,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error in metadata saver", ex);
_logger.LogError(ex, "Error in metadata saver");
}
finally
{
@@ -660,7 +668,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error in metadata saver", ex);
_logger.LogError(ex, "Error in metadata saver");
}
}
}
@@ -723,7 +731,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error in {0}.IsEnabledFor", ex, saver.Name);
_logger.LogError(ex, "Error in {0}.IsEnabledFor", saver.Name);
return false;
}
}
@@ -825,7 +833,7 @@ namespace MediaBrowser.Providers.Manager
}
}
//_logger.Debug("Returning search results {0}", _json.SerializeToString(resultList));
//_logger.LogDebug("Returning search results {0}", _json.SerializeToString(resultList));
return resultList;
}
@@ -868,7 +876,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error in {0}.Suports", ex, i.GetType().Name);
_logger.LogError(ex, "Error in {0}.Suports", i.GetType().Name);
return false;
}
});
@@ -930,7 +938,7 @@ namespace MediaBrowser.Providers.Manager
public void OnRefreshStart(BaseItem item)
{
//_logger.Info("OnRefreshStart {0}", item.Id.ToString("N"));
//_logger.LogInformation("OnRefreshStart {0}", item.Id.ToString("N"));
var id = item.Id;
lock (_activeRefreshes)
@@ -946,7 +954,7 @@ namespace MediaBrowser.Providers.Manager
public void OnRefreshComplete(BaseItem item)
{
//_logger.Info("OnRefreshComplete {0}", item.Id.ToString("N"));
//_logger.LogInformation("OnRefreshComplete {0}", item.Id.ToString("N"));
lock (_activeRefreshes)
{
_activeRefreshes.Remove(item.Id);
@@ -974,7 +982,7 @@ namespace MediaBrowser.Providers.Manager
public void OnRefreshProgress(BaseItem item, double progress)
{
//_logger.Info("OnRefreshProgress {0} {1}", item.Id.ToString("N"), progress);
//_logger.LogInformation("OnRefreshProgress {0} {1}", item.Id.ToString("N"), progress);
var id = item.Id;
lock (_activeRefreshes)
@@ -1062,7 +1070,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error refreshing item", ex);
_logger.LogError(ex, "Error refreshing item");
}
}
@@ -1139,7 +1147,7 @@ namespace MediaBrowser.Providers.Manager
}
catch (Exception ex)
{
_logger.ErrorException("Error refreshing library", ex);
_logger.LogError(ex, "Error refreshing library");
}
}

6
MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
View File

@@ -13,7 +13,7 @@ using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using System;
@@ -71,7 +71,7 @@ namespace MediaBrowser.Providers.MediaInfo
var file = directoryService.GetFile(path);
if (file != null && file.LastWriteTimeUtc != item.DateModified)
{
_logger.Debug("Refreshing {0} due to date modified timestamp change.", path);
_logger.LogDebug("Refreshing {0} due to date modified timestamp change.", path);
return true;
}
}
@@ -84,7 +84,7 @@ namespace MediaBrowser.Providers.MediaInfo
if (!video.SubtitleFiles
.SequenceEqual(_subtitleResolver.GetExternalSubtitleFiles(video, directoryService, false), StringComparer.Ordinal))
{
_logger.Debug("Refreshing {0} due to external subtitles change.", item.Path);
_logger.LogDebug("Refreshing {0} due to external subtitles change.", item.Path);
return true;
}
}

10
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@@ -14,7 +14,7 @@ using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
@@ -86,7 +86,7 @@ namespace MediaBrowser.Providers.MediaInfo
if (streamFileNames.Length == 0)
{
_logger.Error("No playable vobs found in dvd structure, skipping ffprobe.");
_logger.LogError("No playable vobs found in dvd structure, skipping ffprobe.");
return ItemUpdateType.MetadataImport;
}
}
@@ -101,7 +101,7 @@ namespace MediaBrowser.Providers.MediaInfo
if (streamFileNames.Length == 0)
{
_logger.Error("No playable vobs found in bluray structure, skipping ffprobe.");
_logger.LogError("No playable vobs found in bluray structure, skipping ffprobe.");
return ItemUpdateType.MetadataImport;
}
}
@@ -342,7 +342,7 @@ namespace MediaBrowser.Providers.MediaInfo
}
catch (Exception ex)
{
_logger.ErrorException("Error getting BDInfo", ex);
_logger.LogError(ex, "Error getting BDInfo");
return null;
}
}
@@ -611,4 +611,4 @@ namespace MediaBrowser.Providers.MediaInfo
.Sum();
}
}
}
}

4
MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -176,7 +176,7 @@ namespace MediaBrowser.Providers.MediaInfo
}
catch (Exception ex)
{
_logger.ErrorException("Error downloading subtitles", ex);
_logger.LogError(ex, "Error downloading subtitles");
}
return false;

4
MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
View File

@@ -6,7 +6,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using System;
using System.Collections.Generic;
@@ -148,7 +148,7 @@ namespace MediaBrowser.Providers.MediaInfo
}
catch (Exception ex)
{
_logger.ErrorException("Error downloading subtitles for {0}", ex, video.Path);
_logger.LogError(ex, "Error downloading subtitles for {Path}", video.Path);
}
// Update progress

4
MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
View File

@@ -6,7 +6,7 @@ using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.MediaInfo;
using System;
using System.Collections.Generic;
@@ -53,7 +53,7 @@ namespace MediaBrowser.Providers.MediaInfo
// Can't extract if we didn't find a video stream in the file
if (!video.DefaultVideoStreamIndex.HasValue)
{
_logger.Info("Skipping image extraction due to missing DefaultVideoStreamIndex for {0}.", video.Path ?? string.Empty);
_logger.LogInformation("Skipping image extraction due to missing DefaultVideoStreamIndex for {0}.", video.Path ?? string.Empty);
return Task.FromResult(new DynamicImageResponse { HasImage = false });
}

2
MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Serialization;
using System;
using System.Collections.Generic;

6
MediaBrowser.Providers/Movies/MovieDbProvider.cs
View File

@@ -6,7 +6,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using System;
@@ -379,7 +379,7 @@ namespace MediaBrowser.Providers.Movies
!string.IsNullOrEmpty(language) &&
!string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
{
_logger.Info("MovieDbProvider couldn't find meta for language " + language + ". Trying English...");
_logger.LogInformation("MovieDbProvider couldn't find meta for language " + language + ". Trying English...");
url = string.Format(GetMovieInfo3, id, ApiKey) + "&language=en";
@@ -425,7 +425,7 @@ namespace MediaBrowser.Providers.Movies
if (delayMs > 0)
{
_logger.Debug("Throttling Tmdb by {0} ms", delayMs);
_logger.LogDebug("Throttling Tmdb by {0} ms", delayMs);
await Task.Delay(Convert.ToInt32(delayMs)).ConfigureAwait(false);
}

4
MediaBrowser.Providers/Movies/MovieDbSearch.cs
View File

@@ -2,7 +2,7 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using System;
@@ -71,7 +71,7 @@ namespace MediaBrowser.Providers.Movies
year = year ?? yearInName;
}
_logger.Info("MovieDbProvider: Finding id for item: " + name);
_logger.LogInformation("MovieDbProvider: Finding id for item: " + name);
var language = idInfo.MetadataLanguage.ToLower();
//nope - search for it

2
MediaBrowser.Providers/Movies/MovieMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Music/AlbumMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System;
using System.Collections.Generic;

2
MediaBrowser.Providers/Music/ArtistMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System;
using System.Collections.Generic;

2
MediaBrowser.Providers/Music/AudioMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using System.Linq;

6
MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using System;
using System.Collections.Generic;
@@ -774,7 +774,7 @@ namespace MediaBrowser.Providers.Music
}
catch (Exception ex)
{
_logger.ErrorException("Error getting music brainz info", ex);
_logger.LogError(ex, "Error getting music brainz info");
}
}
}
@@ -812,7 +812,7 @@ namespace MediaBrowser.Providers.Music
if (throttleMs > 0)
{
// MusicBrainz is extremely adamant about limiting to one request per second
_logger.Debug("Throttling MusicBrainz by {0}ms", throttleMs.ToString(CultureInfo.InvariantCulture));
_logger.LogDebug("Throttling MusicBrainz by {0}ms", throttleMs.ToString(CultureInfo.InvariantCulture));
await Task.Delay(throttleMs, cancellationToken).ConfigureAwait(false);
}

2
MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using System.Linq;

2
MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
View File

@@ -8,7 +8,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using System;

2
MediaBrowser.Providers/People/MovieDbPersonProvider.cs
View File

@@ -19,7 +19,7 @@ using System.Threading.Tasks;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
namespace MediaBrowser.Providers.People

2
MediaBrowser.Providers/People/PersonMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Photos/PhotoMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using MediaBrowser.Model.IO;

4
MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
View File

@@ -13,7 +13,7 @@ using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using System;
@@ -169,7 +169,7 @@ namespace MediaBrowser.Providers.Playlists
var file = directoryService.GetFile(path);
if (file != null && file.LastWriteTimeUtc != item.DateModified)
{
_logger.Debug("Refreshing {0} due to date modified timestamp change.", path);
_logger.LogDebug("Refreshing {0} due to date modified timestamp change.", path);
return true;
}
}

2
MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using System.Linq;

2
MediaBrowser.Providers/Studios/StudioMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using MediaBrowser.Model.IO;

8
MediaBrowser.Providers/Subtitles/SubtitleManager.cs
View File

@@ -8,7 +8,7 @@ using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using System;
using System.Collections.Generic;
@@ -101,7 +101,7 @@ namespace MediaBrowser.Providers.Subtitles
}
catch (Exception ex)
{
_logger.ErrorException("Error downloading subtitles from {0}", ex, provider.Name);
_logger.LogError(ex, "Error downloading subtitles from {Provider}", provider.Name);
}
}
return new RemoteSubtitleInfo[] { };
@@ -119,7 +119,7 @@ namespace MediaBrowser.Providers.Subtitles
}
catch (Exception ex)
{
_logger.ErrorException("Error downloading subtitles from {0}", ex, i.Name);
_logger.LogError(ex, "Error downloading subtitles from {0}", i.Name);
return new RemoteSubtitleInfo[] { };
}
});
@@ -207,7 +207,7 @@ namespace MediaBrowser.Providers.Subtitles
foreach (var savePath in savePaths)
{
_logger.Info("Saving subtitles to {0}", savePath);
_logger.LogInformation("Saving subtitles to {0}", savePath);
_monitor.ReportFileSystemChangeBeginning(savePath);

8
MediaBrowser.Providers/TV/DummySeasonProvider.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System.Globalization;
using System.Linq;
using System.Threading;
@@ -131,7 +131,7 @@ namespace MediaBrowser.Providers.TV
_libraryManager.GetLibraryOptions(series).SeasonZeroDisplayName :
(seasonNumber.HasValue ? string.Format(_localization.GetLocalizedString("NameSeasonNumber"), seasonNumber.Value.ToString(_usCulture)) : _localization.GetLocalizedString("NameSeasonUnknown"));
_logger.Info("Creating Season {0} entry for {1}", seasonName, series.Name);
_logger.LogInformation("Creating Season {0} entry for {1}", seasonName, series.Name);
var season = new Season
{
@@ -147,7 +147,7 @@ namespace MediaBrowser.Providers.TV
series.AddChild(season, cancellationToken);
await season.RefreshMetadata(new MetadataRefreshOptions(_fileSystem), cancellationToken).ConfigureAwait(false);
await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem)), cancellationToken).ConfigureAwait(false);
return season;
}
@@ -192,7 +192,7 @@ namespace MediaBrowser.Providers.TV
foreach (var seasonToRemove in seasonsToRemove)
{
_logger.Info("Removing virtual season {0} {1}", series.Name, seasonToRemove.IndexNumber);
_logger.LogInformation("Removing virtual season {0} {1}", series.Name, seasonToRemove.IndexNumber);
_libraryManager.DeleteItem(seasonToRemove, new DeleteOptions
{

2
MediaBrowser.Providers/TV/EpisodeMetadataService.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using System.Threading.Tasks;

8
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -217,7 +217,7 @@ namespace MediaBrowser.Providers.TV
if (addMissingEpisodes)
{
// tvdb has a lot of nearly blank episodes
_logger.Info("Creating virtual missing episode {0} {1}x{2}", series.Name, tuple.Item1, tuple.Item2);
_logger.LogInformation("Creating virtual missing episode {0} {1}x{2}", series.Name, tuple.Item1, tuple.Item2);
await AddEpisode(series, tuple.Item1, tuple.Item2, cancellationToken).ConfigureAwait(false);
hasChanges = true;
@@ -226,7 +226,7 @@ namespace MediaBrowser.Providers.TV
else if (airDate.Value > now)
{
// tvdb has a lot of nearly blank episodes
_logger.Info("Creating virtual unaired episode {0} {1}x{2}", series.Name, tuple.Item1, tuple.Item2);
_logger.LogInformation("Creating virtual unaired episode {0} {1}x{2}", series.Name, tuple.Item1, tuple.Item2);
await AddEpisode(series, tuple.Item1, tuple.Item2, cancellationToken).ConfigureAwait(false);
hasChanges = true;
@@ -414,7 +414,7 @@ namespace MediaBrowser.Providers.TV
season.AddChild(episode, cancellationToken);
await episode.RefreshMetadata(new MetadataRefreshOptions(_fileSystem), cancellationToken).ConfigureAwait(false);
await episode.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem)), cancellationToken).ConfigureAwait(false);
}
/// <summary>

2
MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
View File

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Providers.Omdb;

2
MediaBrowser.Providers/TV/SeasonMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System;
using System.Collections.Generic;

4
MediaBrowser.Providers/TV/SeriesMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System;
using System.Collections.Generic;
@@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.TV
}
catch (Exception ex)
{
Logger.ErrorException("Error in DummySeasonProvider", ex);
Logger.LogError(ex, "Error in DummySeasonProvider");
}
}

6
MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
View File

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Providers.Movies;
@@ -25,8 +25,8 @@ namespace MediaBrowser.Providers.TV
IRemoteImageProvider,
IHasOrder
{
public MovieDbEpisodeImageProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILogManager logManager)
: base(httpClient, configurationManager, jsonSerializer, fileSystem, localization, logManager)
public MovieDbEpisodeImageProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
: base(httpClient, configurationManager, jsonSerializer, fileSystem, localization, loggerFactory)
{}
public IEnumerable<ImageType> GetSupportedImages(BaseItem item)

6
MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
View File

@@ -6,7 +6,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
@@ -27,8 +27,8 @@ namespace MediaBrowser.Providers.TV
IRemoteMetadataProvider<Episode, EpisodeInfo>,
IHasOrder
{
public MovieDbEpisodeProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILogManager logManager)
: base(httpClient, configurationManager, jsonSerializer, fileSystem, localization, logManager)
public MovieDbEpisodeProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
: base(httpClient, configurationManager, jsonSerializer, fileSystem, localization, loggerFactory)
{ }
public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(EpisodeInfo searchInfo, CancellationToken cancellationToken)

6
MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Model.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Providers.Movies;
using System;
@@ -26,14 +26,14 @@ namespace MediaBrowser.Providers.TV
private readonly ILocalizationManager _localization;
private readonly ILogger _logger;
public MovieDbProviderBase(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILogManager logManager)
public MovieDbProviderBase(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILoggerFactory loggerFactory)
{
_httpClient = httpClient;
_configurationManager = configurationManager;
_jsonSerializer = jsonSerializer;
_fileSystem = fileSystem;
_localization = localization;
_logger = logManager.GetLogger(GetType().Name);
_logger = loggerFactory.CreateLogger(GetType().Name);
}
protected ILogger Logger

8
MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
@@ -32,14 +32,14 @@ namespace MediaBrowser.Providers.TV
private readonly ILocalizationManager _localization;
private readonly ILogger _logger;
public MovieDbSeasonProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, ILogManager logManager)
public MovieDbSeasonProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer, ILoggerFactory loggerFactory)
{
_httpClient = httpClient;
_configurationManager = configurationManager;
_fileSystem = fileSystem;
_localization = localization;
_jsonSerializer = jsonSerializer;
_logger = logManager.GetLogger(GetType().Name);
_logger = loggerFactory.CreateLogger(GetType().Name);
}
public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, CancellationToken cancellationToken)
@@ -97,7 +97,7 @@ namespace MediaBrowser.Providers.TV
}
catch (HttpException ex)
{
_logger.Error("No metadata found for {0}", seasonNumber.Value);
_logger.LogError(ex, "No metadata found for {0}", seasonNumber.Value);
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
{

4
MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
View File

@@ -6,7 +6,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Providers.Movies;
@@ -412,7 +412,7 @@ namespace MediaBrowser.Providers.TV
!string.IsNullOrEmpty(language) &&
!string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
{
_logger.Info("MovieDbSeriesProvider couldn't find meta for language " + language + ". Trying English...");
_logger.LogInformation("MovieDbSeriesProvider couldn't find meta for language " + language + ". Trying English...");
url = string.Format(GetTvInfo3, id, MovieDbProvider.ApiKey) + "&language=en";

4
MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Providers;
using System;
using System.Collections.Generic;
@@ -131,7 +131,7 @@ namespace MediaBrowser.Providers.TV
}
else
{
_logger.Debug("No series identity found for {0}", searchInfo.Name);
_logger.LogDebug("No series identity found for {0}", searchInfo.Name);
}
return result;

6
MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using System;
using System.Collections.Generic;
@@ -358,7 +358,7 @@ namespace MediaBrowser.Providers.TV
}
catch (HttpException ex)
{
_logger.ErrorException("Error updating tvdb series id {0}, language {1}", ex, seriesId, language);
_logger.LogError(ex, "Error updating tvdb series id {ID}, language {Language}", seriesId, language);
// Already logged at lower levels, but don't fail the whole operation, unless timed out
// We have to fail this to make it run again otherwise new episode data could potentially be missing
@@ -389,7 +389,7 @@ namespace MediaBrowser.Providers.TV
/// <returns>Task.</returns>
private Task UpdateSeries(string id, string seriesDataPath, long? lastTvDbUpdateTime, string preferredMetadataLanguage, CancellationToken cancellationToken)
{
_logger.Info("Updating series from tvdb " + id + ", language " + preferredMetadataLanguage);
_logger.LogInformation("Updating series from tvdb " + id + ", language " + preferredMetadataLanguage);
seriesDataPath = Path.Combine(seriesDataPath, id);

2
MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
View File

@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Providers;
using System;

2
MediaBrowser.Providers/Users/UserMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;

2
MediaBrowser.Providers/Videos/VideoMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;
using MediaBrowser.Model.IO;

2
MediaBrowser.Providers/Years/YearMetadataService.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Providers.Manager;
using System.Collections.Generic;