Merge pull request #16520 from beateixeira04/PlaylistPrimaryImageFix

fix(dto): prefer PlaylistsFolder primary image for playlists tiles
2026-06-08 08:48:48 +01:00 · 2026-06-07 22:56:35 +02:00
parent f56670bdce 8ceb8c23ce
commit 003f01a99a
2 changed files with 152 additions and 0 deletions
--- a/tests/Jellyfin.Server.Implementations.Tests/Dto/DtoServiceImageInheritanceTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Dto/DtoServiceImageInheritanceTests.cs
@@ -0,0 +1,137 @@
+using System;
+using Emby.Server.Implementations.Dto;
+using Emby.Server.Implementations.Playlists;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Common;
+using MediaBrowser.Controller.Chapters;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Controller.Trickplay;
+using MediaBrowser.Model.Entities;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.Dto;
+
+public class DtoServiceImageInheritanceTests
+{
+    [Fact]
+    public void GetBaseItemDto_PlaylistsUserViewWithDisplayParentPrimary_UsesDisplayParentPrimaryImage()
+    {
+        var displayParent = new PlaylistsFolder
+        {
+            Id = Guid.NewGuid(),
+            ImageInfos =
+            [
+                new ItemImageInfo
+                {
+                    Type = ImageType.Primary,
+                    Path = "/images/playlists-custom.jpg",
+                    DateModified = new DateTime(2026, 1, 15, 12, 0, 0, DateTimeKind.Utc)
+                }
+            ]
+        };
+
+        var userView = new UserView
+        {
+            Id = Guid.NewGuid(),
+            ViewType = CollectionType.playlists,
+            DisplayParentId = displayParent.Id,
+            ImageInfos =
+            [
+                new ItemImageInfo
+                {
+                    Type = ImageType.Primary,
+                    Path = "/images/generated.png",
+                    DateModified = new DateTime(2026, 1, 10, 12, 0, 0, DateTimeKind.Utc)
+                }
+            ]
+        };
+
+        var dtoService = BuildDtoService(displayParent);
+
+        var dto = dtoService.GetBaseItemDto(userView, new DtoOptions(false));
+
+        Assert.NotNull(dto.ParentPrimaryImageItemId);
+        Assert.Equal(displayParent.Id, dto.ParentPrimaryImageItemId);
+        Assert.Equal("/images/playlists-custom.jpg", dto.ParentPrimaryImageTag);
+        Assert.False(dto.ImageTags?.ContainsKey(ImageType.Primary));
+    }
+
+    [Fact]
+    public void GetBaseItemDto_PlaylistsUserViewWithoutDisplayParentPrimary_KeepsOwnPrimaryImage()
+    {
+        var displayParent = new PlaylistsFolder
+        {
+            Id = Guid.NewGuid(),
+            ImageInfos = []
+        };
+
+        var userView = new UserView
+        {
+            Id = Guid.NewGuid(),
+            ViewType = CollectionType.playlists,
+            DisplayParentId = displayParent.Id,
+            ImageInfos =
+            [
+                new ItemImageInfo
+                {
+                    Type = ImageType.Primary,
+                    Path = "/images/generated.png",
+                    DateModified = new DateTime(2026, 1, 10, 12, 0, 0, DateTimeKind.Utc)
+                }
+            ]
+        };
+
+        var dtoService = BuildDtoService(displayParent);
+
+        var dto = dtoService.GetBaseItemDto(userView, new DtoOptions(false));
+
+        Assert.Null(dto.ParentPrimaryImageItemId);
+        Assert.Null(dto.ParentPrimaryImageTag);
+        Assert.NotNull(dto.ImageTags);
+        Assert.True(dto.ImageTags.ContainsKey(ImageType.Primary));
+        Assert.Equal("/images/generated.png", dto.ImageTags[ImageType.Primary]);
+    }
+
+    private static DtoService BuildDtoService(BaseItem displayParent)
+    {
+        var libraryManager = new Mock<ILibraryManager>();
+        var userDataManager = new Mock<IUserDataManager>();
+        var imageProcessor = new Mock<IImageProcessor>();
+        var providerManager = new Mock<IProviderManager>();
+        var recordingsManager = new Mock<IRecordingsManager>();
+        var appHost = new Mock<IApplicationHost>();
+        var mediaSourceManager = new Mock<IMediaSourceManager>();
+        var liveTvManager = new Mock<ILiveTvManager>();
+        var trickplayManager = new Mock<ITrickplayManager>();
+        var chapterManager = new Mock<IChapterManager>();
+        var logger = new Mock<Microsoft.Extensions.Logging.ILogger<DtoService>>();
+
+        libraryManager
+            .Setup(x => x.GetItemById(displayParent.Id))
+            .Returns(displayParent);
+
+        imageProcessor
+            .Setup(x => x.GetImageCacheTag(It.IsAny<BaseItem>(), It.IsAny<ItemImageInfo>()))
+            .Returns<BaseItem, ItemImageInfo>((_, image) => image.Path);
+
+        return new DtoService(
+            logger.Object,
+            libraryManager.Object,
+            userDataManager.Object,
+            imageProcessor.Object,
+            providerManager.Object,
+            recordingsManager.Object,
+            appHost.Object,
+            mediaSourceManager.Object,
+            new Lazy<ILiveTvManager>(() => liveTvManager.Object),
+            trickplayManager.Object,
+            chapterManager.Object);
+    }
+}