RedFox245/PIbd-21_Egorov_M.A._Sailboat_Base
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Испраивл недочёты

Browse Source
This commit is contained in:
Максим Егоров 2024-08-29 21:57:17 +04:00
parent 62a2bf7716
commit 9010db3b24
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Sailboat/Sailboat/BoatsGenericStorage.cs
View File

@ -128,7 +128,7 @@ namespace Sailboat.Generics
/// Загрузка информации по лодкам в хранилище из файла
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - загрузка прошла успешно, false - ошибка призагрузке данных</returns>
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
public bool LoadData(string filename)
{
if (!File.Exists(filename))
@ -136,50 +136,52 @@ namespace Sailboat.Generics
return false;
}
using (StreamReader bs = File.OpenText(filename))
string bufferTextFromFile = "";
using (FileStream fs = new(filename, FileMode.Open))
{
string str = bs.ReadLine();
if (str == null || str.Length == 0)
byte[] b = new byte[fs.Length];
UTF8Encoding temp = new(true);
while (fs.Read(b, 0, b.Length) > 0)
{
return false;
bufferTextFromFile += temp.GetString(b);
}
if (!str.StartsWith("BoatStorage"))
}
var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' },
StringSplitOptions.RemoveEmptyEntries);
if (strs == null || strs.Length == 0)
{
return false;
}
if (!strs[0].StartsWith("BoatStorage"))
{
//если нет такой записи, то это не те данные
return false;
}
_boatStorages.Clear();
foreach (string data in strs)
{
string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 2)
{
return false;
continue;
}
_boatStorages.Clear();
string strs = "";
while ((strs = bs.ReadLine()) != null)
BoatsGenericCollection<DrawingBoat, DrawingObjectBoat> collection = new(_pictureWidth, _pictureHeight);
string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set)
{
if (strs == null)
DrawingBoat? boat = elem?.CreateDrawingBoat(_separatorForObject, _pictureWidth, _pictureHeight);
if (boat != null)
{
return false;
}
string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 2)
{
continue;
}
BoatsGenericCollection<DrawingBoat, DrawingObjectBoat> collection = new(_pictureWidth, _pictureHeight);
string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set)
{
DrawingBoat? boat = elem?.CreateDrawingBoat(_separatorForObject, _pictureWidth, _pictureHeight);
if (boat != null)
if (!(collection + boat))
{
if (!(collection + boat))
{
return false;
}
return false;
}
}
_boatStorages.Add(record[0], collection);
}
return true;
_boatStorages.Add(record[0], collection);
}
return true;
}
}
}

2
Sailboat/Sailboat/ExtentionDrawningBoat.cs
View File

@ -40,7 +40,7 @@ namespace Sailboat.DrawingObjects
/// <summary>
/// Получение данных для сохранения в файл
/// </summary>
/// <param name="drawningCar">Сохраняемый объект</param>
/// <param name="drawningBoat">Сохраняемый объект</param>
/// <param name="separatorForObject">Разделитель даннных</param>
/// <returns>Строка с данными по объекту</returns>
public static string GetDataForSave(this DrawingBoat drawingBoat, char separatorForObject)