diff options
5 files changed, 17 insertions, 9 deletions
diff --git a/Emby.Server.Implementations/Images/BaseFolderImageProvider.cs b/Emby.Server.Implementations/Images/BaseFolderImageProvider.cs index 04d90af3c..f9c10ba09 100644 --- a/Emby.Server.Implementations/Images/BaseFolderImageProvider.cs +++ b/Emby.Server.Implementations/Images/BaseFolderImageProvider.cs @@ -11,7 +11,6 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; using MediaBrowser.Model.IO; -using MediaBrowser.Model.Querying; namespace Emby.Server.Implementations.Images { @@ -33,12 +32,12 @@ namespace Emby.Server.Implementations.Images Parent = item, Recursive = true, DtoOptions = new DtoOptions(true), - ImageTypes = new ImageType[] { ImageType.Primary }, - OrderBy = new (ItemSortBy, SortOrder)[] - { + ImageTypes = [ImageType.Primary], + OrderBy = + [ (ItemSortBy.IsFolder, SortOrder.Ascending), (ItemSortBy.SortName, SortOrder.Ascending) - }, + ], Limit = 1 }); } diff --git a/Emby.Server.Implementations/Images/MusicAlbumImageProvider.cs b/Emby.Server.Implementations/Images/MusicAlbumImageProvider.cs index ce8367363..98e26a322 100644 --- a/Emby.Server.Implementations/Images/MusicAlbumImageProvider.cs +++ b/Emby.Server.Implementations/Images/MusicAlbumImageProvider.cs @@ -1,7 +1,10 @@ #pragma warning disable CS1591 +using System.Collections.Generic; +using System.Linq; using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Drawing; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; @@ -15,5 +18,13 @@ namespace Emby.Server.Implementations.Images : base(fileSystem, providerManager, applicationPaths, imageProcessor, libraryManager) { } + + protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item) + { + var items = base.GetItemsWithImages(item); + + // Ignore any folders because they can have generated collages + return items.Where(i => i is not Folder).ToList(); + } } } diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index 5b3349108..a0aae8769 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -169,8 +169,7 @@ namespace MediaBrowser.Controller.Entities.Audio var childUpdateType = ItemUpdateType.None; - // Refresh songs only and not m3u files in album folder - foreach (var item in items.OfType<Audio>()) + foreach (var item in items) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index d7990e2a7..cb8a867f1 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Jellyfin.Data.Enums; using Jellyfin.Extensions; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; diff --git a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs index 6256bfa21..bff8fdac5 100644 --- a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs +++ b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs @@ -54,7 +54,7 @@ namespace MediaBrowser.Providers.Playlists item.LinkedChildren = items; - return Task.FromResult(ItemUpdateType.None); + return Task.FromResult(ItemUpdateType.MetadataImport); } private IEnumerable<LinkedChild> GetItems(string path, string extension) |