7 лабораторная работа

ProjectLiner/ProjectLiner/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,6 @@
 using ProjectLiner.CollectionGenericObjects;
+using ProjectLiner.Exceptions;
+using System.Collections.Generic;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -10,12 +12,12 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     /// <summary>
     /// Список объектов, которые храним
     /// </summary>
-    private readonly Dictionary<int, T> _collection;
+    private readonly List<T?> _collection;
     /// <summary>
     /// Максимально допустимое число объектов в списке
     /// </summary>
     private int _maxCount;
-    public int Count => _collection.Keys.Count;
+    public int Count => _collection.Count;
     public int MaxCount
     {
         get
@@ -43,27 +45,31 @@ 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();
+        if (_collection[position] == null) throw new ObjectNotFoundException();
         return _collection[position];
     }
     public int Insert(T obj)
     {
-        if (Count > _maxCount) return -1;
+        if (Count == _maxCount) throw new CollectionOverflowException();
-        _collection[Count-1] = obj;
+        _collection.Add(obj);
         return Count;
     }
+
     public int Insert(T obj, int position)
     {
-        if (Count > _maxCount) return -1;
+        if (Count == _maxCount) throw new CollectionOverflowException();
-        _collection[position] = obj;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException();
-        return 1;
+        _collection.Insert(position, obj);
+        return position;
     }
-    public T? Remove(int position)
+
+    public T Remove(int position)
     {
-        if (_collection.ContainsKey(position)) return null;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException();
-        T? temp = _collection[position];
+        T obj = _collection[position];
-        _collection.Remove(position);
+        _collection.RemoveAt(position);
-        return temp;
+        return obj;
     }
 
     public IEnumerable<T?> GetItems()

ProjectLiner/ProjectLiner/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,6 @@
 
+using ProjectLiner.Exceptions;
+
 namespace ProjectLiner.CollectionGenericObjects
 {
     /// <summary>
@@ -50,8 +52,7 @@ namespace ProjectLiner.CollectionGenericObjects
 
         public T? Get(int position)
         {
-            if (position < 0 || position >= Count)
+            if (position < 0 || position >= Count) throw new PositionOutOfCollectionException();
-                return null;
             return _collection[position];
         }
 
@@ -65,12 +66,13 @@ namespace ProjectLiner.CollectionGenericObjects
                     return i;
                 }
             }
-            return -1;
+            throw new CollectionOverflowException();
         }
 
         public int Insert(T obj, int position)
         {
-            if (position >= Count || position < 0) return -1;
+
+            if (position >= Count || position < 0) throw new PositionOutOfCollectionException();
             if (_collection[position] == null)
             {
                 _collection[position] = obj;
@@ -96,21 +98,16 @@ namespace ProjectLiner.CollectionGenericObjects
                 }
                 --temp;
             }
-            return -1;
+            throw new CollectionOverflowException();
         }
 
         public T? Remove(int position)
         {
-            if (position < 0 || position >= Count)
+            if (position >= Count || position < 0) throw new PositionOutOfCollectionException();
-            {
+            T? myObject = _collection[position];
-                return null;
+            if (myObject == null) throw new ObjectNotFoundException();
-            }
-
-            //if (_collection[position] == null) return null;
-
-            T? temp = _collection[position];
             _collection[position] = null;
-            return temp;
+            return myObject;
         }
 
         public IEnumerable<T?> GetItems()

ProjectLiner/ProjectLiner/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,6 @@
 using ProjectLiner.CollectionGenericObjects;
 using ProjectLiner.Drawnings;
+using ProjectLiner.Exceptions;
 
 /// <summary>
 /// Класс-хранилище коллекций
@@ -90,10 +91,10 @@ public class StorageCollection<T>
     /// </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))
             File.Delete(filename);
@@ -128,7 +129,6 @@ public class StorageCollection<T>
                 sw.Write(_separatorItems);
             }
         }
-        return true;
     }
 
     /// <summary>
@@ -136,26 +136,24 @@ public class StorageCollection<T>
     /// </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($"{filename} не существует");
         }
 
         using (FileStream fs = new(filename, FileMode.Open))
         {
             using StreamReader sr = new StreamReader(fs);
-
+            string line = sr.ReadLine();
-            string str = sr.ReadLine();
+            if (line == null || line.Length == 0)
-            if (str == null || str.Length == 0)
             {
-                return false;
+                throw new Exception("Файл не подходит");
             }
-
+            if (!line.Equals(_collectionKey))
-            if (!str.Equals(_collectionKey))
             {
-                return false;
+                throw new Exception("В файле неверные данные");
             }
             _storages.Clear();
 
@@ -171,7 +169,7 @@ public class StorageCollection<T>
                 ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
                 if (collection == null)
                 {
-                    return false;
+                    throw new Exception("Не удалось создать коллекцию");
                 }
 
                 collection.MaxCount = Convert.ToInt32(record[2]);
@@ -180,15 +178,23 @@ public class StorageCollection<T>
                 foreach (string elem in set)
                 {
                     if (elem?.CreateDrawningCommonLiner() is T commonLiner)
+                    {
+                        try
                         {
                             if (collection.Insert(commonLiner) == -1)
-                            return false;
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: ");
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
+                        }
                     }
                 }
                 _storages.Add(record[0], collection);
             }
         }
-        return true;
     }
 
     /// <summary>

ProjectLiner/ProjectLiner/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции
+/// </summary>
+public class CollectionOverflowException : ApplicationException
+{
+    public CollectionOverflowException(int count) : base("В коллекции превышено допустимое колличество: " + count) { }
+    public CollectionOverflowException() : base() { }
+    public CollectionOverflowException(string message) : base(message) { }
+    public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
+    protected CollectionOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

ProjectLiner/ProjectLiner/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку, что по указанной позиции нет элемента
+/// </summary>
+public 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 contex) : base(info, contex) { }
+}

ProjectLiner/ProjectLiner/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLiner.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку выхода за границы коллекции
+/// </summary>
+[Serializable]
+public 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 contex) : base(info, contex) { }
+}

ProjectLiner/ProjectLiner/FormLinerCollection.cs

@@ -1,4 +1,5 @@
 
+using Microsoft.Extensions.Logging;
 using ProjectLiner.CollectionGenericObjects;
 using ProjectLiner.Drawnings;
 using System.Windows.Forms;
@@ -18,12 +19,17 @@ public partial class FormLinerCollection : Form
     /// </summary>
     private AbstractCompany? _company = null;
     /// <summary>
+    /// Логгер
+    /// </summary>
+    private readonly ILogger _logger;
+    /// <summary>
     /// Конструктор
     /// </summary>
-    public FormLinerCollection()
+    public FormLinerCollection(ILogger<FormLinerCollection> logger)
     {
         InitializeComponent();
         _storageCollection = new();
+        _logger = logger;
     }
     /// <summary>
     /// Выбор компании
@@ -233,13 +239,16 @@ public partial class FormLinerCollection : 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);
             }
         }
     }
@@ -253,14 +262,19 @@ public partial class FormLinerCollection : Form
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            if (_storageCollection.LoadData(openFileDialog.FileName))
+            try
             {
+                _storageCollection.LoadData(openFileDialog.FileName);
                 MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                foreach (var collection in _storageCollection.Keys)
+                {
+                    listBoxCollection.Items.Add(collection);
+                }
                 RerfreshListBoxItems();
             }
-            else
+            catch (Exception ex)
             {
-                MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }

ProjectLiner/ProjectLiner/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
+using System;
+
 namespace ProjectLiner
 {
     internal static class Program
@@ -11,7 +16,27 @@ namespace ProjectLiner
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormLinerCollection());
+
+            ServiceCollection services = new();
+            ConfigureService(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormLinerCollection>());
+        }
+
+        /// <summary>
+        /// Êîíôèãóðàöèÿ Ñåðâåñà DI
+        /// </summary>
+        /// <param name="services"></param>
+        private static void ConfigureService(ServiceCollection services)
+        {
+            services
+                .AddSingleton<FormLinerCollection>()
+                .AddLogging(option => {
+                    option.SetMinimumLevel(LogLevel.Information);
+                    option.AddNLog("serilog.config");
+                });
+
+
         }
     }
 }

ProjectLiner/ProjectLiner/ProjectLiner.csproj

@@ -8,6 +8,11 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -23,4 +28,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="serilog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

ProjectLiner/ProjectLiner/serilog.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ autoReload="true" internalLogLevel="Info">
+		<targets>
+			<target xsi:type="File" name="tofile" fileName="carlog-${shortdate}.log" />
+		</targets>
+		<rules>
+			<logger name="*" minlevel="Debug" writeTo="tofile" />
+		</rules>
+	</nlog>
+</configuration>