victinass/PIbd-11_Gulina_V.S._Simple
victinass/PIbd-11_Gulina_V.S._Simple
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

потом доделаю

Browse Source
This commit is contained in:
victinass 2024-04-28 22:03:27 +04:00
parent 69ba7b26d6
commit 5831712711
9 changed files with 135 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Battleship/Battleship/Battleship.csproj
View File

@ -8,6 +8,10 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>

6
Battleship/Battleship/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -1,4 +1,6 @@
namespace Battleship.CollectionGenericObjects;
using Battleship.Exception;
namespace Battleship.CollectionGenericObjects;
/// <summary>
/// Конструктор
@ -55,7 +57,7 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
// TODO проверка, что не превышено максимальное количество элементов
// TODO проверка позиции
// TODO вставка по позиции
if (Count == _maxCount) return -1;
if (Count == _maxCount) throw new CollectionOverflowException(_maxCount);
_collection.Add(obj);
return Count;
}

5
Battleship/Battleship/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -1,4 +1,6 @@

using Battleship.Exception;
namespace Battleship.CollectionGenericObjects;
/// <summary>
@ -12,6 +14,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
/// Массив объектов, которые храним
/// </summary>
private T?[] _collection;
private int _maxCount;
public int Count => _collection.Length;
@ -70,7 +73,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
}
++index;
}
return -1;
throw new CollectionOverflowException(_maxCount);
}
public int Insert(T obj, int position)

42
Battleship/Battleship/CollectionGenericObjects/StorageCollection.cs
View File

@ -1,5 +1,6 @@
using Battleship.Drawings;
using System.Text;
using Battleship.Exception;
namespace Battleship.CollectionGenericObjects;
@ -20,6 +21,11 @@ public class StorageCollection<T>
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Ключевое слово, с которого должен начинаться файл
/// </summary>
private readonly string _collectionKey = "CollectionStorage";
/// <summary>
/// Конструктор
/// </summary>
@ -36,9 +42,10 @@ public class StorageCollection<T>
public void AddCollection(string name, CollectionType collectionType)
{
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
if (_storages.ContainsKey(name))
if (string.IsNullOrEmpty(name) || _storages.ContainsKey(name))
{
return;
}
// TODO Прописать логику для добавления
if (collectionType == CollectionType.List)
{
@ -80,6 +87,9 @@ public class StorageCollection<T>
}
}
/// <summary>
/// Ключевое слово, с которого должен начинаться файл
/// </summary>
private readonly string _collectionKey = "CollectionsStorage";
private readonly string _separatorForKeyValue = "|";
@ -91,11 +101,11 @@ public class StorageCollection<T>
/// </summary>
/// <param name="filname"></param>
/// <returns></returns>
public bool SaveData(string filname)
public void SaveData(string filname)
{
if (_storages.Count == 0)
{
return false;
throw new Exception("В хранилище отсутствуют коллекции для сохранения");
}
if (File.Exists(filname))
@ -117,7 +127,7 @@ public class StorageCollection<T>
// не сохраняем пустые коллекции
if (value.Value.Count == 0)
{
continue;
throw new Exception("В хранилище отсутствуют коллекции для сохранения");
}
sb.Append(value.Key);
@ -143,7 +153,6 @@ public class StorageCollection<T>
using FileStream fs = new(filname, FileMode.Create);
byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
fs.Write(info, 0, info.Length);
return true;
}
/// <summary>
@ -151,11 +160,11 @@ public class StorageCollection<T>
/// </summary>
/// <param name="filename"></param>
/// <returns></returns>
public bool LoadData(string filename)
public void LoadData(string filename)
{
if (!File.Exists(filename))
{
return false;
throw new Exception("Файл не существует");
}
string bufferTextFromFile = "";
@ -172,12 +181,11 @@ public class StorageCollection<T>
string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
if (strs == null || strs.Length == 0)
{
return false;
throw new Exception("В файле нет данных");
}
if (!strs[0].Equals(_collectionKey))
{
//если нет такой записи, то это не те файлы
return false;
throw new Exception("В файле неверные данные");
}
_storages.Clear();
@ -193,7 +201,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]);
@ -201,17 +209,23 @@ public class StorageCollection<T>
foreach (string elem in set)
{
if (elem?.CreateDrawingWarship() is T warship)
{
try
{
if (collection.Insert(warship) == -1)
{
return false;
throw new Exception("Не удалось создать коллекцию");
}
}
catch (CollectionOverflowException ex)
{
throw new Exception("Коллекция переполнена", ex);
}
}
}
_storages.Add(record[0], collection);
}
return true;
}
private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)

20
Battleship/Battleship/Exception/CollectionOverflowException.cs Normal file
View File

@ -0,0 +1,20 @@
using System.Runtime.Serialization;
namespace Battleship.Exception;
/// <summary>
/// Класс, описывающий ошибку переполнения коллекции
/// </summary>
[Serializable]
internal class CollectionOverflowException : ApplicationException
{
public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество count" + 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) { }
}

19
Battleship/Battleship/Exception/ObjectNotFoundException.cs Normal file
View File

@ -0,0 +1,19 @@
using System.Runtime.Serialization;
namespace Battleship.Exception;
/// <summary>
/// Класс, описывающий ошибку, что по указанной позиции нет элемента
/// </summary>
[Serializable]
internal class ObjectNotFoundException : ApplicationException
{
public ObjectNotFoundException(int count) : base("В коллекции превышено допустимое количество count" + count) { }
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) { }
}

20
Battleship/Battleship/Exception/PositionOutOfCollectionException.cs Normal file
View File

@ -0,0 +1,20 @@
using System.Runtime.Serialization;
namespace Battleship.Exception;
/// <summary>
/// Класс, описывающий ошибку выхода за границы коллекции
/// </summary>
[Serializable]
internal class PositionOutOfCollectionException : ApplicationException
{
public PositionOutOfCollectionException(int count) : base("В коллекции превышено допустимое количество count" + count) { }
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) { }
}

15
Battleship/Battleship/FormWarshipCollection.cs
View File

@ -1,5 +1,6 @@
using Battleship.CollectionGenericObjects;
using Battleship.Drawings;
using Microsoft.Extensions.Logging;
using System.Windows.Forms;
namespace Battleship;
@ -19,13 +20,16 @@ public partial class FormWarshipCollection : Form
/// </summary>
private AbstractCompany? _company = null;
private readonly ILogger _logger;
/// <summary>
/// Конструктор
/// </summary>
public FormWarshipCollection()
public FormWarshipCollection(ILogger<FormWarshipCollection> logger)
{
InitializeComponent();
_storageCollection = new();
_logger = logger;
}
/// <summary>
@ -256,13 +260,16 @@ public partial class FormWarshipCollection : 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);
}
}
}

26
Battleship/Battleship/Program.cs
View File

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