SimonG
/
GBase
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases Wiki Activity

- initialize entries from existing files

Browse Source 
- T has to be creatable
- T has to be of type IGBaseObject
ImproveDataHandling_#25
Simon G 5 years ago
parent d4ab37de84
commit be4ccf97e5
5 changed files with 52 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      GBase/GBase.cs
  2. 4
      GBase/GBaseObject.cs
  3. 43
      GBase/GBaseTable.cs
  4. 11
      GBase/Interfaces/IGBase.cs
  5. 2
      GBase/Interfaces/IGBaseTable.cs

11
GBase/GBase.cs
Unescape View File

@ -8,6 +8,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GBase.Api;
using GBase.Attributes; using GBase.Attributes;
using GBase.Exceptions; using GBase.Exceptions;
using GBase.Factories; using GBase.Factories;
@ -96,7 +97,7 @@ namespace GBase
return true; return true;
} }
public IGBaseTable<T> GetTable<T>() public IGBaseTable<T> GetTable<T>() where T : IGBaseObject, new()
{ {
if (Tables.OfType<IGBaseTable<T>>().Any()) if (Tables.OfType<IGBaseTable<T>>().Any())
return Tables.OfType<IGBaseTable<T>>().First(); return Tables.OfType<IGBaseTable<T>>().First();
@ -119,7 +120,7 @@ namespace GBase
return Tables.Remove(table); return Tables.Remove(table);
} }
public async Task<bool> AddEntry<T>(T entry, CancellationToken cancellationToken) public async Task<bool> AddEntry<T>(T entry, CancellationToken cancellationToken) where T : IGBaseObject, new()
{ {
IGBaseTable<T> table = GetTable<T>(); IGBaseTable<T> table = GetTable<T>();
if (table == null) if (table == null)
@ -128,7 +129,7 @@ namespace GBase
return await table.AddEntry(entry, cancellationToken); return await table.AddEntry(entry, cancellationToken);
} }
public async Task SetValue<T, TProperty>(T entry, string propertyName, TProperty value, CancellationToken cancellationToken) public async Task SetValue<T, TProperty>(T entry, string propertyName, TProperty value, CancellationToken cancellationToken) where T : IGBaseObject, new()
{ {
IGBaseTable<T> table = GetTable<T>(); IGBaseTable<T> table = GetTable<T>();
if (table == null) if (table == null)
@ -137,7 +138,7 @@ namespace GBase
await table.SetValue(entry, propertyName, value, cancellationToken); await table.SetValue(entry, propertyName, value, cancellationToken);
} }
public async Task<TProperty> GetValue<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken) public async Task<TProperty> GetValue<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken) where T : IGBaseObject, new()
{ {
IGBaseTable<T> table = GetTable<T>(); IGBaseTable<T> table = GetTable<T>();
if (table == null) if (table == null)
@ -146,7 +147,7 @@ namespace GBase
return await table.GetValue<TProperty>(entry, propertyName, cancellationToken); return await table.GetValue<TProperty>(entry, propertyName, cancellationToken);
} }
public async Task<IEnumerable<TProperty>> GetValues<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken) public async Task<IEnumerable<TProperty>> GetValues<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken) where T : IGBaseObject, new()
{ {
IGBaseTable<T> table = GetTable<T>(); IGBaseTable<T> table = GetTable<T>();
if (table == null) if (table == null)

4
GBase/GBaseObject.cs
Unescape View File

@ -14,7 +14,7 @@ namespace GBase
/// <summary> /// <summary>
/// GBase object that supplies inheriting classes with methods to get data from a <see cref="IGBase"/> /// GBase object that supplies inheriting classes with methods to get data from a <see cref="IGBase"/>
/// </summary> /// </summary>
public abstract class GBaseObject<T> : IGBaseObject public abstract class GBaseObject<T> : IGBaseObject where T : IGBaseObject, new()
{ {
private readonly IGBaseTable<T> _gBaseTable; private readonly IGBaseTable<T> _gBaseTable;
@ -43,5 +43,7 @@ namespace GBase
/// </summary> /// </summary>
/// <param name="string">The given <see cref="string"/></param> /// <param name="string">The given <see cref="string"/></param>
public abstract void InitializeFromString(string @string); public abstract void InitializeFromString(string @string);
public abstract void Initialize(List<object> parameters);
} }
} }

43
GBase/GBaseTable.cs
Unescape View File

@ -12,6 +12,7 @@ using GBase.Api;
using GBase.Attributes; using GBase.Attributes;
using GBase.Factories; using GBase.Factories;
using GBase.FileHandling.Factories; using GBase.FileHandling.Factories;
using GBase.Helpers;
using GBase.Interfaces; using GBase.Interfaces;
using GBase.Interfaces.DataHandling; using GBase.Interfaces.DataHandling;
using GBase.Interfaces.DataHandling.Pool; using GBase.Interfaces.DataHandling.Pool;
@ -22,7 +23,7 @@ namespace GBase
/// <summary> /// <summary>
/// A <see cref="IGBase"/> table /// A <see cref="IGBase"/> table
/// </summary> /// </summary>
public class GBaseTable<T> : IGBaseTable<T> public class GBaseTable<T> : IGBaseTable<T> where T : IGBaseObject, new()
{ {
private readonly IFileHandler _fileHandler; private readonly IFileHandler _fileHandler;
private readonly IDataHandlerPool _dataHandlerPool; private readonly IDataHandlerPool _dataHandlerPool;
@ -74,11 +75,10 @@ namespace GBase
/// <param name="folderName"></param> /// <param name="folderName"></param>
/// <param name="cancellationToken">A <see cref="CancellationToken"/> to cancel the asynchronous operation</param> /// <param name="cancellationToken">A <see cref="CancellationToken"/> to cancel the asynchronous operation</param>
/// <returns>True if successful, false if not</returns> /// <returns>True if successful, false if not</returns>
public async Task<bool> Init(Type type, string databasePath, string folderName, CancellationToken cancellationToken) public async Task<bool> Init(Type type, string databasePath, string folderName, CancellationToken cancellationToken) //TODO: Remove bool return value?
{ {
Type = type; Type = type;
FolderName = folderName; FolderName = folderName;
await _fileHandler.Init(databasePath, cancellationToken);
//TODO: Init columns list depending on GBaseColumnAttributes set for this GBaseTable //TODO: Init columns list depending on GBaseColumnAttributes set for this GBaseTable
foreach (var property in type.GetProperties()) foreach (var property in type.GetProperties())
@ -87,10 +87,39 @@ namespace GBase
if (gBaseColumnAttribute == null) if (gBaseColumnAttribute == null)
continue; continue;
IGBaseColumn gBaseColumn = _gBaseColumnFactory.Create(property.Name); IGBaseColumn gBaseColumn = _gBaseColumnFactory.Create(property.Name, property.PropertyType);
AddColumn(gBaseColumn); AddColumn(gBaseColumn);
} }
List<IGBaseFile> files = _fileHandler.Init(databasePath, FolderName, cancellationToken);
if (files == null)
return true;
foreach (var file in files) //create entries for existing files
{
using (file.UseFile())
{
T entry = new T();
List<object> parameters = new List<object>();
foreach (var column in Columns)
{
IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, cancellationToken);
parameters.Add(await GenericMethodCaller.CallAsync(dataHandler,
nameof(IDataHandler.GetValue),
BindingFlags.Public | BindingFlags.Instance,
typeof(T), column.Type,
file.File, column.Name, cancellationToken));
}
entry.Initialize(parameters);
file.Entry = entry;
Entries.Add(entry);
}
}
return true; return true;
} }
@ -156,21 +185,21 @@ namespace GBase
public async Task SetValue<TProperty>(T entry, string propertyName, TProperty value, CancellationToken cancellationToken) public async Task SetValue<TProperty>(T entry, string propertyName, TProperty value, CancellationToken cancellationToken)
{ {
using IGBaseFile file = await _fileHandler.RequestEntryFile(entry); using IGBaseFile file = await _fileHandler.RequestEntryFile(entry);
IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, CancellationToken.None); IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, cancellationToken);
await dataHandler.SetValue<T, TProperty>(file.File, propertyName, value, cancellationToken); await dataHandler.SetValue<T, TProperty>(file.File, propertyName, value, cancellationToken);
} }
public async Task<TProperty> GetValue<TProperty>(T entry, string propertyName, CancellationToken cancellationToken) public async Task<TProperty> GetValue<TProperty>(T entry, string propertyName, CancellationToken cancellationToken)
{ {
using IGBaseFile file = await _fileHandler.RequestEntryFile(entry); using IGBaseFile file = await _fileHandler.RequestEntryFile(entry);
IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, CancellationToken.None); IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, cancellationToken);
return await dataHandler.GetValue<T, TProperty>(file.File, propertyName, cancellationToken); return await dataHandler.GetValue<T, TProperty>(file.File, propertyName, cancellationToken);
} }
public async Task<IEnumerable<TProperty>> GetValues<TProperty>(T entry, string propertyName, CancellationToken cancellationToken) public async Task<IEnumerable<TProperty>> GetValues<TProperty>(T entry, string propertyName, CancellationToken cancellationToken)
{ {
using IGBaseFile file = await _fileHandler.RequestEntryFile(entry); using IGBaseFile file = await _fileHandler.RequestEntryFile(entry);
IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, CancellationToken.None); IDataHandler dataHandler = await _dataHandlerPool.RequestDataHandler(this, false, cancellationToken);
return await dataHandler.GetValues<T, TProperty>(file.File, propertyName, cancellationToken); return await dataHandler.GetValues<T, TProperty>(file.File, propertyName, cancellationToken);
} }

11
GBase/Interfaces/IGBase.cs
Unescape View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GBase.Api;
using GBase.Interfaces.Settings; using GBase.Interfaces.Settings;
namespace GBase.Interfaces namespace GBase.Interfaces
@ -48,7 +49,7 @@ namespace GBase.Interfaces
/// <returns>True if successful, false if not</returns> /// <returns>True if successful, false if not</returns>
bool AddTable(IGBaseTable table); bool AddTable(IGBaseTable table);
IGBaseTable<T> GetTable<T>(); IGBaseTable<T> GetTable<T>() where T : IGBaseObject, new();
/// <summary> /// <summary>
/// Removes a given <see cref="IGBaseTable"/> from this <see cref="IGBase"/> /// Removes a given <see cref="IGBaseTable"/> from this <see cref="IGBase"/>
@ -57,10 +58,10 @@ namespace GBase.Interfaces
/// <returns>True if successful, false if not</returns> /// <returns>True if successful, false if not</returns>
bool RemoveTable(IGBaseTable table); bool RemoveTable(IGBaseTable table);
Task<bool> AddEntry<T>(T entry, CancellationToken cancellationToken); Task<bool> AddEntry<T>(T entry, CancellationToken cancellationToken) where T : IGBaseObject, new();
Task SetValue<T, TProperty>(T entry, string propertyName, TProperty value, CancellationToken cancellationToken); Task SetValue<T, TProperty>(T entry, string propertyName, TProperty value, CancellationToken cancellationToken) where T : IGBaseObject, new();
Task<TProperty> GetValue<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken); Task<TProperty> GetValue<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken) where T : IGBaseObject, new();
Task<IEnumerable<TProperty>> GetValues<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken); Task<IEnumerable<TProperty>> GetValues<T, TProperty>(T entry, string propertyName, CancellationToken cancellationToken) where T : IGBaseObject, new();
} }
} }

2
GBase/Interfaces/IGBaseTable.cs
Unescape View File

@ -10,7 +10,7 @@ using GBase.Api;
namespace GBase.Interfaces namespace GBase.Interfaces
{ {
public interface IGBaseTable<T> : IGBaseTable public interface IGBaseTable<T> : IGBaseTable where T : IGBaseObject, new()
{ {
/// <summary> /// <summary>
/// The entries of this <see cref="IGBaseTable"/> /// The entries of this <see cref="IGBaseTable"/>

Write Preview
Loading…
Cancel
Save