исправления

This commit is contained in:
Роман Пермяков 2024-04-22 13:51:51 +04:00
parent 439588bd32
commit a8023f8637

View File

@ -49,84 +49,96 @@ namespace AccordionBus.CollectionGenericObjects
public bool SaveData(string filename)
{
if (_storage.Count == 0) return false;
if (File.Exists(filename)) File.Delete(filename);
StringBuilder sb = new();
sb.Append(_collectionKey);
foreach(KeyValuePair<string, ICollectionGenericObjects<T>> value in _storage)
if (_storage.Count == 0)
{
sb.Append(Environment.NewLine);
if (value.Value.Count == 0) { 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)) continue;
sb.Append(data);
sb.Append(_separatorItem);
}
return false;
}
if (File.Exists(filename))
{
File.Delete(filename);
}
using (StreamWriter writer = new StreamWriter(filename))
{
writer.Write(_collectionKey);
foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storage)
{
StringBuilder sb = new();
sb.Append(Environment.NewLine);
// не сохраняем пустые коллекции
if (value.Value.Count == 0)
{
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))
{
continue;
}
sb.Append(data);
sb.Append(_separatorItem);
}
writer.Write(sb);
}
return true;
}
using FileStream fs = new(filename, FileMode.Create);
byte[] info = new UTF8Encoding().GetBytes(sb.ToString());
fs.Write(info, 0, info.Length);
return true;
}
public bool LoadData(string filename)
{
if (!File.Exists(filename)) return false;
string bufferTextFromFile = "";
using(FileStream fs = new(filename, FileMode.Open))
if (!File.Exists(filename))
{
byte[] b = new byte[fs.Length];
UTF8Encoding temp = new UTF8Encoding(true);
while (fs.Read(b, 0, b.Length) > 0)
{
bufferTextFromFile += temp.GetString(b);
}
return false;
}
string[] strs = bufferTextFromFile.Split(new char[] {'\n', '\r'}, StringSplitOptions.RemoveEmptyEntries);
if (strs.Length == 0 || strs == null) return false;
if (!strs[0].Equals(_collectionKey)) return false;
_storage.Clear();
foreach(string data in strs)
using (StreamReader reader = File.OpenText(filename))
{
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) return false;
collection.MaxCount = Convert.ToInt32(record[2]);
string[] set = record[3].Split(_separatorItem, StringSplitOptions.RemoveEmptyEntries);
foreach(string elem in set)
string str = reader.ReadLine();
if (str == null || str.Length == 0)
{
if (elem?.CreateDrawningBus() is T bus)
return false;
}
if (!str.StartsWith(_collectionKey))
{
return false;
}
_storage.Clear();
string strs = "";
while ((strs = reader.ReadLine()) != null)
{
string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
if (record.Length != 4)
{
if (!collection.Insert(bus)) return false;
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(_separatorItem, StringSplitOptions.RemoveEmptyEntries);
foreach (string elem in set)
{
if (elem?.CreateDrawningBus() is T bus)
{
if (!collection.Insert(bus))
{
return false;
}
}
}
_storage.Add(record[0], collection);
}
_storage.Add(record[0], collection);
return true;
}
return true;
}
private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)