Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/ffmpeg-version-check

Browse Source
This commit is contained in:
Max Git 2020-06-17 10:17:50 +02:00
commit 000768f56c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -621,6 +621,7 @@ namespace Emby.Server.Implementations.Dto
{ {
baseItemPerson.PrimaryImageTag = GetTagAndFillBlurhash(dto, entity, ImageType.Primary); baseItemPerson.PrimaryImageTag = GetTagAndFillBlurhash(dto, entity, ImageType.Primary);
baseItemPerson.Id = entity.Id.ToString("N", CultureInfo.InvariantCulture); baseItemPerson.Id = entity.Id.ToString("N", CultureInfo.InvariantCulture);
baseItemPerson.ImageBlurHashes = dto.ImageBlurHashes;
list.Add(baseItemPerson); list.Add(baseItemPerson);
} }
} }

8
MediaBrowser.Model/Dto/BaseItemPerson.cs
View File

@ -1,5 +1,7 @@
#nullable disable #nullable disable
using System.Collections.Generic;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Model.Dto namespace MediaBrowser.Model.Dto
{ {
@ -38,6 +40,12 @@ namespace MediaBrowser.Model.Dto
/// <value>The primary image tag.</value> /// <value>The primary image tag.</value>
public string PrimaryImageTag { get; set; } public string PrimaryImageTag { get; set; }
/// <summary>
/// Gets or sets the primary image blurhash.
/// </summary>
/// <value>The primary image blurhash.</value>
public Dictionary<ImageType, Dictionary<string, string>> ImageBlurHashes { get; set; }
/// <summary> /// <summary>
/// Gets a value indicating whether this instance has primary image. /// Gets a value indicating whether this instance has primary image.
/// </summary> /// </summary>