Сазонов Александр

FractalPainter/Application/Actions/DragonFractalAction.cs

@@ -2,22 +2,14 @@
 using System.Text.Json;
 using FractalPainting.Application.Fractals;
 using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace FractalPainting.Application.Actions;
 
-public class DragonFractalAction : IApiAction, INeed<IImageSettingsProvider>
+public class DragonFractalAction(IDragonPainterFactory dragonPainterFactory) : IApiAction
 {
     private readonly JsonSerializerOptions jsonSerializerOptions =
         new() { Converters = { new FigureJsonConverter() } };
-    private IImageSettingsProvider imageSettingsProvider = null!;
-
-    public void SetDependency(IImageSettingsProvider dependency)
-    {
-        imageSettingsProvider = dependency;
-    }
 
     public string Endpoint => "/dragonFractal";
 
@@ -26,14 +18,10 @@ public void SetDependency(IImageSettingsProvider dependency)
     public int Perform(Stream inputStream, Stream outputStream)
     {
         var dragonSettings = JsonSerializer.Deserialize<DragonSettings>(inputStream);
-        var services = new ServiceCollection();
-        services.AddSingleton(dragonSettings!);
-        services.AddSingleton(imageSettingsProvider);
-        services.AddSingleton<DragonPainter>();
-        var sp = services.BuildServiceProvider();
-
-        var painter = sp.GetRequiredService<DragonPainter>();
-        var figures = painter.Paint();
+        if (dragonSettings == null) return (int)HttpStatusCode.BadRequest;
+        var figures = dragonPainterFactory
+            .Create(dragonSettings)
+            .Paint();
         JsonSerializer.Serialize(outputStream, figures, options: jsonSerializerOptions);
 
         return (int)HttpStatusCode.OK;

FractalPainter/Application/Actions/GetImageSettingsAction.cs

@@ -1,19 +1,13 @@
 using System.Net;
 using System.Text.Json;
 using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
 
 namespace FractalPainting.Application.Actions;
 
-public class GetImageSettingsAction : IApiAction, INeed<IImageSettingsProvider>
+public class GetImageSettingsAction(IImageSettingsProvider imageSettingsProvider) : IApiAction
 {
-    private IImageSettingsProvider? imageSettingsProvider;
-
-    public void SetDependency(IImageSettingsProvider dependency)
-    {
-        imageSettingsProvider = dependency;
-    }
+    private IImageSettingsProvider? imageSettingsProvider = imageSettingsProvider;
 
     public string Endpoint => "/settings";
 

FractalPainter/Application/Actions/GetPaletteSettingsAction.cs

@@ -1,19 +1,13 @@
 using System.Net;
 using System.Text.Json;
 using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
 
 namespace FractalPainting.Application.Actions;
 
-public class GetPaletteSettingsAction : IApiAction, INeed<Palette>
+public class GetPaletteSettingsAction(Palette palette) : IApiAction
 {
-    private Palette palette = null!;
-
-    public void SetDependency(Palette dependency)
-    {
-        palette = dependency;
-    }
+    private Palette palette = palette;
 
     public string Endpoint => "/palette";
 

FractalPainter/Application/Actions/KochFractalAction.cs

@@ -1,44 +1,23 @@
 using System.Net;
 using System.Text.Json;
 using FractalPainting.Application.Fractals;
-using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace FractalPainting.Application.Actions;
 
-public class KochFractalAction : IApiAction, INeed<Palette>, INeed<IImageSettingsProvider>
+public class KochFractalAction(KochPainter kochPainter) : IApiAction
 {
     private readonly JsonSerializerOptions jsonSerializerOptions =
         new() { Converters = { new FigureJsonConverter() } };
-    private Palette palette = null!;
-    private IImageSettingsProvider imageSettingsProvider = null!;
-
-    public void SetDependency(Palette dependency)
-    {
-        palette = dependency;
-    }
+    private readonly KochPainter kochPainter = kochPainter;
 
-    public void SetDependency(IImageSettingsProvider dependency)
-    {
-        imageSettingsProvider = dependency;
-    }
-
     public string Endpoint => "/kochFractal";
 
     public string HttpMethod => "POST";
 
     public int Perform(Stream inputStream, Stream outputStream)
     {
-        var services = new ServiceCollection();
-        services.AddSingleton(palette);
-        services.AddSingleton(imageSettingsProvider);
-        services.AddSingleton<KochPainter>();
-        var sp = services.BuildServiceProvider();
-
-        var painter = sp.GetRequiredService<KochPainter>();
-        var figures = painter.Paint();
+        var figures = kochPainter.Paint();
         JsonSerializer.Serialize(outputStream, figures, options: jsonSerializerOptions);
         return (int)HttpStatusCode.OK;
     }

FractalPainter/Application/Actions/UpdateImageSettingsAction.cs

@@ -1,20 +1,12 @@
 using System.Net;
 using System.Text.Json;
 using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
 
 namespace FractalPainting.Application.Actions;
 
-public class UpdateImageSettingsAction : IApiAction, INeed<IImageSettingsProvider>
+public class UpdateImageSettingsAction(IImageSettingsProvider imageSettingsProvider) : IApiAction
 {
-    private IImageSettingsProvider imageSettingsProvider = null!;
-
-    public void SetDependency(IImageSettingsProvider dependency)
-    {
-        imageSettingsProvider = dependency;
-    }
-
     public string Endpoint => "/settings";
     public string HttpMethod => "PUT";
 

FractalPainter/Application/Actions/UpdatePaletteSettingsAction.cs

@@ -1,19 +1,13 @@
 using System.Net;
 using System.Text.Json;
 using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
 
 namespace FractalPainting.Application.Actions;
 
-public class UpdatePaletteSettingsAction : IApiAction, INeed<Palette>
+public class UpdatePaletteSettingsAction(Palette palette) : IApiAction
 {
-    private Palette palette = null!;
-
-    public void SetDependency(Palette dependency)
-    {
-        palette = dependency;
-    }
+    private Palette palette = palette;
 
     public string Endpoint => "/palette";
 

FractalPainter/Application/App.cs

@@ -1,11 +1,7 @@
 using System.Net;
 using System.Text.Json;
-using FractalPainting.Application.Actions;
 using FractalPainting.Application.Models;
-using FractalPainting.Infrastructure.Common;
-using FractalPainting.Infrastructure.Injection;
 using FractalPainting.Infrastructure.UiActions;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace FractalPainting.Application;
 
@@ -15,27 +11,12 @@ internal sealed class App
     private readonly HttpListener httpListener;
     private readonly IReadOnlyDictionary<string, IApiAction> routeActions;
 
-    public App() : this(
-        new IApiAction[]
-        {
-            new KochFractalAction(),
-            new DragonFractalAction(),
-            new UpdateImageSettingsAction(),
-            new GetImageSettingsAction(),
-            new UpdatePaletteSettingsAction(),
-            new GetPaletteSettingsAction()
-        })
-    {
-    }
-
     public App(IEnumerable<IApiAction> actions)
     {
         var actionsArray = actions.ToArray();
         httpListener = new HttpListener();
         httpListener.Prefixes.Add(Endpoint);
         routeActions = actionsArray.ToDictionary(action => $"{action.HttpMethod} {action.Endpoint}", action => action);
-        DependencyInjector.Inject<IImageSettingsProvider>(actionsArray, CreateSettingsManager().Load());
-        DependencyInjector.Inject(actionsArray, new Palette());
     }
 
     public async Task Run()
@@ -45,8 +26,7 @@ public async Task Run()
         while (true)
         {
             var context = await httpListener.GetContextAsync();
-
-            // Обработка запроса
+
             try
             {
                 var actionKey = $"{context.Request.HttpMethod} {context.Request.Url!.AbsolutePath}";
@@ -68,7 +48,6 @@ public async Task Run()
 
                 action.Perform(context.Request.InputStream, context.Response.OutputStream);
             }
-            // Перехват ошибок
             catch (Exception e)
             {
                 context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
@@ -79,19 +58,5 @@ public async Task Run()
                 context.Response.Close();
             }
         }
-        // ReSharper disable once FunctionNeverReturns
-    }
-
-    private static SettingsManager CreateSettingsManager()
-    {
-        var services = new ServiceCollection();
-        services.AddSingleton<IObjectSerializer, XmlObjectSerializer>();
-        services.AddSingleton<IBlobStorage, FileBlobStorage>();
-        services.AddSingleton<SettingsManager>();
-
-        var sp = services.BuildServiceProvider();
-        var settingsManager = sp.GetRequiredService<SettingsManager>();
-
-        return settingsManager;
     }
 }

FractalPainter/Application/Fractals/DragonPainter.cs

@@ -1,21 +1,20 @@
 using System.Drawing;
 using FractalPainting.Application.Models;
 using FractalPainting.Infrastructure.Common;
-using Color = FractalPainting.Application.Models.Color;
 using Point = FractalPainting.Application.Models.Point;
 using Rectangle = FractalPainting.Application.Models.Rectangle;
 
 namespace FractalPainting.Application.Fractals;
 
-public class DragonPainter(DragonSettings settings, IImageSettingsProvider imageSettingsProvider)
+public class DragonPainter(Palette palette, DragonSettings settings, IImageSettingsProvider imageSettingsProvider)
 {
     public IReadOnlyCollection<Figure> Paint()
     {
         var imageSettings = imageSettingsProvider.ImageSettings;
         var size = Math.Min(imageSettings.Width, imageSettings.Height) / 2.1f;
 
-        var backgroundColor = new Color(0, 0, 0);
-        var foregroundColor = new Color(255, 255, 0);
+        var backgroundColor = palette.BackgroundColor;
+        var foregroundColor = palette.PrimaryColor;
 
         var figures = new List<Figure>();
         figures.Add(new Rectangle(imageSettings.Width, imageSettings.Height, new Point(0, 0), backgroundColor));

FractalPainter/Application/static/index.html

@@ -110,10 +110,10 @@
     <!--    </div>-->
 
     <div class="dropdown">
-        <button class="dropbtn">Фракталы</button>
+        <button class="dropbtn">Генераторы точек</button>
         <div class="dropdown-content">
-            <a href="#" id="dragon-fractal-btn">Дракон</a>
-            <a href="#" id="koch-fractal-btn">Кривая Коха</a>
+            <a href="#" id="spiral-generator-btn">Спираль</a>
+            <a href="#" id="astroid-generator-btn">Астроида</a>
         </div>
     </div>
 
@@ -122,6 +122,7 @@
         <div class="dropdown-content">
             <a href="#" id="image-settings-btn">Изображение</a>
             <a href="#" id="palette-settings-btn">Палитра</a>
+            <a href="#" id="logic-settings-btn">Логика</a>
         </div>
     </div>
 </nav>
@@ -365,7 +366,7 @@
             }
         });
 
-    const kochFractalBtn = document.querySelector("#koch-fractal-btn");
+    const kochFractalBtn = document.querySelector("#astroid-generator-btn");
     kochFractalBtn.addEventListener("click", function (event) {
         event.preventDefault();
         post("/kochFractal")
@@ -483,7 +484,7 @@
         dragonFractalSettingsModal.classList.remove("hidden");
     }
 
-    const dragonFractalButton = document.querySelector("#dragon-fractal-btn");
+    const dragonFractalButton = document.querySelector("#spiral-generator-btn");
     dragonFractalButton.addEventListener("click", function (_) {
         openDragonFractalSettingModal();
     });

FractalPainter/Infrastructure/Common/DragonPainterFactory.cs

@@ -0,0 +1,11 @@
+using FractalPainting.Application.Fractals;
+
+namespace FractalPainting.Infrastructure.Common;
+
+public class DragonPainterFactory(IImageSettingsProvider imageSettingsProvider, Palette palette) : IDragonPainterFactory
+{
+    private readonly IImageSettingsProvider imageSettingsProvider = imageSettingsProvider;
+
+    public DragonPainter Create(DragonSettings settings) =>
+        new DragonPainter(palette, settings, imageSettingsProvider);
+}

FractalPainter/Infrastructure/Common/Palette.cs

@@ -4,7 +4,7 @@ namespace FractalPainting.Infrastructure.Common;
 
 public class Palette
 {
-    public Color PrimaryColor { get; set; } = new(255, 255, 0); // 255 255 0
-    public Color SecondaryColor { get; set; } = new(255, 0, 0); // 255 0 0
-    public Color BackgroundColor { get; set; } = new(0, 0, 139); // 0 0 139
+    public Color PrimaryColor { get; set; } = new(255, 255, 0);
+    public Color SecondaryColor { get; set; } = new(255, 0, 0);
+    public Color BackgroundColor { get; set; } = new(0, 0, 139);
 }