Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Excavator.Exceptions;
 
 namespace Excavator.CollectionGenericObjects;
 
@@ -45,27 +41,27 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T Get(int position)
     {
-        if (position >= Count || position < 0) return null;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         return _collection[position];
     }
 
     public int Insert(T obj)
     {
-        if (Count == _maxCount) return -1;
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
         _collection.Add(obj);
         return Count;
     }
     public int Insert(T obj, int position)
     {
-        if (Count == _maxCount) return -1;
-        if (position >= Count || position < 0) return -1;
+        if (Count == _maxCount) throw new CollectionOverflowException(Count); ;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         _collection.Insert(position, obj);
         return position;
     }
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         T temp = _collection[position];
         _collection.RemoveAt(position);
         return temp;

Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,6 @@
-namespace Excavator.CollectionGenericObjects;
+using Excavator.Exceptions;
+
+namespace Excavator.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -51,7 +53,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         // TODO проверка позиции
         if (position < 0 || position >= Count)
         {
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
 
         return _collection[position];
@@ -67,21 +69,16 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
                 return i;
             }
          }
-        
-        return -1;
+
+        throw new CollectionOverflowException(Count);
     }
 
     public int Insert(T obj, int position)
     {
-        // TODO проверка позиции
-        // TODO проверка, что элемент массима по этой позиции пустой,
-        // если элемент массима по этой позиции не пустой,
-        // найти свободное место после этой позиции, если не найдено,
-        // то искать до
-        // TODO вставка
+        
         if (position < 0 || position >= Count)
         {
-            return -1;
+            throw new PositionOutOfCollectionException(position);
         }
 
         if (_collection[position] == null)
@@ -110,14 +107,18 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
-        T obj = _collection[position];
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position); ;
+        T? obj = _collection[position];
+        if (obj == null)
+        {
+            throw new ObjectNotFoundException(position);
+        }
         _collection[position] = null;
         return obj;
     }

Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,6 @@
 using Excavator.Drawnings;
 using System.Text;
+using Excavator.Exceptions;
 
 namespace Excavator.CollectionGenericObjects;
 
@@ -90,11 +91,11 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - сохранение прошло успешно, false - ошибка при сохранение данных</returns>
-    public bool SaveData(string filename)
+    public void SaveData(string filename)
     {
         if (_storages.Count == 0)
         {
-            return false;
+            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
         }
 
         if (File.Exists(filename))
@@ -137,10 +138,7 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
 
                 writer.Write(sb);
             }
-
         }
-
-        return true;
     }
 
     /// <summary>
@@ -148,11 +146,11 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
     /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-    public bool LoadData(string filename)
+    public void LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
-            return false;
+            throw new FileNotFoundException("Файл не существует");
         }
 
         using (StreamReader fs = File.OpenText(filename))
@@ -161,12 +159,12 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
 
             if (str == null || str.Length == 0)
             {
-                return false;
+                throw new IOException("В файле нет данных");
             }
 
             if (!str.StartsWith(_collectionKey))
             {
-                return false;
+                throw new IOException("В файле неверные данные");
             }
 
             _storages.Clear();
@@ -180,11 +178,8 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
                 }
 
                 CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                if (collection == null)
-                {
-                    return false;
-                }
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType) ??
+                    throw new Exception("Не удалось определить тип коллекции: " + record[1]);
 
                 collection.MaxCount = Convert.ToInt32(record[2]);
 
@@ -193,15 +188,21 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
                 {
                     if (elem?.CreateDrawningSimpleExcavator() is T excavator)
                     {
-                        if (collection.Insert(excavator) == -1)
+                        try
                         {
-                            return false;
+                            if (collection.Insert(excavator) == -1)
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
                         }
                     }
                 }
                 _storages.Add(record[0], collection);
             }
-            return true;
         }
     }
 

Excavator/Excavator/Excavator.csproj

@@ -8,4 +8,23 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
+    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Serilog.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

Excavator/Excavator/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции
+/// </summary>
+[Serializable]
+internal class CollectionOverflowException : ApplicationException
+{
+    public CollectionOverflowException(int Count) : base("В коллекции превышено допустимое количество: " + 20) { }
+
+    public CollectionOverflowException() : base() { }
+
+    public CollectionOverflowException(string Message) : base(Message) { }
+
+    public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
+
+    protected CollectionOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+}

Excavator/Excavator/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,23 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку, что по указанной позиции нет элемента
+/// </summary>
+[Serializable]
+internal class ObjectNotFoundException : ApplicationException
+{
+    public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
+
+    public ObjectNotFoundException() : base() { }
+
+    public ObjectNotFoundException(string message) : base(message) { }
+
+    public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { }
+
+    protected ObjectNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+}
+
+
+

Excavator/Excavator/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку выхода за границы коллекции
+/// </summary>
+[Serializable]
+internal class PositionOutOfCollectionException : ApplicationException
+{
+    public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции. Позиция " + i) { }
+
+    public PositionOutOfCollectionException() : base() { }
+
+    public PositionOutOfCollectionException(string message) : base(message) { }
+
+    public PositionOutOfCollectionException(string message, Exception exception) : base(message, exception) { }
+
+    protected PositionOutOfCollectionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+}

Excavator/Excavator/FormExcavatorCollection.cs

@@ -1,5 +1,7 @@
-using Excavator.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using Excavator.CollectionGenericObjects;
 using Excavator.Drawnings;
+using Excavator.Exceptions;
 
 namespace Excavator;
 
@@ -13,10 +15,17 @@ public partial class FormExcavatorCollection : Form
 
     private AbstractCompany? _company = null;
 
-    public FormExcavatorCollection()
+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
+    public FormExcavatorCollection(ILogger<FormExcavatorCollection> logger)
     {
         InitializeComponent();
         _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма создалась");
     }
 
     private void pictureBox_Click(object sender, EventArgs e)
@@ -45,20 +54,27 @@ public partial class FormExcavatorCollection : Form
     /// <param name="truck"></param>
     private void SetExcavator(DrawningSimpleExcavator excavator)
     {
-        if (_company == null || excavator == null)
+        try
         {
-            return;
+            if (_company == null || excavator == null)
+            {
+                return;
+            }
+            if (_company + excavator != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: " + excavator.GetDataForSave());
+            }
         }
-        if (_company + excavator != -1)
+        catch (ObjectNotFoundException ex) { }
+        catch (CollectionOverflowException ex)
         {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show(ex.Message);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
+
     private void ButtonRemoveExcavator_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
@@ -72,16 +88,21 @@ public partial class FormExcavatorCollection : Form
         }
 
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+    try
+    {
         if (_company - pos != null)
         {
             MessageBox.Show("Объект удален");
             pictureBox.Image = _company.Show();
-        }
-        else
-        {
-            MessageBox.Show("Не удалось удалить объект");
+            _logger.LogInformation("Удален объект по позиции " + pos);
         }
     }
+    catch (Exception ex)
+    {
+        MessageBox.Show(ex.Message);
+        _logger.LogError("Ошибка: {Message}", ex.Message);
+    }
+}
     /// <summary>
 	/// Передача объекта в другую форму
 	/// </summary>
@@ -96,26 +117,32 @@ public partial class FormExcavatorCollection : Form
 
         DrawningSimpleExcavator? excavator = null;
         int counter = 100;
-        while (excavator == null)
+        try
         {
-            excavator = _company.GetRandomObject();
-            counter--;
-            if (counter <= 0)
-            {
-                break;
-            }
-        }
+                while (excavator == null)
+                {
+                    excavator = _company.GetRandomObject();
+                    counter--;
+                    if (counter <= 0)
+                    {
+                        break;
+                    }
+                }
 
         if (excavator == null)
         {
             return;
         }
-
-        FormExcavator form = new()
-        {
-            SetExcavator = excavator
-        };
+            FormExcavator form = new()
+            {
+                SetExcavator = excavator
+            };
         form.ShowDialog();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
     }
 
     /// <summary>
@@ -167,18 +194,26 @@ public partial class FormExcavatorCollection : Form
             return;
         }
 
-        CollectionType collectionType = CollectionType.None;
-        if (radioButtonMassive.Checked)
+        try
         {
-            collectionType = CollectionType.Massive;
-        }
-        else if (radioButtonList.Checked)
-        {
-            collectionType = CollectionType.List;
-        }
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
 
-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-        RerfreshListBoxItems();
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RerfreshListBoxItems();
+            _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text);
+        }
+        catch (Exception ex)
+            {
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
     }
 
     /// <summary>
@@ -194,12 +229,20 @@ public partial class FormExcavatorCollection : Form
             return;
         }
 
-        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+        try
         {
-            return;
+            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+            _logger.LogInformation("Коллекция " + listBoxCollection.SelectedItem.ToString() + " удалена");
+            RerfreshListBoxItems();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
-        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-        RerfreshListBoxItems();
     }
 
     private void buttonCreateCompany_Click(object sender, EventArgs e)
@@ -232,30 +275,36 @@ public partial class FormExcavatorCollection : Form
     {
         if (saveFileDialog.ShowDialog() == DialogResult.OK)
         {
-            if (_storageCollection.SaveData(saveFileDialog.FileName))
+            try
             {
+                _storageCollection.SaveData(saveFileDialog.FileName);
                 MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
             }
-            else
+            catch (Exception ex)
             {
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
             }
         }
     }
 
-    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-    {
-        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (_storageCollection.LoadData(openFileDialog.FileName))
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-            else
-            {
-                MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                try
+                {
+                    _storageCollection.LoadData(openFileDialog.FileName);
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError("Ошибка: {Message}", ex.Message);
+                }
             }
         }
-        RerfreshListBoxItems();
-    }
+    
 }

Excavator/Excavator/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace Excavator
 {
     internal static class Program
@@ -11,7 +16,29 @@ namespace Excavator
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormExcavatorCollection());
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormExcavatorCollection>());
+        }
+
+        /// <summary>
+        /// Êîíôèãóðàöèÿ ñåðâèñà DI
+        /// </summary>
+        /// <param name="services"></param>
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            
+            services.AddSingleton<FormExcavatorCollection>()
+                .AddLogging(option =>
+                {
+                    option.SetMinimumLevel(LogLevel.Information);
+                    option.AddSerilog(new LoggerConfiguration()
+                        .ReadFrom.Configuration(new ConfigurationBuilder()
+                        .AddJsonFile("serilog.json")
+                        .Build())
+                        .CreateLogger());
+                });
         }
     }
 }

Excavator/Excavator/Serilog.json

@@ -0,0 +1,18 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "log.log",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Properties": {
+      "Application": "Excavator"
+    }
+  }
+}