пара изменений

This commit is contained in:
ikswi 2024-04-18 09:50:01 +04:00
parent f7d998f50d
commit 2ca0bf1362
3 changed files with 70 additions and 75 deletions

View File

@ -106,25 +106,24 @@ public class StorageCollection<T>
File.Delete(filename); File.Delete(filename);
} }
StringBuilder sb = new(); using (StreamWriter writer = new StreamWriter(filename))
{
sb.Append(_collectionKey); writer.Write(_collectionKey);
foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages) foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
{ {
StringBuilder sb = new();
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);
// не сохраняем пустые коллекции // не сохраняем пустые коллекции
if (value.Value.Count == 0) if (value.Value.Count == 0)
{ {
continue; continue;
} }
sb.Append(value.Key); sb.Append(value.Key);
sb.Append(_separatorForKeyValue); sb.Append(_separatorForKeyValue);
sb.Append(value.Value.GetCollectionType); sb.Append(value.Value.GetCollectionType);
sb.Append(_separatorForKeyValue); sb.Append(_separatorForKeyValue);
sb.Append(value.Value.MaxCount); sb.Append(value.Value.MaxCount);
sb.Append(_separatorForKeyValue); sb.Append(_separatorForKeyValue);
foreach (T? item in value.Value.GetItems()) foreach (T? item in value.Value.GetItems())
{ {
string data = item?.GetDataForSave() ?? string.Empty; string data = item?.GetDataForSave() ?? string.Empty;
@ -132,15 +131,14 @@ public class StorageCollection<T>
{ {
continue; continue;
} }
sb.Append(data); sb.Append(data);
sb.Append(_separatorItems); sb.Append(_separatorItems);
} }
writer.Write(sb);
}
} }
using FileStream fs = new(filename, FileMode.Create);
byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
fs.Write(info, 0, info.Length);
return true; return true;
} }
@ -155,65 +153,54 @@ public class StorageCollection<T>
{ {
return false; return false;
} }
using (StreamReader fs = File.OpenText(filename))
string bufferTextFromFile = "";
using (FileStream fs = new(filename, FileMode.Open))
{ {
byte[] b = new byte[fs.Length]; string str = fs.ReadLine();
UTF8Encoding temp = new(true); if (str == null || str.Length == 0)
while (fs.Read(b, 0, b.Length) > 0)
{
bufferTextFromFile += temp.GetString(b);
}
}
string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
if (strs == null || strs.Length == 0)
{ {
return false; return false;
} }
if (!str.StartsWith(_collectionKey))
if (!strs[0].Equals(_collectionKey))
{ {
//если нет такой записи, то это не те данные
return false; return false;
} }
_storages.Clear(); _storages.Clear();
foreach (string data in strs) string strs = "";
while ((strs = fs.ReadLine()) != null)
{ {
string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); //по идее этого произойти не должно
//if (strs == null)
//{
// return false;
//}
string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 4) if (record.Length != 4)
{ {
continue; continue;
} }
CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType); ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
if (collection == null) if (collection == null)
{ {
return false; return false;
} }
collection.MaxCount = Convert.ToInt32(record[2]); collection.MaxCount = Convert.ToInt32(record[2]);
string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set) foreach (string elem in set)
{ {
if (elem?.CreateDrawningMilitaryAircraft() is T militaryAircraft) if (elem?.CreateDrawningMilitaryAircraft() is T militaryAircraft)
{ {
if (!collection.Insert(militaryAircraft)) if (collection.Insert(militaryAircraft) == -1)
{ {
return false; return false;
} }
} }
} }
_storages.Add(record[0], collection); _storages.Add(record[0], collection);
} }
return true; return true;
} }
}
/// <summary> /// <summary>
/// Создание коллекции по типу /// Создание коллекции по типу

View File

@ -259,6 +259,7 @@ public partial class FormMilitaryAircraftCollection : Form
if (_storageCollection.LoadData(openFileDialog.FileName)) if (_storageCollection.LoadData(openFileDialog.FileName))
{ {
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
RerfreshListBoxItems();
} }
else else
{ {

View File

@ -40,9 +40,16 @@ public partial class FormMilitaryAircraftConfig : Form
/// </summary> /// </summary>
/// <param name="militaryAircraftDelegate"></param> /// <param name="militaryAircraftDelegate"></param>
public void AddEvent(Action<DrawningMilitaryAircraft> militaryAircraftDelegate) public void AddEvent(Action<DrawningMilitaryAircraft> militaryAircraftDelegate)
{
if (MilitaryAircraftDelegate != null)
{
MilitaryAircraftDelegate = militaryAircraftDelegate;
}
else
{ {
MilitaryAircraftDelegate += militaryAircraftDelegate; MilitaryAircraftDelegate += militaryAircraftDelegate;
} }
}
/// <summary> /// <summary>
/// Прорисовка объекта /// Прорисовка объекта