alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Use Microsoft.Extensions.Logging abstraction

Browse Source
This commit is contained in:
Bond_009
2018-12-13 14:18:25 +01:00
parent b0fd432126
commit 0f8b3c6347
310 changed files with 1421 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.XbmcMetadata/EntryPoint.cs
View File

@@ -4,7 +4,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Plugins;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Configuration;
using MediaBrowser.XbmcMetadata.Savers;
using System;
@@ -72,7 +72,7 @@ namespace MediaBrowser.XbmcMetadata
}
catch (Exception ex)
{
_logger.ErrorException("Error saving metadata for {0}", ex, item.Path ?? item.Name);
_logger.LogError("Error saving metadata for {0}", ex, item.Path ?? item.Name);
}
}
}

4
MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
View File

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Configuration;
using MediaBrowser.XbmcMetadata.Savers;
using System;
@@ -294,7 +294,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
}
else
{
Logger.Warn("Invalid Added value found: " + val);
Logger.LogWarning("Invalid Added value found: " + val);
}
}
break;

2
MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Globalization;

4
MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
View File

@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System.Xml;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Xml;
@@ -81,7 +81,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
}
catch (Exception ex)
{
Logger.ErrorException("Error parsing set node", ex);
Logger.LogError("Error parsing set node", ex);
}
}
}

2
MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System.Globalization;
using System.Xml;
using MediaBrowser.Model.IO;

4
MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.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.Xml;
using MediaBrowser.Model.IO;
@@ -91,7 +91,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
}
else
{
Logger.Info("Unrecognized series status: " + status);
Logger.LogInformation("Unrecognized series status: " + status);
}
}

2
MediaBrowser.XbmcMetadata/Providers/AlbumNfoProvider.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Parsers;
using System.IO;
using System.Threading;

2
MediaBrowser.XbmcMetadata/Providers/ArtistNfoProvider.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Parsers;
using System.IO;
using System.Threading;

4
MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Parsers;
using MediaBrowser.XbmcMetadata.Savers;
using System.Linq;
@@ -54,4 +54,4 @@ namespace MediaBrowser.XbmcMetadata.Providers
.FirstOrDefault(i => i != null);
}
}
}
}

2
MediaBrowser.XbmcMetadata/Providers/EpisodeNfoProvider.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Parsers;
using System.Collections.Generic;
using System.IO;

4
MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs
View File

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Xml;
namespace MediaBrowser.XbmcMetadata.Providers
@@ -30,4 +30,4 @@ namespace MediaBrowser.XbmcMetadata.Providers
{
}
}
}
}

2
MediaBrowser.XbmcMetadata/Providers/SeasonNfoProvider.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Parsers;
using System.IO;
using System.Threading;

2
MediaBrowser.XbmcMetadata/Providers/SeriesNfoProvider.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Parsers;
using System.IO;
using System.Threading;

2
MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
View File

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

4
MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
View File

@@ -2,7 +2,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Configuration;
using System.Collections.Generic;
using System.Globalization;
@@ -91,4 +91,4 @@ namespace MediaBrowser.XbmcMetadata.Savers
{
}
}
}
}

12
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@@ -8,7 +8,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Configuration;
using System;
using System.Collections.Generic;
@@ -230,7 +230,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
}
catch (Exception ex)
{
Logger.Error("Error setting hidden attribute on {0} - {1}", path, ex.Message);
Logger.LogError("Error setting hidden attribute on {path} - {ex}", path, ex.Message);
}
}
@@ -283,7 +283,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
}
catch (XmlException ex)
{
Logger.ErrorException("Error reading existng nfo", ex);
Logger.LogError("Error reading existng nfo", ex);
}
writer.WriteEndElement();
@@ -774,9 +774,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
try
{
var tagName = GetTagForProviderKey(providerKey);
//Logger.Debug("Verifying custom provider tagname {0}", tagName);
//logger.LogDebug("Verifying custom provider tagname {0}", tagName);
XmlConvert.VerifyName(tagName);
//Logger.Debug("Saving custom provider tagname {0}", tagName);
//logger.LogDebug("Saving custom provider tagname {0}", tagName);
writer.WriteElementString(GetTagForProviderKey(providerKey), providerId);
}
@@ -1000,7 +1000,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
}
catch (Exception ex)
{
logger.ErrorException("Error reading existing xml tags from {0}.", ex, path);
logger.LogError("Error reading existing xml tags from {0}.", ex, path);
return;
}

4
MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
View File

@@ -2,7 +2,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.XbmcMetadata.Configuration;
using System.Collections.Generic;
using System.Globalization;
@@ -115,4 +115,4 @@ namespace MediaBrowser.XbmcMetadata.Savers
{
}
}
}
}

2
MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.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 System.Collections.Generic;
using System.IO;
using System.Xml;

2
MediaBrowser.XbmcMetadata/Savers/SeasonNfoSaver.cs
View File

@@ -2,7 +2,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System.Collections.Generic;
using System.Globalization;
using System.IO;

2
MediaBrowser.XbmcMetadata/Savers/SeriesNfoSaver.cs
View File

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