Renamed image creators
This commit is contained in:
parent
4091fb78c5
commit
c70ab9e5de
12 changed files with 50 additions and 50 deletions
|
|
@ -15,8 +15,8 @@ using Microsoft.Extensions.Logging;
|
|||
namespace MaddoShared
|
||||
{
|
||||
[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
|
||||
public class ImageCreationStuff(
|
||||
ILogger<ImageCreationStuff> logger,
|
||||
public class ImageCreationService(
|
||||
ILogger<ImageCreationService> logger,
|
||||
PicSettings picSettings,
|
||||
IImageCreator imageCreatorService)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@ namespace MaddoShared;
|
|||
/// provide a safe and testable replacement. Additional features (text/logo drawing)
|
||||
/// can be added later using ImageSharp.Drawing.Common and SixLabors.Fonts.
|
||||
/// </summary>
|
||||
public class ImageCreatorAlternate : IImageCreator
|
||||
public class ImageCreatorImageSharp : IImageCreator
|
||||
{
|
||||
private readonly PicSettings _picSettings;
|
||||
private readonly ILogger<ImageCreatorAlternate> _logger;
|
||||
private readonly ILogger<ImageCreatorImageSharp> _logger;
|
||||
|
||||
public ImageCreatorAlternate(PicSettings picSettings, ILogger<ImageCreatorAlternate> logger)
|
||||
public ImageCreatorImageSharp(PicSettings picSettings, ILogger<ImageCreatorImageSharp> logger)
|
||||
{
|
||||
_picSettings = picSettings ?? throw new ArgumentNullException(nameof(picSettings));
|
||||
_logger = logger;
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ public class ImageCreatorMapper : IImageCreator
|
|||
_logger?.LogDebug("Resolving IImageCreator for provider '{Provider}'", provider);
|
||||
|
||||
return provider.Equals("ALTERNATE", StringComparison.OrdinalIgnoreCase)
|
||||
? ResolveAndCall<ImageCreatorAlternate>(imgState, logo)
|
||||
: ResolveAndCall<ImageCreatorSharp>(imgState, logo);
|
||||
? ResolveAndCall<ImageCreatorImageSharp>(imgState, logo)
|
||||
: ResolveAndCall<ImageCreatorGDI>(imgState, logo);
|
||||
}
|
||||
|
||||
private Task ResolveAndCall<T>(ImageState imgState, System.Drawing.Image logo) where T : IImageCreator
|
||||
|
|
@ -37,8 +37,8 @@ public class ImageCreatorMapper : IImageCreator
|
|||
var impl = (IImageCreator)_sp.GetService(typeof(T));
|
||||
if (impl is null)
|
||||
{
|
||||
_logger?.LogWarning("Requested image creator {Type} is not registered. Falling back to ImageCreatorSharp.", typeof(T).Name);
|
||||
impl = (IImageCreator)_sp.GetService(typeof(ImageCreatorSharp));
|
||||
_logger?.LogWarning("Requested image creator {Type} is not registered. Falling back to ImageCreatorGDI.", typeof(T).Name);
|
||||
impl = (IImageCreator)_sp.GetService(typeof(ImageCreatorGDI));
|
||||
}
|
||||
|
||||
if (impl is null)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ using SixLabors.ImageSharp.Metadata.Profiles.Exif;
|
|||
namespace MaddoShared;
|
||||
|
||||
[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
|
||||
public class ImageCreatorSharp(PicSettings picSettings, ILogger<ImageCreatorSharp> logger) : IImageCreator
|
||||
public class ImageCreatorGDI(PicSettings picSettings, ILogger<ImageCreatorGDI> logger) : IImageCreator
|
||||
{
|
||||
public async Task CreateImageAsync(ImageState imgState, Image logo)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue