From 30d6e2cd6ce0702faaec73b7ffb59d9844fb6967 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 11:10:12 -0400 Subject: made library scan a bit more conservative --- .../MediaBrowser.Server.Implementations.csproj | 2 + .../MediaEncoder/MediaEncoder.cs | 17 +- .../ScheduledTasks/AudioImagesTask.cs | 178 ++++++++++++++ .../ScheduledTasks/ChapterImagesTask.cs | 5 +- .../ScheduledTasks/VideoImagesTask.cs | 265 +++++++++++++++++++++ 5 files changed, 463 insertions(+), 4 deletions(-) create mode 100644 MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs create mode 100644 MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 66ec69f08..286710bc3 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -153,7 +153,9 @@ + + diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index 32c18822f..08e2eb774 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -50,12 +50,12 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder /// /// The video image resource pool /// - private readonly SemaphoreSlim _videoImageResourcePool = new SemaphoreSlim(2, 2); + private readonly SemaphoreSlim _videoImageResourcePool = new SemaphoreSlim(1, 1); /// /// The audio image resource pool /// - private readonly SemaphoreSlim _audioImageResourcePool = new SemaphoreSlim(3, 3); + private readonly SemaphoreSlim _audioImageResourcePool = new SemaphoreSlim(2, 2); /// /// The _subtitle extraction resource pool @@ -65,7 +65,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder /// /// The FF probe resource pool /// - private readonly SemaphoreSlim _ffProbeResourcePool = new SemaphoreSlim(3, 3); + private readonly SemaphoreSlim _ffProbeResourcePool = new SemaphoreSlim(2, 2); /// /// Gets or sets the versioned directory path. @@ -370,7 +370,18 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder try { process.Start(); + } + catch (Exception ex) + { + _ffProbeResourcePool.Release(); + + _logger.ErrorException("Error starting ffprobe", ex); + throw; + } + + try + { Task standardErrorReadTask = null; // MUST read both stdout and stderr asynchronously or a deadlock may occurr diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs new file mode 100644 index 000000000..db809a47b --- /dev/null +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs @@ -0,0 +1,178 @@ +using MediaBrowser.Common.IO; +using MediaBrowser.Common.MediaInfo; +using MediaBrowser.Common.ScheduledTasks; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities.Audio; +using MediaBrowser.Controller.Library; +using MediaBrowser.Model.Entities; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.ScheduledTasks +{ + /// + /// Class AudioImagesTask + /// + public class AudioImagesTask : IScheduledTask + { + /// + /// Gets or sets the image cache. + /// + /// The image cache. + public FileSystemRepository ImageCache { get; set; } + + /// + /// The _library manager + /// + private readonly ILibraryManager _libraryManager; + /// + /// The _media encoder + /// + private readonly IMediaEncoder _mediaEncoder; + + /// + /// The _locks + /// + private readonly ConcurrentDictionary _locks = new ConcurrentDictionary(); + + /// + /// Initializes a new instance of the class. + /// + /// The library manager. + /// The media encoder. + public AudioImagesTask(ILibraryManager libraryManager, IMediaEncoder mediaEncoder) + { + _libraryManager = libraryManager; + _mediaEncoder = mediaEncoder; + + ImageCache = new FileSystemRepository(Kernel.Instance.FFMpegManager.AudioImagesDataPath); + } + + /// + /// Gets the name of the task + /// + /// The name. + public string Name + { + get { return "Audio image extraction"; } + } + + /// + /// Gets the description. + /// + /// The description. + public string Description + { + get { return "Extracts images from audio files that do not have external images."; } + } + + /// + /// Gets the category. + /// + /// The category. + public string Category + { + get { return "Library"; } + } + + /// + /// Executes the task + /// + /// The cancellation token. + /// The progress. + /// Task. + public async Task Execute(CancellationToken cancellationToken, IProgress progress) + { + var items = _libraryManager.RootFolder.RecursiveChildren + .OfType private readonly ILogger _logger; + /// + /// The _library manager + /// private readonly ILibraryManager _libraryManager; /// @@ -99,7 +102,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// The name. public string Name { - get { return "Create video chapter thumbnails"; } + get { return "Chapter image extraction"; } } /// diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs new file mode 100644 index 000000000..a82c22fe9 --- /dev/null +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs @@ -0,0 +1,265 @@ +using MediaBrowser.Common.IO; +using MediaBrowser.Common.MediaInfo; +using MediaBrowser.Common.ScheduledTasks; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Providers.MediaInfo; +using MediaBrowser.Model.Entities; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.ScheduledTasks +{ + /// + /// Class VideoImagesTask + /// + public class VideoImagesTask : IScheduledTask + { + /// + /// Gets or sets the image cache. + /// + /// The image cache. + public FileSystemRepository ImageCache { get; set; } + + /// + /// The _library manager + /// + private readonly ILibraryManager _libraryManager; + /// + /// The _media encoder + /// + private readonly IMediaEncoder _mediaEncoder; + + /// + /// The _iso manager + /// + private readonly IIsoManager _isoManager; + + /// + /// The _locks + /// + private readonly ConcurrentDictionary _locks = new ConcurrentDictionary(); + + /// + /// Initializes a new instance of the class. + /// + /// The library manager. + /// The media encoder. + /// The iso manager. + public VideoImagesTask(ILibraryManager libraryManager, IMediaEncoder mediaEncoder, IIsoManager isoManager) + { + _libraryManager = libraryManager; + _mediaEncoder = mediaEncoder; + _isoManager = isoManager; + + ImageCache = new FileSystemRepository(Kernel.Instance.FFMpegManager.VideoImagesDataPath); + } + + /// + /// Gets the name of the task + /// + /// The name. + public string Name + { + get { return "Video image extraction"; } + } + + /// + /// Gets the description. + /// + /// The description. + public string Description + { + get { return "Extracts images from audio files that do not have external images."; } + } + + /// + /// Gets the category. + /// + /// The category. + public string Category + { + get { return "Library"; } + } + + /// + /// Executes the task + /// + /// The cancellation token. + /// The progress. + /// Task. + public async Task Execute(CancellationToken cancellationToken, IProgress progress) + { + var items = _libraryManager.RootFolder.RecursiveChildren + .OfType