Refactor (#20)

client-generator-tests/Helpers/GeneratorAccessor.cs

@@ -10,10 +10,9 @@ namespace client_generator_tests.Helpers
     public class GeneratorAccessor : Generator
     {
 
-        public GeneratorAccessor(ITemplateFactory templateFactory)
+        public GeneratorAccessor(ITemplateFactory templateFactory) : base(new GeneratorContext(templateFactory))
         {
             GeneratorSettings.SchemePlace = SchemeGeneratePlace.WithCode;
-            GeneratorContext = new GeneratorContext(templateFactory);
         }
 
         public void AccessParseSchemas(IEnumerable<ISchema> schemas)

client-generator/App/AppController.cs

@@ -1,7 +1,6 @@
 using System;
 using client_generator.Generators;
 using logger;
-using logger.LogStrategies;
 using Terminal.Gui;
 
 namespace client_generator.App
@@ -11,11 +10,7 @@ public class AppController : IAppController
 
         private static readonly AppController AppControllerInstance = new AppController();
 
-        private readonly ILogger _logger = new LoggerFacade<RawLogger>(new LoggerSettings
-        {
-            LogLevel = LogLevel.Debug | LogLevel.Info | LogLevel.Warn | LogLevel.Error | LogLevel.Fatal,
-            DefaultLogStrategy = new FileLogStrategy("logs.log")
-        });
+        private ILogger _logger;
 
         private Window _currentWindow;
 
@@ -25,7 +20,7 @@ private AppController()
         {
         }
 
-        public GeneratorTemplate Generator { get; } = new Generator();
+        public GeneratorTemplate Generator { get; private set; }
 
         public static AppController Instance()
         {
@@ -37,10 +32,12 @@ public static ILogger GetLogger()
             return AppControllerInstance._logger;
         }
 
-        public void InitApp<T>() where T : Window, new()
+        public void StartWindow(Window window, GeneratorTemplate generator, ILogger logger)
         {
-            _logger.Info("Initialization...");
-            Application.Init();
+            _logger = logger;
+            Generator = generator;
+
+            _logger.Info("Initialization gui...");
             _toplevel = new Toplevel
             {
                 X = 0,
@@ -49,7 +46,7 @@ public static ILogger GetLogger()
                 Height = Dim.Fill()
             };
 
-            _currentWindow = new T();
+            _currentWindow = window;
             _toplevel.Add(_currentWindow);
 
             _logger.Info("Star up...");

client-generator/App/Commands/CommandsProvider.cs

@@ -0,0 +1,68 @@
+using System;
+using client_generator.App.Windows.MenuWindowStates;
+using client_generator.Models;
+using logger;
+using Newtonsoft.Json;
+using Terminal.Gui;
+
+namespace client_generator.App.Commands
+{
+    public class CommandsProvider : ICommandsProvider
+    {
+
+        private readonly AppController _appController;
+
+        private readonly ILogger _logger;
+
+        public CommandsProvider(AppController appController, ILogger logger)
+        {
+            _appController = appController;
+            _logger = logger;
+        }
+
+        public ICommand ExitCommand()
+        {
+            return new ExitAppCommand(_appController);
+        }
+
+        public ICommand ChangeWindowCommand(Window to)
+        {
+            return new ChangeWindowCommand(_appController, to);
+        }
+
+        public ICommand DeserializationCommand(
+            FileSystemEntry file,
+            JsonSerializerSettings deserializationSettings,
+            Action<OpenApiModel> onDeserialization,
+            Action<Exception> onError
+        )
+        {
+            return new DeserializationCommand(file, deserializationSettings, onDeserialization, onError);
+        }
+
+        public ICommand ShowPopupWindowCommand(
+            PopupWindow popupWindow,
+            Action<object> receiver,
+            Window current
+        )
+        {
+            var returnCommand = ChangeWindowCommand(current);
+            popupWindow.SetActionReceiver(o =>
+            {
+                receiver?.Invoke(o);
+                returnCommand.Execute();
+            });
+
+            return ChangeWindowCommand(popupWindow);
+        }
+
+        public ICommand GeneratorCommand(
+            OpenApiModel openApiModel, Action onSuccess,
+            Action<Exception> onError
+        )
+        {
+            return new GenerateCommand(_appController, _logger, openApiModel, onSuccess, onError);
+        }
+
+    }
+}

client-generator/App/Commands/GenerateCommand.cs

@@ -1,5 +1,6 @@
 using System;
 using client_generator.Models;
+using logger;
 
 namespace client_generator.App.Commands
 {
@@ -10,11 +11,17 @@ internal class GenerateCommand : ICommand
 
         private readonly Action _onSuccess;
 
+        private readonly AppController _controller;
+
+        private readonly ILogger _logger;
+
         private readonly OpenApiModel _openApiModel;
 
-        public GenerateCommand(OpenApiModel openApiModel, Action onSuccess,
+        public GenerateCommand(AppController controller, ILogger logger,OpenApiModel openApiModel, Action onSuccess,
             Action<Exception> onError)
         {
+            _controller = controller;
+            _logger = logger;
             _openApiModel = openApiModel;
             _onSuccess = onSuccess;
             _onError = onError;
@@ -24,8 +31,8 @@ public void Execute()
         {
             try
             {
-                AppController.GetLogger().Info("Generate client.");
-                AppController.Instance().Generator.Generate(_openApiModel);
+                _logger.Info("Generate client.");
+                _controller.Generator.Generate(_openApiModel);
                 _onSuccess.Invoke();
             }
             catch (Exception e)

client-generator/App/Commands/ICommandsProvider.cs

@@ -0,0 +1,33 @@
+using System;
+using client_generator.App.Windows.MenuWindowStates;
+using client_generator.Models;
+using Newtonsoft.Json;
+using Terminal.Gui;
+
+namespace client_generator.App.Commands
+{
+    public interface ICommandsProvider
+    {
+
+        ICommand ExitCommand();
+
+        ICommand DeserializationCommand(
+            FileSystemEntry file,
+            JsonSerializerSettings deserializationSettings,
+            Action<OpenApiModel> onDeserialization,
+            Action<Exception> onError
+        );
+
+        ICommand ShowPopupWindowCommand(
+            PopupWindow popupWindow,
+            Action<object> receiver,
+            Window current
+        );
+
+        ICommand GeneratorCommand(
+            OpenApiModel openApiModel, Action onSuccess,
+            Action<Exception> onError
+        );
+
+    }
+}