From 710c1073c10b57099843ce701b7a100285daf4c5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 21 May 2013 00:04:38 -0400 Subject: [PATCH] move audio image extraction back into library scan --- .../Entities/Audio/MusicAlbum.cs | 6 +- .../Providers/MediaInfo/AudioImageProvider.cs | 120 ++++++-- .../Providers/Movies/MovieDbImagesProvider.cs | 6 +- .../Providers/Movies/MovieDbProvider.cs | 23 +- .../Providers/Movies/TmdbPersonProvider.cs | 6 +- .../Providers/TV/RemoteSeriesProvider.cs | 3 +- ...MediaBrowser.Server.Implementations.csproj | 1 - .../ScheduledTasks/AudioImagesTask.cs | 276 ------------------ 8 files changed, 114 insertions(+), 327 deletions(-) delete mode 100644 MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index ebefd0d027..f3fdbb4990 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -118,16 +118,12 @@ namespace MediaBrowser.Controller.Entities.Audio var images = base.Images; string primaryImagePath; - if (images == null || !images.TryGetValue(ImageType.Primary, out primaryImagePath)) + if (!images.TryGetValue(ImageType.Primary, out primaryImagePath)) { var image = Children.Select(c => c.PrimaryImagePath).FirstOrDefault(c => !string.IsNullOrEmpty(c)); if (!string.IsNullOrEmpty(image)) { - if (images == null) - { - images = new Dictionary(); - } images[ImageType.Primary] = image; } } diff --git a/MediaBrowser.Controller/Providers/MediaInfo/AudioImageProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/AudioImageProvider.cs index 85e8722b32..a925ad11d4 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/AudioImageProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/AudioImageProvider.cs @@ -1,9 +1,14 @@ -using MediaBrowser.Controller.Configuration; +using MediaBrowser.Common.IO; +using MediaBrowser.Common.MediaInfo; +using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; +using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System; +using System.Collections.Concurrent; +using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -14,14 +19,41 @@ namespace MediaBrowser.Controller.Providers.MediaInfo /// public class AudioImageProvider : BaseMetadataProvider { + /// + /// Gets or sets the image cache. + /// + /// The image cache. + public FileSystemRepository ImageCache { get; set; } + + /// + /// The _locks + /// + private readonly ConcurrentDictionary _locks = new ConcurrentDictionary(); + + /// + /// The _media encoder + /// + private readonly IMediaEncoder _mediaEncoder; + + /// + /// The _library manager + /// + private readonly ILibraryManager _libraryManager; + /// /// Initializes a new instance of the class. /// /// The log manager. /// The configuration manager. - public AudioImageProvider(ILogManager logManager, IServerConfigurationManager configurationManager) + /// The library manager. + /// The media encoder. + public AudioImageProvider(ILogManager logManager, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IMediaEncoder mediaEncoder) : base(logManager, configurationManager) { + _libraryManager = libraryManager; + _mediaEncoder = mediaEncoder; + + ImageCache = new FileSystemRepository(Kernel.Instance.FFMpegManager.AudioImagesDataPath); } /// @@ -55,42 +87,90 @@ namespace MediaBrowser.Controller.Providers.MediaInfo } /// - /// Needses the refresh internal. + /// Fetches metadata and returns true or false indicating if any work that requires persistence was done /// /// The item. - /// The provider info. - /// true if XXXX, false otherwise - protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo) + /// if set to true [force]. + /// The cancellation token. + /// Task{System.Boolean}. + public override async Task FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken) { - if (!string.IsNullOrEmpty(item.PrimaryImagePath)) + var audio = (Audio)item; + + if (string.IsNullOrEmpty(audio.PrimaryImagePath) && audio.MediaStreams.Any(s => s.Type == MediaStreamType.Video)) { - return false; + try + { + await CreateImagesForSong(audio, cancellationToken).ConfigureAwait(false); + } + catch (Exception ex) + { + Logger.ErrorException("Error extracting image for {0}", ex, item.Name); + } } - return base.NeedsRefreshInternal(item, providerInfo); + + SetLastRefreshed(item, DateTime.UtcNow); + return true; } /// - /// Fetches metadata and returns true or false indicating if any work that requires persistence was done + /// Creates the images for song. /// /// The item. - /// if set to true [force]. /// The cancellation token. - /// Task{System.Boolean}. - public override Task FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken) + /// Task. + /// Can't extract an image unless the audio file has an embedded image. + private async Task CreateImagesForSong(Audio item, CancellationToken cancellationToken) { - if (force || string.IsNullOrEmpty(item.PrimaryImagePath)) + cancellationToken.ThrowIfCancellationRequested(); + + var album = item.Parent as MusicAlbum; + + var filename = item.Album ?? string.Empty; + filename += item.Artist ?? string.Empty; + filename += album == null ? item.Id.ToString("N") + item.DateModified.Ticks : album.Id.ToString("N") + album.DateModified.Ticks; + + var path = ImageCache.GetResourcePath(filename + "_primary", ".jpg"); + + if (!ImageCache.ContainsFilePath(path)) { - var album = item.ResolveArgs.Parent as MusicAlbum; + var semaphore = GetLock(path); - if (album != null) + // Acquire a lock + await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false); + + // Check again + if (!ImageCache.ContainsFilePath(path)) + { + try + { + await _mediaEncoder.ExtractImage(new[] { item.Path }, InputType.AudioFile, null, path, cancellationToken).ConfigureAwait(false); + } + finally + { + semaphore.Release(); + } + + // Image is already in the cache + item.PrimaryImagePath = path; + + await _libraryManager.UpdateItem(item, cancellationToken).ConfigureAwait(false); + } + else { - // First try to use the parent's image - item.PrimaryImagePath = item.ResolveArgs.Parent.PrimaryImagePath; + semaphore.Release(); } } + } - SetLastRefreshed(item, DateTime.UtcNow); - return TrueTaskResult; + /// + /// Gets the lock. + /// + /// The filename. + /// SemaphoreSlim. + private SemaphoreSlim GetLock(string filename) + { + return _locks.GetOrAdd(filename, key => new SemaphoreSlim(1, 1)); } } } diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs index f62ea24835..4fdc2a17f2 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs @@ -153,8 +153,7 @@ namespace MediaBrowser.Controller.Providers.Movies } // Don't refresh if we already have both poster and backdrop and we're not refreshing images - if (item.LocationType == LocationType.FileSystem && !ConfigurationManager.Configuration.RefreshItemImages - && item.HasLocalImage("folder") && item.HasLocalImage("backdrop")) + if (!ConfigurationManager.Configuration.RefreshItemImages && item.HasImage(ImageType.Primary) && item.BackdropImagePaths.Count > 0) { return false; } @@ -211,8 +210,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = string.Format(GetImages, id, MovieDbProvider.ApiKey, item is BoxSet ? "collection" : "movie"), CancellationToken = cancellationToken, - AcceptHeader = MovieDbProvider.AcceptHeader, - EnableResponseCache = true + AcceptHeader = MovieDbProvider.AcceptHeader }).ConfigureAwait(false)) { diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs index aeb8992e6c..fac7dfb0c8 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs @@ -175,8 +175,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = string.Format(TmdbConfigUrl, ApiKey), CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -475,8 +474,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url3, CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -509,8 +507,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url3, CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -549,8 +546,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url3, CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -632,8 +628,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url, CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -710,8 +705,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url, CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -732,8 +726,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url, CancellationToken = cancellationToken, - AcceptHeader = AcceptHeader, - EnableResponseCache = true + AcceptHeader = AcceptHeader }).ConfigureAwait(false)) { @@ -896,7 +889,7 @@ namespace MediaBrowser.Controller.Providers.Movies try { // Limit to three requests per second - var diff = 500 - (DateTime.Now - _lastRequestDate).TotalMilliseconds; + var diff = 340 - (DateTime.Now - _lastRequestDate).TotalMilliseconds; if (diff > 0) { diff --git a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs index 5cf5fcc18d..b909986437 100644 --- a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs @@ -145,8 +145,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url, CancellationToken = cancellationToken, - AcceptHeader = MovieDbProvider.AcceptHeader, - EnableResponseCache = true + AcceptHeader = MovieDbProvider.AcceptHeader }).ConfigureAwait(false)) { @@ -172,8 +171,7 @@ namespace MediaBrowser.Controller.Providers.Movies { Url = url, CancellationToken = cancellationToken, - AcceptHeader = MovieDbProvider.AcceptHeader, - EnableResponseCache = true + AcceptHeader = MovieDbProvider.AcceptHeader }).ConfigureAwait(false)) { diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs index 82ff0b98e9..f6a77026b8 100644 --- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs @@ -590,8 +590,7 @@ namespace MediaBrowser.Controller.Providers.TV { Url = url, ResourcePool = TvDbResourcePool, - CancellationToken = cancellationToken, - EnableResponseCache = true + CancellationToken = cancellationToken }).ConfigureAwait(false)) { diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 587ee0346e..e1f5a1aa30 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -151,7 +151,6 @@ - diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs deleted file mode 100644 index c56a2b54a6..0000000000 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs +++ /dev/null @@ -1,276 +0,0 @@ -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; -using MediaBrowser.Model.Logging; -using MoreLinq; - -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; - - private readonly ILogger _logger; - - - /// - /// The _locks - /// - private readonly ConcurrentDictionary _locks = new ConcurrentDictionary(); - - private readonly List