Skip to content

[DD-1171] fix new version #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RodrigoPereyraDiaz merged 8 commits into from
May 11, 2023
Merged

[DD-1171] fix new version #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8cbb32c
refactor: apply IDE0063
RodrigoPereyraDiaz May 10, 2023
5d7b958
refactor: apply IDE0090
RodrigoPereyraDiaz May 10, 2023
dc17c6e
refactor: apply IDE0044
RodrigoPereyraDiaz May 10, 2023
ef04b6e
chore: update from net5.0 to net7.0
RodrigoPereyraDiaz May 10, 2023
0b9951b
fix: serialize message instead exception
RodrigoPereyraDiaz May 10, 2023
cf2cb0a
refactor(log): use overload for exceptions
RodrigoPereyraDiaz May 10, 2023
9d39589
fix: wkhtmltopdf load problem
RodrigoPereyraDiaz May 10, 2023
93a9843
fix: do not catch and serialize exception
RodrigoPereyraDiaz May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/ConversionTool/bin/Debug/net5.0/ConversionTool.dll",
"program": "${workspaceFolder}/ConversionTool/bin/Debug/net7.0/ConversionTool.dll",
"args": [],
"cwd": "${workspaceFolder}/ConversionTool",
"stopAtEntry": false,
Expand Down
15 changes: 3 additions & 12 deletions ConversionTool/Controllers/HtmlToImageController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System;
using System.Threading.Tasks;

namespace ConversionTool.Controllers
Expand All @@ -25,19 +24,11 @@ public HtmlToImageController(ILogger<HtmlToImageController> logger, IHtmlToImage
[HttpPost("/html-to-image/png")]
public async Task<IActionResult> Png([FromBody] HtmlToImageModel htmlToImageModel)
{
try
{
_logger.LogInformation("Converting HTML to PNG image");
_logger.LogInformation("Converting HTML to PNG image");

var imageAsBytes = await _htmlToImage.FromStringToPngAsync(htmlToImageModel.Html, htmlToImageModel.Height, htmlToImageModel.Width);
var imageAsBytes = await _htmlToImage.FromStringToPngAsync(htmlToImageModel.Html, htmlToImageModel.Height, htmlToImageModel.Width);

return File(imageAsBytes, "image/png");
}
catch (Exception ex)
{
_logger.LogError("Error converting HTML text to PNG image", ex);
return BadRequest(ex);
}
return File(imageAsBytes, "image/png");
}
}
}
4 changes: 3 additions & 1 deletion ConversionTool/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
RUN apt-get update && apt-get install wkhtmltopdf -y && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install wkhtmltopdf binutils -y && rm -rf /var/lib/apt/lists/*
RUN strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5

WORKDIR /app
EXPOSE 80

Expand Down
20 changes: 8 additions & 12 deletions ConversionTool/HtmlToImage/WkHtmlToImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace ConversionTool.HtmlToImage
{
public class WkHtmlToImage : IHtmlToImage
{
IAppConfiguration _appConfiguration;
readonly IAppConfiguration _appConfiguration;
public WkHtmlToImage(IAppConfiguration appConfiguration)
{
_appConfiguration = appConfiguration;
Expand All @@ -31,18 +31,14 @@ public Task<byte[]> FromStringToPngAsync(string html, int? height = null, int? w

private byte[] ResizeImage(byte[] image, int? height, int? width)
{
using (Image imageRgba = Image.Load(image))
{
using (MemoryStream stream = new MemoryStream())
{
var withToMutate = width ?? imageRgba.Width * _appConfiguration.ImageSizeResult.Height / imageRgba.Height;
var heightToMutate = height ?? _appConfiguration.ImageSizeResult.Height;
using Image imageRgba = Image.Load(image);
using MemoryStream stream = new();
var withToMutate = width ?? imageRgba.Width * _appConfiguration.ImageSizeResult.Height / imageRgba.Height;
var heightToMutate = height ?? _appConfiguration.ImageSizeResult.Height;

imageRgba.Mutate(x => x.Resize(withToMutate, heightToMutate, KnownResamplers.Lanczos3));
imageRgba.Save(stream, new PngEncoder());
return stream.ToArray();
}
}
imageRgba.Mutate(x => x.Resize(withToMutate, heightToMutate, KnownResamplers.Lanczos3));
imageRgba.Save(stream, new PngEncoder());
return stream.ToArray();
}
}
}