From 8b3485968f183777d5727e93413f690d1493316f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 2 Feb 2014 14:31:56 -0500 Subject: [PATCH] support saving new metadata configuration --- .../Entities/Audio/IHasAlbumArtist.cs | 2 +- .../Books/BookMetadataService.cs | 48 +++++++++++++++++++ .../Genres/GenreMetadataService.cs | 2 - .../Music/AlbumMetadataService.cs | 6 ++- .../Music/ArtistMetadataService.cs | 1 - .../People/PersonMetadataService.cs | 2 - MediaBrowser.Providers/ProviderUtils.cs | 17 +++++++ 7 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 MediaBrowser.Providers/Books/BookMetadataService.cs diff --git a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs index 77bd3fd66f..7448e44f06 100644 --- a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs +++ b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs @@ -3,7 +3,7 @@ namespace MediaBrowser.Controller.Entities.Audio { public interface IHasAlbumArtist { - string AlbumArtist { get; } + string AlbumArtist { get; set; } } public interface IHasArtist diff --git a/MediaBrowser.Providers/Books/BookMetadataService.cs b/MediaBrowser.Providers/Books/BookMetadataService.cs new file mode 100644 index 0000000000..6a06e3c8cb --- /dev/null +++ b/MediaBrowser.Providers/Books/BookMetadataService.cs @@ -0,0 +1,48 @@ +using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Providers; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; +using MediaBrowser.Providers.Manager; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Providers.Books +{ + public class BookMetadataService : MetadataService + { + private readonly ILibraryManager _libraryManager; + + public BookMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IProviderRepository providerRepo, IFileSystem fileSystem, ILibraryManager libraryManager) + : base(serverConfigurationManager, logger, providerManager, providerRepo, fileSystem) + { + _libraryManager = libraryManager; + } + + /// + /// Merges the specified source. + /// + /// The source. + /// The target. + /// The locked fields. + /// if set to true [replace data]. + /// if set to true [merge metadata settings]. + protected override void MergeData(Book source, Book target, List lockedFields, bool replaceData, bool mergeMetadataSettings) + { + ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); + + if (replaceData || string.IsNullOrEmpty(target.SeriesName)) + { + target.SeriesName = source.SeriesName; + } + } + + protected override Task SaveItem(Book item, ItemUpdateType reason, CancellationToken cancellationToken) + { + return _libraryManager.UpdateItem(item, reason, cancellationToken); + } + } +} diff --git a/MediaBrowser.Providers/Genres/GenreMetadataService.cs b/MediaBrowser.Providers/Genres/GenreMetadataService.cs index e2437fed16..da88457bd2 100644 --- a/MediaBrowser.Providers/Genres/GenreMetadataService.cs +++ b/MediaBrowser.Providers/Genres/GenreMetadataService.cs @@ -1,10 +1,8 @@ using MediaBrowser.Common.IO; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Providers.Manager; diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs index 8418c38988..8b9ebdc702 100644 --- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs +++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs @@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Providers.Manager; @@ -36,6 +35,11 @@ namespace MediaBrowser.Providers.Music protected override void MergeData(MusicAlbum source, MusicAlbum target, List lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); + + if (replaceData || target.Artists.Count == 0) + { + target.Artists = source.Artists; + } } protected override Task SaveItem(MusicAlbum item, ItemUpdateType reason, CancellationToken cancellationToken) diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs index 6e4093faad..e91679607d 100644 --- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs +++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs @@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Providers.Manager; diff --git a/MediaBrowser.Providers/People/PersonMetadataService.cs b/MediaBrowser.Providers/People/PersonMetadataService.cs index ba7f3a7387..b3d619918f 100644 --- a/MediaBrowser.Providers/People/PersonMetadataService.cs +++ b/MediaBrowser.Providers/People/PersonMetadataService.cs @@ -1,10 +1,8 @@ using MediaBrowser.Common.IO; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Providers.Manager; diff --git a/MediaBrowser.Providers/ProviderUtils.cs b/MediaBrowser.Providers/ProviderUtils.cs index a04df581c6..5436434746 100644 --- a/MediaBrowser.Providers/ProviderUtils.cs +++ b/MediaBrowser.Providers/ProviderUtils.cs @@ -1,4 +1,5 @@ using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Model.Entities; using System.Collections.Generic; @@ -156,6 +157,8 @@ namespace MediaBrowser.Providers target.ProviderIds[id.Key] = id.Value; } + MergeAlbumArtist(source, target, lockedFields, replaceData); + if (mergeMetadataSettings) { target.ForcedSortName = source.ForcedSortName; @@ -181,5 +184,19 @@ namespace MediaBrowser.Providers } } } + + private static void MergeAlbumArtist(BaseItem source, BaseItem target, List lockedFields, bool replaceData) + { + var sourceHasAlbumArtist = source as IHasAlbumArtist; + var targetHasAlbumArtist = target as IHasAlbumArtist; + + if (sourceHasAlbumArtist != null && targetHasAlbumArtist != null) + { + if (replaceData || string.IsNullOrEmpty(targetHasAlbumArtist.AlbumArtist)) + { + targetHasAlbumArtist.AlbumArtist = sourceHasAlbumArtist.AlbumArtist; + } + } + } } }