Правки

This commit is contained in:
Geo7312 2024-05-12 17:15:20 +04:00
parent 4ae1ca7105
commit ccd63daf04
3 changed files with 69 additions and 77 deletions

View File

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

View File

@ -1,4 +1,5 @@
using ProjectTrolleybus.Entities;
using System.Security.Policy;
namespace ProjectTrolleybus.Drawnings;
@ -97,9 +98,9 @@ public class DrawningTrolleyB
/// Конструктор, принимающий объект EntityTrolleyB в качестве параметра
/// </summary>
/// <param name="entityBulldozer"></param>
public DrawningTrolleyB(EntityTrolleyB entityTrolleyB)
public DrawningTrolleyB(EntityTrolleyB bull) : this()
{
EntityTrolleyB = entityTrolleyB;
EntityTrolleyB = new EntityTrolleyB(bull.Speed, bull.Weight, bull.BodyColor);
}
/// <summary>

View File

@ -25,10 +25,10 @@ public class DrawningTrolleybus : DrawningTrolleyB
/// <summary>
/// Конструктор, принимающий объект EntityTrolleyB в качестве параметра
/// </summary>
/// <param name="entityBulldozer"></param>
public DrawningTrolleybus(EntityTrolleyB entityTrolleyB)
/// <param name="entityTrolleyB"></param>
public DrawningTrolleybus(EntityTrolleybus exc) : base(150, 80)
{
EntityTrolleyB = entityTrolleyB;
EntityTrolleyB = new EntityTrolleybus(exc.Speed, exc.Weight, exc.BodyColor, exc.AdditionalColor, exc.BatteryCompartment, exc.Horns);
}
public override void DrawTransport(Graphics g)