|
|
|
@ -605,7 +605,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
|
|
|
|
|
if (dictionary.TryGetValue(person.Name, out Person entity))
|
|
|
|
|
{
|
|
|
|
|
baseItemPerson.PrimaryImageTag = GetImageCacheTag(entity, ImageType.Primary);
|
|
|
|
|
baseItemPerson.PrimaryImageTag = GetTagAndFillBlurhash(dto, entity, ImageType.Primary);
|
|
|
|
|
baseItemPerson.Id = entity.Id.ToString("N", CultureInfo.InvariantCulture);
|
|
|
|
|
list.Add(baseItemPerson);
|
|
|
|
|
}
|
|
|
|
@ -654,6 +654,70 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
return _libraryManager.GetGenreId(name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private string GetTagAndFillBlurhash(BaseItemDto dto, BaseItem item, ImageType imageType, int imageIndex = 0)
|
|
|
|
|
{
|
|
|
|
|
var image = item.GetImageInfo(imageType, imageIndex);
|
|
|
|
|
if (image != null)
|
|
|
|
|
{
|
|
|
|
|
return GetTagAndFillBlurhash(dto, item, image);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private string GetTagAndFillBlurhash(BaseItemDto dto, BaseItem item, ItemImageInfo image)
|
|
|
|
|
{
|
|
|
|
|
var tag = GetImageCacheTag(item, image);
|
|
|
|
|
if (!string.IsNullOrEmpty(image.BlurHash))
|
|
|
|
|
{
|
|
|
|
|
if (dto.ImageBlurHashes == null)
|
|
|
|
|
{
|
|
|
|
|
dto.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!dto.ImageBlurHashes.ContainsKey(image.Type))
|
|
|
|
|
{
|
|
|
|
|
dto.ImageBlurHashes[image.Type] = new Dictionary<string, string>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dto.ImageBlurHashes[image.Type][tag] = image.BlurHash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return tag;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private string[] GetTagsAndFillBlurhashes(BaseItemDto dto, BaseItem item, ImageType imageType, int limit)
|
|
|
|
|
{
|
|
|
|
|
return GetTagsAndFillBlurhashes(dto, item, imageType, item.GetImages(imageType).Take(limit).ToList());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private string[] GetTagsAndFillBlurhashes(BaseItemDto dto, BaseItem item, ImageType imageType, List<ItemImageInfo> images)
|
|
|
|
|
{
|
|
|
|
|
var tags = GetImageTags(item, images);
|
|
|
|
|
var hashes = new Dictionary<string, string>();
|
|
|
|
|
for (int i = 0; i < images.Count; i++)
|
|
|
|
|
{
|
|
|
|
|
var img = images[i];
|
|
|
|
|
if (!string.IsNullOrEmpty(img.BlurHash))
|
|
|
|
|
{
|
|
|
|
|
var tag = tags[i];
|
|
|
|
|
hashes[tag] = img.BlurHash;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hashes.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
if (dto.ImageBlurHashes == null)
|
|
|
|
|
{
|
|
|
|
|
dto.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dto.ImageBlurHashes[imageType] = hashes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return tags;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Sets simple property values on a DTOBaseItem
|
|
|
|
|
/// </summary>
|
|
|
|
@ -674,8 +738,8 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
dto.LockData = item.IsLocked;
|
|
|
|
|
dto.ForcedSortName = item.ForcedSortName;
|
|
|
|
|
}
|
|
|
|
|
dto.Container = item.Container;
|
|
|
|
|
|
|
|
|
|
dto.Container = item.Container;
|
|
|
|
|
dto.EndDate = item.EndDate;
|
|
|
|
|
|
|
|
|
|
if (options.ContainsField(ItemFields.ExternalUrls))
|
|
|
|
@ -694,10 +758,12 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
dto.AspectRatio = hasAspectRatio.AspectRatio;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dto.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
|
|
|
|
|
|
|
|
|
|
var backdropLimit = options.GetImageLimit(ImageType.Backdrop);
|
|
|
|
|
if (backdropLimit > 0)
|
|
|
|
|
{
|
|
|
|
|
dto.BackdropImageTags = GetImageTags(item, item.GetImages(ImageType.Backdrop).Take(backdropLimit).ToList());
|
|
|
|
|
dto.BackdropImageTags = GetTagsAndFillBlurhashes(dto, item, ImageType.Backdrop, backdropLimit);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (options.ContainsField(ItemFields.ScreenshotImageTags))
|
|
|
|
@ -705,7 +771,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
var screenshotLimit = options.GetImageLimit(ImageType.Screenshot);
|
|
|
|
|
if (screenshotLimit > 0)
|
|
|
|
|
{
|
|
|
|
|
dto.ScreenshotImageTags = GetImageTags(item, item.GetImages(ImageType.Screenshot).Take(screenshotLimit).ToList());
|
|
|
|
|
dto.ScreenshotImageTags = GetTagsAndFillBlurhashes(dto, item, ImageType.Screenshot, screenshotLimit);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -721,12 +787,11 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
|
|
|
|
|
// Prevent implicitly captured closure
|
|
|
|
|
var currentItem = item;
|
|
|
|
|
foreach (var image in currentItem.ImageInfos.Where(i => !currentItem.AllowsMultipleImages(i.Type))
|
|
|
|
|
.ToList())
|
|
|
|
|
foreach (var image in currentItem.ImageInfos.Where(i => !currentItem.AllowsMultipleImages(i.Type)))
|
|
|
|
|
{
|
|
|
|
|
if (options.GetImageLimit(image.Type) > 0)
|
|
|
|
|
{
|
|
|
|
|
var tag = GetImageCacheTag(item, image);
|
|
|
|
|
var tag = GetTagAndFillBlurhash(dto, item, image);
|
|
|
|
|
|
|
|
|
|
if (tag != null)
|
|
|
|
|
{
|
|
|
|
@ -871,8 +936,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
if (albumParent != null)
|
|
|
|
|
{
|
|
|
|
|
dto.AlbumId = albumParent.Id;
|
|
|
|
|
|
|
|
|
|
dto.AlbumPrimaryImageTag = GetImageCacheTag(albumParent, ImageType.Primary);
|
|
|
|
|
dto.AlbumPrimaryImageTag = GetTagAndFillBlurhash(dto, albumParent, ImageType.Primary);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//if (options.ContainsField(ItemFields.MediaSourceCount))
|
|
|
|
@ -1099,7 +1163,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
episodeSeries = episodeSeries ?? episode.Series;
|
|
|
|
|
if (episodeSeries != null)
|
|
|
|
|
{
|
|
|
|
|
dto.SeriesPrimaryImageTag = GetImageCacheTag(episodeSeries, ImageType.Primary);
|
|
|
|
|
dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, episodeSeries, ImageType.Primary);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1145,7 +1209,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
series = series ?? season.Series;
|
|
|
|
|
if (series != null)
|
|
|
|
|
{
|
|
|
|
|
dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
|
|
|
|
|
dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, series, ImageType.Primary);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1275,7 +1339,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
if (image != null)
|
|
|
|
|
{
|
|
|
|
|
dto.ParentLogoItemId = GetDtoId(parent);
|
|
|
|
|
dto.ParentLogoImageTag = GetImageCacheTag(parent, image);
|
|
|
|
|
dto.ParentLogoImageTag = GetTagAndFillBlurhash(dto, parent, image);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (artLimit > 0 && !(imageTags != null && imageTags.ContainsKey(ImageType.Art)) && dto.ParentArtItemId == null)
|
|
|
|
@ -1285,7 +1349,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
if (image != null)
|
|
|
|
|
{
|
|
|
|
|
dto.ParentArtItemId = GetDtoId(parent);
|
|
|
|
|
dto.ParentArtImageTag = GetImageCacheTag(parent, image);
|
|
|
|
|
dto.ParentArtImageTag = GetTagAndFillBlurhash(dto, parent, image);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (thumbLimit > 0 && !(imageTags != null && imageTags.ContainsKey(ImageType.Thumb)) && (dto.ParentThumbItemId == null || parent is Series) && !(parent is ICollectionFolder) && !(parent is UserView))
|
|
|
|
@ -1295,7 +1359,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
if (image != null)
|
|
|
|
|
{
|
|
|
|
|
dto.ParentThumbItemId = GetDtoId(parent);
|
|
|
|
|
dto.ParentThumbImageTag = GetImageCacheTag(parent, image);
|
|
|
|
|
dto.ParentThumbImageTag = GetTagAndFillBlurhash(dto, parent, image);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (backdropLimit > 0 && !((dto.BackdropImageTags != null && dto.BackdropImageTags.Length > 0) || (dto.ParentBackdropImageTags != null && dto.ParentBackdropImageTags.Length > 0)))
|
|
|
|
@ -1305,7 +1369,7 @@ namespace Emby.Server.Implementations.Dto
|
|
|
|
|
if (images.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
dto.ParentBackdropItemId = GetDtoId(parent);
|
|
|
|
|
dto.ParentBackdropImageTags = GetImageTags(parent, images);
|
|
|
|
|
dto.ParentBackdropImageTags = GetTagsAndFillBlurhashes(dto, parent, ImageType.Backdrop, images);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|