Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 10:05:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

readd Format for splashscreen and user image

Browse Source
This commit is contained in:
JPVenson 2025-07-27 23:12:40 +00:00
parent 5b544bf1ed
commit 7320e10329
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Jellyfin.Api/Controllers/ImageController.cs
View File

@ -1458,6 +1458,7 @@ public class ImageController : BaseJellyfinApiController
/// </summary> /// </summary>
/// <param name="userId">User id.</param> /// <param name="userId">User id.</param>
/// <param name="tag">Optional. Supply the cache tag from the item object to receive strong caching headers.</param> /// <param name="tag">Optional. Supply the cache tag from the item object to receive strong caching headers.</param>
/// <param name="format">Determines the output format of the image - original,gif,jpg,png.</param>
/// <response code="200">Image stream returned.</response> /// <response code="200">Image stream returned.</response>
/// <response code="400">User id not provided.</response> /// <response code="400">User id not provided.</response>
/// <response code="404">Item not found.</response> /// <response code="404">Item not found.</response>
@ -1473,7 +1474,8 @@ public class ImageController : BaseJellyfinApiController
[ProducesImageFile] [ProducesImageFile]
public async Task<ActionResult> GetUserImage( public async Task<ActionResult> GetUserImage(
[FromQuery] Guid? userId, [FromQuery] Guid? userId,
[FromQuery] string? tag) [FromQuery] string? tag,
[FromQuery] ImageFormat? format)
{ {
var requestUserId = userId ?? User.GetUserId(); var requestUserId = userId ?? User.GetUserId();
if (requestUserId.IsEmpty()) if (requestUserId.IsEmpty())
@ -1499,7 +1501,7 @@ public class ImageController : BaseJellyfinApiController
ImageType.Profile, ImageType.Profile,
null, null,
tag, tag,
ImageFormat.Jpg, format,
null, null,
null, null,
null, null,
@ -1570,7 +1572,8 @@ public class ImageController : BaseJellyfinApiController
[FromQuery] int? imageIndex) [FromQuery] int? imageIndex)
=> GetUserImage( => GetUserImage(
userId, userId,
tag); tag,
format);
/// <summary> /// <summary>
/// Get user profile image. /// Get user profile image.
@ -1625,19 +1628,22 @@ public class ImageController : BaseJellyfinApiController
[FromQuery] string? foregroundLayer) [FromQuery] string? foregroundLayer)
=> GetUserImage( => GetUserImage(
userId, userId,
tag); tag,
format);
/// <summary> /// <summary>
/// Generates or gets the splashscreen. /// Generates or gets the splashscreen.
/// </summary> /// </summary>
/// <param name="tag">Supply the cache tag from the item object to receive strong caching headers.</param> /// <param name="tag">Supply the cache tag from the item object to receive strong caching headers.</param>
/// <param name="format">Determines the output format of the image - original,gif,jpg,png.</param>
/// <response code="200">Splashscreen returned successfully.</response> /// <response code="200">Splashscreen returned successfully.</response>
/// <returns>The splashscreen.</returns> /// <returns>The splashscreen.</returns>
[HttpGet("Branding/Splashscreen")] [HttpGet("Branding/Splashscreen")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesImageFile] [ProducesImageFile]
public async Task<ActionResult> GetSplashscreen( public async Task<ActionResult> GetSplashscreen(
[FromQuery] string? tag) [FromQuery] string? tag,
[FromQuery] ImageFormat? format)
{ {
var brandingOptions = _serverConfigurationManager.GetConfiguration<BrandingOptions>("branding"); var brandingOptions = _serverConfigurationManager.GetConfiguration<BrandingOptions>("branding");
var isAdmin = User.IsInRole(Constants.UserRoles.Administrator); var isAdmin = User.IsInRole(Constants.UserRoles.Administrator);
@ -1662,7 +1668,7 @@ public class ImageController : BaseJellyfinApiController
} }
} }
var outputFormats = GetOutputFormats(ImageFormat.Jpg); var outputFormats = GetOutputFormats(format);
TimeSpan? cacheDuration = null; TimeSpan? cacheDuration = null;
if (!string.IsNullOrEmpty(tag)) if (!string.IsNullOrEmpty(tag))