open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix provider logging messages

Browse Source
pull/702/head
LukePulverenti 11 years ago
parent a6bda6c862
commit 72051998e7
27 changed files with 112 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
MediaBrowser.Controller/Kernel.cs
Unescape View File

@ -178,8 +178,6 @@ namespace MediaBrowser.Controller
BaseItem.Logger = logger;
Ratings.Logger = logger;
LocalizedStrings.Logger = logger;
// For now, until this can become an interface
BaseMetadataProvider.Logger = logger;
}
/// <summary>

8
MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
Unescape View File

@ -16,7 +16,8 @@ namespace MediaBrowser.Controller.Providers
/// Gets the logger.
/// </summary>
/// <value>The logger.</value>
protected static internal ILogger Logger { get; internal set; }
protected ILogger Logger { get; set; }
protected ILogManager LogManager { get; set; }
// Cache these since they will be used a lot
/// <summary>
@ -102,8 +103,11 @@ namespace MediaBrowser.Controller.Providers
/// <summary>
/// Initializes a new instance of the <see cref="BaseMetadataProvider" /> class.
/// </summary>
protected BaseMetadataProvider()
protected BaseMetadataProvider(ILogManager logManager)
{
Logger = logManager.GetLogger(GetType().Name);
LogManager = logManager;
Initialize();
}

5
MediaBrowser.Controller/Providers/FanartBaseProvider.cs
Unescape View File

@ -1,5 +1,6 @@
using MediaBrowser.Controller.Entities;
using System;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@ -34,6 +35,10 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
protected const string APIKey = "5c6b04c68e904cfed1e6cbc9a9e683d4";
protected FanartBaseProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Needses the refresh internal.
/// </summary>

5
MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
Unescape View File

@ -4,6 +4,7 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@ -12,6 +13,10 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
public class FolderProviderFromXml : BaseMetadataProvider
{
public FolderProviderFromXml(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
Unescape View File

@ -7,6 +7,7 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@ -15,6 +16,10 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
public class ImageFromMediaLocationProvider : BaseMetadataProvider
{
public ImageFromMediaLocationProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
Unescape View File

@ -4,6 +4,7 @@ using System;
using System.Globalization;
using System.IO;
using System.Linq;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@ -12,6 +13,10 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
public class ImagesByNameProvider : ImageFromMediaLocationProvider
{
public ImagesByNameProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegImageProvider.cs
Unescape View File

@ -1,10 +1,15 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
public abstract class BaseFFMpegImageProvider<T> : BaseFFMpegProvider<T>
where T : BaseItem
{
protected BaseFFMpegImageProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Gets the priority.
/// </summary>

5
MediaBrowser.Controller/Providers/MediaInfo/BaseFFMpegProvider.cs
Unescape View File

@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using System;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@ -13,6 +14,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
public abstract class BaseFFMpegProvider<T> : BaseMetadataProvider
where T : BaseItem
{
protected BaseFFMpegProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
Unescape View File

@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@ -18,6 +19,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
public abstract class BaseFFProbeProvider<T> : BaseFFMpegProvider<T>
where T : BaseItem
{
protected BaseFFProbeProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Gets or sets the FF probe cache.
/// </summary>

6
MediaBrowser.Controller/Providers/MediaInfo/FFMpegAudioImageProvider.cs
Unescape View File

@ -5,6 +5,7 @@ using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@ -13,7 +14,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
/// </summary>
public class FFMpegAudioImageProvider : BaseFFMpegImageProvider<Audio>
{
public FFMpegAudioImageProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Fetches metadata and returns true or false indicating if any work that requires persistence was done
/// </summary>

8
MediaBrowser.Controller/Providers/MediaInfo/FFMpegVideoImageProvider.cs
Unescape View File

@ -4,13 +4,14 @@ using MediaBrowser.Model.Entities;
using System;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
/// <summary>
/// Uses ffmpeg to create video images
/// </summary>
public class FFMpegVideoImageProvider : BaseFFMpegImageProvider<Video>
public class FfMpegVideoImageProvider : BaseFFMpegImageProvider<Video>
{
/// <summary>
/// The _iso manager
@ -18,10 +19,11 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
private readonly IIsoManager _isoManager;
/// <summary>
/// Initializes a new instance of the <see cref="FFMpegVideoImageProvider" /> class.
/// Initializes a new instance of the <see cref="FfMpegVideoImageProvider" /> class.
/// </summary>
/// <param name="isoManager">The iso manager.</param>
public FFMpegVideoImageProvider(IIsoManager isoManager)
public FfMpegVideoImageProvider(IIsoManager isoManager, ILogManager logManager)
: base(logManager)
{
_isoManager = isoManager;
}

5
MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
Unescape View File

@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.MediaInfo
{
@ -16,6 +17,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
/// </summary>
public class FFProbeAudioInfoProvider : BaseFFProbeProvider<Audio>
{
public FFProbeAudioInfoProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Gets the name of the cache directory.
/// </summary>

5
MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
Unescape View File

@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.MediaInfo;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using System;
@ -48,8 +49,8 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
/// <param name="blurayExaminer">The bluray examiner.</param>
/// <param name="protobufSerializer">The protobuf serializer.</param>
/// <exception cref="System.ArgumentNullException">blurayExaminer</exception>
public FFProbeVideoInfoProvider(IIsoManager isoManager, IBlurayExaminer blurayExaminer, IProtobufSerializer protobufSerializer)
: base()
public FFProbeVideoInfoProvider(IIsoManager isoManager, IBlurayExaminer blurayExaminer, IProtobufSerializer protobufSerializer, ILogManager logManager)
: base(logManager)
{
if (isoManager == null)
{

5
MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
Unescape View File

@ -3,6 +3,7 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using System;
using System.IO;
@ -23,8 +24,8 @@ namespace MediaBrowser.Controller.Providers.Movies
/// <value>The HTTP client.</value>
protected IHttpClient HttpClient { get; private set; }
public FanArtMovieProvider(IHttpClient httpClient)
: base()
public FanArtMovieProvider(IHttpClient httpClient, ILogManager logManager)
: base(logManager)
{
if (httpClient == null)
{

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

@ -49,8 +49,8 @@ namespace MediaBrowser.Controller.Providers.Movies
/// <param name="jsonSerializer">The json serializer.</param>
/// <param name="httpClient">The HTTP client.</param>
/// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
public MovieDbProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient)
: base()
public MovieDbProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
: base(logManager)
{
if (jsonSerializer == null)
{
@ -202,7 +202,7 @@ namespace MediaBrowser.Controller.Providers.Movies
{
//in addition to ours, we need to set the last refreshed time for the local data provider
//so it won't see the new files we download and process them all over again
if (JsonProvider == null) JsonProvider = new MovieProviderFromJson(HttpClient, JsonSerializer);
if (JsonProvider == null) JsonProvider = new MovieProviderFromJson(HttpClient, JsonSerializer, LogManager);
var data = item.ProviderData.GetValueOrDefault(JsonProvider.Id, new BaseProviderInfo { ProviderId = JsonProvider.Id });
data.LastRefreshed = value;
item.ProviderData[JsonProvider.Id] = data;

4
MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
Unescape View File

@ -1,5 +1,6 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using System;
using System.IO;
@ -13,7 +14,8 @@ namespace MediaBrowser.Controller.Providers.Movies
/// </summary>
public class MovieProviderFromJson : MovieDbProvider
{
public MovieProviderFromJson(IHttpClient httpClient, IJsonSerializer jsonSerializer) : base(jsonSerializer, httpClient)
public MovieProviderFromJson(IHttpClient httpClient, IJsonSerializer jsonSerializer, ILogManager logManager)
: base(jsonSerializer, httpClient, logManager)
{
}

5
MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
Unescape View File

@ -4,6 +4,7 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.Movies
{
@ -12,6 +13,10 @@ namespace MediaBrowser.Controller.Providers.Movies
/// </summary>
public class MovieProviderFromXml : BaseMetadataProvider
{
public MovieProviderFromXml(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
Unescape View File

@ -1,5 +1,6 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using System;
using System.IO;
@ -13,8 +14,8 @@ namespace MediaBrowser.Controller.Providers.Movies
/// </summary>
class PersonProviderFromJson : TmdbPersonProvider
{
public PersonProviderFromJson(IHttpClient httpClient, IJsonSerializer jsonSerializer)
: base(httpClient, jsonSerializer)
public PersonProviderFromJson(IHttpClient httpClient, IJsonSerializer jsonSerializer, ILogManager logManager)
: base(httpClient, jsonSerializer, logManager)
{
}

5
MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
Unescape View File

@ -1,6 +1,7 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Serialization;
using System;
@ -42,8 +43,8 @@ namespace MediaBrowser.Controller.Providers.Movies
/// <param name="httpClient">The HTTP client.</param>
/// <param name="jsonSerializer">The json serializer.</param>
/// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
public TmdbPersonProvider(IHttpClient httpClient, IJsonSerializer jsonSerializer)
: base()
public TmdbPersonProvider(IHttpClient httpClient, IJsonSerializer jsonSerializer, ILogManager logManager)
: base(logManager)
{
if (jsonSerializer == null)
{

5
MediaBrowser.Controller/Providers/SortNameProvider.cs
Unescape View File

@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities.TV;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers
{
@ -12,6 +13,10 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
public class SortNameProvider : BaseMetadataProvider
{
public SortNameProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
Unescape View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.TV
{
@ -13,6 +14,10 @@ namespace MediaBrowser.Controller.Providers.TV
/// </summary>
public class EpisodeImageFromMediaLocationProvider : BaseMetadataProvider
{
public EpisodeImageFromMediaLocationProvider(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

5
MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
Unescape View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.TV
{
@ -13,6 +14,10 @@ namespace MediaBrowser.Controller.Providers.TV
/// </summary>
public class EpisodeProviderFromXml : BaseMetadataProvider
{
public EpisodeProviderFromXml(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

7
MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
Unescape View File

@ -3,6 +3,7 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using System;
using System.IO;
@ -12,7 +13,7 @@ using System.Xml;
namespace MediaBrowser.Controller.Providers.TV
{
class FanArtTVProvider : FanartBaseProvider
class FanArtTvProvider : FanartBaseProvider
{
protected string FanArtBaseUrl = "http://api.fanart.tv/webservice/series/{0}/{1}/xml/all/1/1";
@ -22,8 +23,8 @@ namespace MediaBrowser.Controller.Providers.TV
/// <value>The HTTP client.</value>
protected IHttpClient HttpClient { get; private set; }
public FanArtTVProvider(IHttpClient httpClient)
: base()
public FanArtTvProvider(IHttpClient httpClient, ILogManager logManager)
: base(logManager)
{
if (httpClient == null)
{

5
MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
Unescape View File

@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Resolvers.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using System;
using System.IO;
@ -26,8 +27,8 @@ namespace MediaBrowser.Controller.Providers.TV
/// <value>The HTTP client.</value>
protected IHttpClient HttpClient { get; private set; }
public RemoteEpisodeProvider(IHttpClient httpClient)
: base()
public RemoteEpisodeProvider(IHttpClient httpClient, ILogManager logManager)
: base(logManager)
{
if (httpClient == null)
{

5
MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
Unescape View File

@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Resolvers.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using System;
using System.Collections.Generic;
@ -24,8 +25,8 @@ namespace MediaBrowser.Controller.Providers.TV
/// <value>The HTTP client.</value>
protected IHttpClient HttpClient { get; private set; }
public RemoteSeasonProvider(IHttpClient httpClient)
: base()
public RemoteSeasonProvider(IHttpClient httpClient, ILogManager logManager)
: base(logManager)
{
if (httpClient == null)
{

5
MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
Unescape View File

@ -5,6 +5,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Resolvers.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using System;
using System.Collections.Generic;
@ -28,8 +29,8 @@ namespace MediaBrowser.Controller.Providers.TV
/// <value>The HTTP client.</value>
protected IHttpClient HttpClient { get; private set; }
public RemoteSeriesProvider(IHttpClient httpClient)
: base()
public RemoteSeriesProvider(IHttpClient httpClient, ILogManager logManager)
: base(logManager)
{
if (httpClient == null)
{

5
MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
Unescape View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Controller.Providers.TV
{
@ -13,6 +14,10 @@ namespace MediaBrowser.Controller.Providers.TV
/// </summary>
public class SeriesProviderFromXml : BaseMetadataProvider
{
public SeriesProviderFromXml(ILogManager logManager) : base(logManager)
{
}
/// <summary>
/// Supportses the specified item.
/// </summary>

Write Preview
Loading…
Cancel
Save