alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-24 11:05:08 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

removed static logger

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 15:26:35 -05:00
parent 4019b9260b
commit ab1065a567
46 changed files with 424 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Providers/BaseImageEnhancer.cs
View File

@@ -2,6 +2,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using System;
using System.Drawing;
using System.Threading.Tasks;
@@ -13,6 +14,10 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
public abstract class BaseImageEnhancer : IDisposable
{
/// <summary>
/// The logger
/// </summary>
private static readonly ILogger Logger = LogManager.GetLogger("ImageEnhancer");
/// <summary>
/// Return true only if the given image for the given item will be enhanced by this enhancer.
/// </summary>
@@ -96,7 +101,7 @@ namespace MediaBrowser.Controller.Providers
var typeName = GetType().Name;
Logger.LogDebugInfo("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--");
Logger.Debug("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--");
try
{
@@ -104,7 +109,7 @@ namespace MediaBrowser.Controller.Providers
}
catch (Exception ex)
{
Logger.LogException("{0} failed enhancing {1}", ex, typeName, item.Name);
Logger.ErrorException("{0} failed enhancing {1}", ex, typeName, item.Name);
throw;
}

15
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
View File

@@ -1,6 +1,7 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,6 +17,20 @@ namespace MediaBrowser.Controller.Providers
public class BaseItemXmlParser<T>
where T : BaseItem, new()
{
/// <summary>
/// The logger
/// </summary>
protected ILogger Logger { get; private set; }
/// <summary>
/// Initializes a new instance of the <see cref="BaseItemXmlParser{T}" /> class.
/// </summary>
/// <param name="logger">The logger.</param>
public BaseItemXmlParser(ILogger logger)
{
Logger = logger;
}
/// <summary>
/// Fetches metadata for an item from one xml file
/// </summary>

4
MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
View File

@@ -66,13 +66,13 @@ namespace MediaBrowser.Controller.Providers
private bool Fetch(BaseItem item, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "folder.xml"));
if (metadataFile.HasValue)
{
var path = metadataFile.Value.Path;
new BaseItemXmlParser<Folder>().Fetch((Folder)item, path, cancellationToken);
new BaseItemXmlParser<Folder>(Logger).Fetch((Folder)item, path, cancellationToken);
SetLastRefreshed(item, DateTime.UtcNow);
return true;
}

4
MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
View File

@@ -75,11 +75,11 @@ namespace MediaBrowser.Controller.Providers.Movies
var boxset = item as BoxSet;
if (boxset != null)
{
new BaseItemXmlParser<BoxSet>().Fetch(boxset, path, cancellationToken);
new BaseItemXmlParser<BoxSet>(Logger).Fetch(boxset, path, cancellationToken);
}
else
{
new BaseItemXmlParser<Movie>().Fetch((Movie)item, path, cancellationToken);
new BaseItemXmlParser<Movie>(Logger).Fetch((Movie)item, path, cancellationToken);
}
SetLastRefreshed(item, DateTime.UtcNow);
return true;

2
MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
View File

@@ -115,7 +115,7 @@ namespace MediaBrowser.Controller.Providers.TV
return false;
}
new EpisodeXmlParser().Fetch(item, metadataFile, cancellationToken);
new EpisodeXmlParser(Logger).Fetch(item, metadataFile, cancellationToken);
return true;
}
}

10
MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Logging;
using System.IO;
using System.Xml;
@@ -9,6 +10,15 @@ namespace MediaBrowser.Controller.Providers.TV
/// </summary>
public class EpisodeXmlParser : BaseItemXmlParser<Episode>
{
/// <summary>
/// Initializes a new instance of the <see cref="EpisodeXmlParser" /> class.
/// </summary>
/// <param name="logger">The logger.</param>
public EpisodeXmlParser(ILogger logger)
: base(logger)
{
}
/// <summary>
/// Fetches the data from XML node.
/// </summary>

2
MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
View File

@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Providers.TV
{
var path = metadataFile.Value.Path;
new SeriesXmlParser().Fetch((Series)item, path, cancellationToken);
new SeriesXmlParser(Logger).Fetch((Series)item, path, cancellationToken);
SetLastRefreshed(item, DateTime.UtcNow);
return true;

15
MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs
View File

@@ -1,7 +1,7 @@
using MediaBrowser.Common.Logging;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Resolvers.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using System;
using System.Xml;
@@ -12,6 +12,15 @@ namespace MediaBrowser.Controller.Providers.TV
/// </summary>
public class SeriesXmlParser : BaseItemXmlParser<Series>
{
/// <summary>
/// Initializes a new instance of the <see cref="BaseItemXmlParser{T}" /> class.
/// </summary>
/// <param name="logger">The logger.</param>
public SeriesXmlParser(ILogger logger)
: base(logger)
{
}
/// <summary>
/// Fetches the data from XML node.
/// </summary>
@@ -74,7 +83,7 @@ namespace MediaBrowser.Controller.Providers.TV
}
else
{
Logger.LogInfo("Unrecognized series status: " + status);
Logger.Info("Unrecognized series status: " + status);
}
}