1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
using System;
using System.Collections.Generic;
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.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
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]);
}
[Fact]
public void GetBaseItemDtos_MusicAlbums_ResolveInheritedThumbFromArtistBatch_WithoutPerAlbumLookup()
{
var artist = new MusicArtist
{
Id = Guid.NewGuid(),
Name = "Some Artist",
ImageInfos =
[
new ItemImageInfo
{
Type = ImageType.Thumb,
Path = "/images/artist-thumb.jpg",
DateModified = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc)
}
]
};
static MusicAlbum MakeAlbum() => new MusicAlbum
{
Id = Guid.NewGuid(),
Name = "Album",
AlbumArtists = ["Some Artist"],
ImageInfos = []
};
var libraryManager = new Mock<ILibraryManager>();
// DtoService resolves every album-artist name in ONE batch (GetArtists). The album's inherited
// Thumb/Backdrop images must come from that batch, not a per-album GetArtist/GetItemList lookup
// (the N+1). GetArtist is intentionally left unset: a regression to the per-album path would
// resolve no artist and fail the assertions below.
libraryManager
.Setup(x => x.GetArtists(It.IsAny<IReadOnlyList<string>>()))
.Returns(new Dictionary<string, MusicArtist[]>(StringComparer.OrdinalIgnoreCase)
{
["Some Artist"] = [artist]
});
var dtoService = BuildDtoService(libraryManager);
var dtos = dtoService.GetBaseItemDtos([MakeAlbum(), MakeAlbum()], new DtoOptions(false));
Assert.Equal(2, dtos.Count);
foreach (var dto in dtos)
{
Assert.Equal(artist.Id, dto.ParentThumbItemId);
Assert.Equal("/images/artist-thumb.jpg", dto.ParentThumbImageTag);
}
// The artist lookup is batched once for the whole set, never once per album.
libraryManager.Verify(x => x.GetArtists(It.IsAny<IReadOnlyList<string>>()), Times.Once);
libraryManager.Verify(x => x.GetArtist(It.IsAny<string>(), It.IsAny<DtoOptions>()), Times.Never);
}
private static DtoService BuildDtoService(BaseItem displayParent)
{
var libraryManager = new Mock<ILibraryManager>();
libraryManager
.Setup(x => x.GetItemById(displayParent.Id))
.Returns(displayParent);
return BuildDtoService(libraryManager);
}
private static DtoService BuildDtoService(Mock<ILibraryManager> libraryManager)
{
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>>();
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);
}
}
|
