AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[skip ci] Fix color scape test (#3762)

Browse source 
Co-authored-by: goremykin <goremukin@gmail.com>
Co-authored-by: Joe Milazzo <josephmajora@gmail.com>
This commit is contained in:
Stepan Goremykin 2025-06-01 18:27:58 +02:00 • committed by GitHub
parent 3933d5cab2
commit 13dd2d7158
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
API.Tests/Services/ImageServiceTests.cs
View file

@ -161,10 +161,10 @@ public class ImageServiceTests
private static void GenerateColorImage(string hexColor, string outputPath) private static void GenerateColorImage(string hexColor, string outputPath)
{ {
var color = ImageService.HexToRgb(hexColor); var (r, g, b) = ImageService.HexToRgb(hexColor);
using var colorImage = Image.Black(200, 100); using var blackImage = Image.Black(200, 100);
using var output = colorImage + new[] { color.R / 255.0, color.G / 255.0, color.B / 255.0 }; using var colorImage = blackImage.NewFromImage(r, g, b);
output.WriteToFile(outputPath); colorImage.WriteToFile(outputPath);
} }
private void GenerateHtmlFileForColorScape() private void GenerateHtmlFileForColorScape()

1
API/API.csproj
View file

@ -99,7 +99,6 @@
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.9.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.9.0" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.14" /> <PackageReference Include="System.IO.Abstractions" Version="22.0.14" />
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
<PackageReference Include="VersOne.Epub" Version="3.3.4" /> <PackageReference Include="VersOne.Epub" Version="3.3.4" />
<PackageReference Include="YamlDotNet" Version="16.3.0" /> <PackageReference Include="YamlDotNet" Version="16.3.0" />
</ItemGroup> </ItemGroup>

6
API/Services/ImageService.cs
View file

@ -10,11 +10,9 @@ using API.Entities.Interfaces;
using API.Extensions; using API.Extensions;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NetVips; using NetVips;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Processing.Processors.Quantization; using SixLabors.ImageSharp.Processing.Processors.Quantization;
using Color = System.Drawing.Color;
using Image = NetVips.Image; using Image = NetVips.Image;
namespace API.Services; namespace API.Services;
@ -750,7 +748,7 @@ public class ImageService : IImageService
} }
public static Color HexToRgb(string? hex) public static (int R, int G, int B) HexToRgb(string? hex)
{ {
if (string.IsNullOrEmpty(hex)) throw new ArgumentException("Hex cannot be null"); if (string.IsNullOrEmpty(hex)) throw new ArgumentException("Hex cannot be null");
@ -774,7 +772,7 @@ public class ImageService : IImageService
var g = Convert.ToInt32(hex.Substring(2, 2), 16); var g = Convert.ToInt32(hex.Substring(2, 2), 16);
var b = Convert.ToInt32(hex.Substring(4, 2), 16); var b = Convert.ToInt32(hex.Substring(4, 2), 16);
return Color.FromArgb(r, g, b); return (r, g, b);
} }