michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source
This commit is contained in:
David Ullmer 2021-08-18 14:22:01 +02:00 committed by Cody Robibero
parent 9e23af5636
commit 9e0958d822
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1803,15 +1803,14 @@ namespace Jellyfin.Api.Controllers
{
await using var memoryStream = await GetMemoryStream(Request.Body).ConfigureAwait(false);
// Handle image/png; charset=utf-8
var mimeType = Request.ContentType.Split(';').FirstOrDefault();
var mimeType = MediaTypeHeaderValue.Parse(Request.ContentType).MediaType;
if (mimeType == null)
if (!mimeType.HasValue)
{
return BadRequest("Error reading mimetype from uploaded image");
}
var filePath = Path.Combine(_appPaths.DataPath, "splashscreen-upload" + MimeTypes.ToExtension(mimeType));
var filePath = Path.Combine(_appPaths.DataPath, "splashscreen-upload" + MimeTypes.ToExtension(mimeType.Value));
var brandingOptions = _serverConfigurationManager.GetConfiguration<BrandingOptions>("branding");
brandingOptions.SplashscreenLocation = filePath;
_serverConfigurationManager.SaveConfiguration("branding", brandingOptions);

6
Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
View File

@ -19,8 +19,6 @@ namespace Jellyfin.Drawing.Skia
private readonly SkiaEncoder _skiaEncoder;
private Random? _random;
/// <summary>
/// Initializes a new instance of the <see cref="SplashscreenBuilder"/> class.
/// </summary>
@ -54,7 +52,7 @@ namespace Jellyfin.Drawing.Skia
/// <returns>The created collage as a bitmap.</returns>
private SKBitmap GenerateCollage(IReadOnlyList<string> posters, IReadOnlyList<string> backdrop)
{
_random = new Random();
var random = new Random();
var posterIndex = 0;
var backdropIndex = 0;
@ -67,7 +65,7 @@ namespace Jellyfin.Drawing.Skia
for (int i = 0; i < Rows; i++)
{
int imageCounter = _random.Next(0, 5);
int imageCounter = random.Next(0, 5);
int currentWidthPos = i * 75;
int currentHeight = i * (posterHeight + Spacing);

2
MediaBrowser.Model/Branding/BrandingOptions.cs
View File

@ -33,6 +33,6 @@ namespace MediaBrowser.Model.Branding
/// Gets the splashscreen url.
/// </summary>
[XmlIgnore]
public string SplashscreenUrl => "/Branding/Splashscreen";
public string? SplashscreenUrl => "/Branding/Splashscreen";
}
}