diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 18:09:48 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 18:09:48 -0400 |
| commit | f5620c81beedc73cfec486adfd74b640961b3ccc (patch) | |
| tree | e32e765e168b241e2fbeb44f60759d0c188e62ac /MediaBrowser.Controller/Providers | |
| parent | 8308528e6ccb834e5fabe1ea1de7e2aa43265783 (diff) | |
removed unneeded startup processes
Diffstat (limited to 'MediaBrowser.Controller/Providers')
3 files changed, 13 insertions, 17 deletions
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs index eac10d522..2c1019288 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs @@ -21,13 +21,13 @@ namespace MediaBrowser.Controller.Providers.MediaInfo public abstract class BaseFFProbeProvider<T> : BaseFFMpegProvider<T> where T : BaseItem { - protected BaseFFProbeProvider(ILogManager logManager, IServerConfigurationManager configurationManager, IMediaEncoder mediaEncoder, IProtobufSerializer protobufSerializer) + protected BaseFFProbeProvider(ILogManager logManager, IServerConfigurationManager configurationManager, IMediaEncoder mediaEncoder, IJsonSerializer jsonSerializer) : base(logManager, configurationManager, mediaEncoder) { - ProtobufSerializer = protobufSerializer; + JsonSerializer = jsonSerializer; } - protected readonly IProtobufSerializer ProtobufSerializer; + protected readonly IJsonSerializer JsonSerializer; /// <summary> /// Gets or sets the FF probe cache. @@ -135,14 +135,14 @@ namespace MediaBrowser.Controller.Providers.MediaInfo var resourceName = item.Id + "_" + lastDateModified.Ticks + "_" + MediaEncoder.Version; // Forumulate the cache file path - var cacheFilePath = cache.GetResourcePath(resourceName, ".pb"); + var cacheFilePath = cache.GetResourcePath(resourceName, ".js"); cancellationToken.ThrowIfCancellationRequested(); // Avoid File.Exists by just trying to deserialize try { - return ProtobufSerializer.DeserializeFromFile<MediaInfoResult>(cacheFilePath); + return JsonSerializer.DeserializeFromFile<MediaInfoResult>(cacheFilePath); } catch (FileNotFoundException) { @@ -161,7 +161,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo var info = await MediaEncoder.GetMediaInfo(inputPath, type, cancellationToken).ConfigureAwait(false); - ProtobufSerializer.SerializeToFile(info, cacheFilePath); + JsonSerializer.SerializeToFile(info, cacheFilePath); return info; } diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs index e767d5196..479a2b1af 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs @@ -18,8 +18,8 @@ namespace MediaBrowser.Controller.Providers.MediaInfo /// </summary> public class FFProbeAudioInfoProvider : BaseFFProbeProvider<Audio> { - public FFProbeAudioInfoProvider(ILogManager logManager, IServerConfigurationManager configurationManager, IMediaEncoder mediaEncoder, IProtobufSerializer protobufSerializer) - : base(logManager, configurationManager, mediaEncoder, protobufSerializer) + public FFProbeAudioInfoProvider(ILogManager logManager, IServerConfigurationManager configurationManager, IMediaEncoder mediaEncoder, IJsonSerializer jsonSerializer) + : base(logManager, configurationManager, mediaEncoder, jsonSerializer) { } diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs index 07b71576b..74c641374 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs @@ -21,8 +21,8 @@ namespace MediaBrowser.Controller.Providers.MediaInfo /// </summary> public class FFProbeVideoInfoProvider : BaseFFProbeProvider<Video> { - public FFProbeVideoInfoProvider(IIsoManager isoManager, IBlurayExaminer blurayExaminer, IProtobufSerializer protobufSerializer, ILogManager logManager, IServerConfigurationManager configurationManager, IMediaEncoder mediaEncoder) - : base(logManager, configurationManager, mediaEncoder, protobufSerializer) + public FFProbeVideoInfoProvider(IIsoManager isoManager, IBlurayExaminer blurayExaminer, IJsonSerializer jsonSerializer, ILogManager logManager, IServerConfigurationManager configurationManager, IMediaEncoder mediaEncoder) + : base(logManager, configurationManager, mediaEncoder, jsonSerializer) { if (isoManager == null) { @@ -32,10 +32,6 @@ namespace MediaBrowser.Controller.Providers.MediaInfo { throw new ArgumentNullException("blurayExaminer"); } - if (protobufSerializer == null) - { - throw new ArgumentNullException("protobufSerializer"); - } _blurayExaminer = blurayExaminer; _isoManager = isoManager; @@ -323,19 +319,19 @@ namespace MediaBrowser.Controller.Providers.MediaInfo // Get the path to the cache file var cacheName = item.Id + "_" + item.DateModified.Ticks; - var cacheFile = bdInfoCache.GetResourcePath(cacheName, ".pb"); + var cacheFile = bdInfoCache.GetResourcePath(cacheName, ".js"); BlurayDiscInfo result; try { - result = ProtobufSerializer.DeserializeFromFile<BlurayDiscInfo>(cacheFile); + result = JsonSerializer.DeserializeFromFile<BlurayDiscInfo>(cacheFile); } catch (FileNotFoundException) { result = GetBDInfo(inputPath); - ProtobufSerializer.SerializeToFile(result, cacheFile); + JsonSerializer.SerializeToFile(result, cacheFile); } cancellationToken.ThrowIfCancellationRequested(); |
