Merge pull request #5 from dfyx/model-builder-options

Add support for some ModelBuilder options
morrisjdev · Aug 23, 2019 · a574260 · a574260
2 parents fb5e285 + 1791541
commit a574260
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 17 deletions.
diff --git a/FileContextCore/FileContextCore.csproj b/FileContextCore/FileContextCore.csproj
@@ -26,6 +26,7 @@
     <PackageReference Include="CsvHelper" Version="12.1.2" />
     <PackageReference Include="EPPlus.Core" Version="1.5.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />

diff --git a/FileContextCore/FileManager/DefaultFileManager.cs b/FileContextCore/FileManager/DefaultFileManager.cs
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using System;
 using System.IO;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.FileManager
 {
@@ -21,7 +22,7 @@ public DefaultFileManager(IEntityType _type, string _filetype, string _databasen
 
         public string GetFileName()
         {
-            string name = type.Name.GetValidFileName();
+            string name = type.Relational().TableName.GetValidFileName();
 			string path = Path.Combine(AppContext.BaseDirectory, "appdata", databasename);
 
             Directory.CreateDirectory(path);

diff --git a/FileContextCore/FileManager/EncryptedFileManager.cs b/FileContextCore/FileManager/EncryptedFileManager.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.FileManager
 {
@@ -25,7 +26,7 @@ public EncryptedFileManager(IEntityType _type, string _filetype, string _key, st
 
         public string GetFileName()
         {
-            string name = type.Name;
+            string name = type.Relational().TableName;
 
             foreach(char c in Path.GetInvalidFileNameChars())
             {

diff --git a/FileContextCore/FileManager/PrivateFileManager.cs b/FileContextCore/FileManager/PrivateFileManager.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.FileManager
 {
@@ -23,7 +24,7 @@ public PrivateFileManager(IEntityType _type, string _filetype, string _databasen
 
         public string GetFileName()
         {
-            string name = type.Name.GetValidFileName();
+            string name = type.Relational().TableName.GetValidFileName();
 			string path = Path.Combine(AppContext.BaseDirectory, "appdata", databasename);
 
 			Directory.CreateDirectory(path);

diff --git a/FileContextCore/Serializer/BSONSerializer.cs b/FileContextCore/Serializer/BSONSerializer.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.Serializer
 {
@@ -18,8 +19,8 @@ class BSONSerializer : ISerializer
         public BSONSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
-            propertyKeys = entityType.GetProperties().Select(p => p.Name).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)

diff --git a/FileContextCore/Serializer/CSVSerializer.cs b/FileContextCore/Serializer/CSVSerializer.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.Serializer
 {
@@ -17,16 +18,22 @@ class CSVSerializer : ISerializer
         public CSVSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
-            propertyKeys = entityType.GetProperties().Select(p => p.Name).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)
         {
+            if (string.IsNullOrEmpty(list))
+            {
+                return new Dictionary<TKey, object[]>();
+            }
+
             TextReader tr = new StringReader(list);
             CsvReader reader = new CsvReader(tr);
 
             reader.Read();
+            reader.ReadHeader();
 
             while (reader.Read())
             {
@@ -35,7 +42,7 @@ public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey
 
                 for (int i = 0; i < propertyKeys.Length; i++)
                 {
-                    object val = reader.GetField(i + 1).Deserialize(typeList[i]);
+                    object val = reader.GetField(propertyKeys[i]).Deserialize(typeList[i]);
                     value.Add(val);
                 }
 

diff --git a/FileContextCore/Serializer/EXCELSerializer.cs b/FileContextCore/Serializer/EXCELSerializer.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.Serializer
 {
@@ -36,8 +37,8 @@ FileInfo GetFilePath()
         public EXCELSerializer(IEntityType _entityType, string _password, string databaseName)
         {
             entityType = _entityType;
-            propertyKeys = entityType.GetProperties().Select(p => p.Name).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
             password = _password;
             this.databaseName = databaseName;
 

diff --git a/FileContextCore/Serializer/JSONSerializer.cs b/FileContextCore/Serializer/JSONSerializer.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.Serializer
 {
@@ -15,8 +16,8 @@ class JSONSerializer : ISerializer
         public JSONSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
-            propertyKeys = entityType.GetProperties().Select(p => p.Name).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)

diff --git a/FileContextCore/Serializer/XMLSerializer.cs b/FileContextCore/Serializer/XMLSerializer.cs
@@ -7,6 +7,7 @@
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.Serialization;
+using Microsoft.EntityFrameworkCore;
 
 namespace FileContextCore.Serializer
 {
@@ -19,8 +20,8 @@ class XMLSerializer : ISerializer
         public XMLSerializer(IEntityType _entityType)
         {
             entityType = _entityType;
-            propertyKeys = entityType.GetProperties().Select(p => p.Name).ToArray();
-            typeList = entityType.GetProperties().Select(p => p.ClrType).ToArray();
+            propertyKeys = entityType.GetProperties().Select(p => p.Relational().ColumnName).ToArray();
+            typeList = entityType.GetProperties().Select(p => p.GetValueConverter()?.ProviderClrType ?? p.ClrType).ToArray();
         }
 
         public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey, object[]> newList)

diff --git a/FileContextCore/Storage/Internal/FileContextTable.cs b/FileContextCore/Storage/Internal/FileContextTable.cs
@@ -15,6 +15,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.EntityFrameworkCore.Update;
 
 namespace FileContextCore.Storage.Internal
@@ -185,7 +186,7 @@ private Dictionary<TKey, object[]> InitExcel(string filetype)
 
             UpdateMethod = new Action<Dictionary<TKey, object[]>>((list) =>
             {
-                excel.Serialize(list);
+                excel.Serialize(ConvertToProvider(list));
             });
 
             Dictionary<TKey, object[]> newlist = new Dictionary<TKey, object[]>(_keyValueFactory.EqualityComparer);
@@ -253,15 +254,40 @@ private Dictionary<TKey, object[]> Init()
 
             UpdateMethod = new Action<Dictionary<TKey, object[]>>((list) =>
             {
-                string cnt = serializer.Serialize(list);
+                string cnt = serializer.Serialize(ConvertToProvider(list));
                 fileManager.SaveContent(cnt);
             });
 
             string content = fileManager.LoadContent();
             Dictionary<TKey, object[]> newList = new Dictionary<TKey, object[]>(_keyValueFactory.EqualityComparer);
-            Dictionary<TKey, object[]> result = serializer.Deserialize(content, newList);
+            Dictionary<TKey, object[]> result = ConvertFromProvider(serializer.Deserialize(content, newList));
             GenerateLastAutoPropertyValues(result);
             return result;
         }
+
+        private Dictionary<TKey, object[]> ApplyValueConverter(Dictionary<TKey, object[]> list, Func<ValueConverter, Func<object, object>> conversionFunc)
+        {
+            var result = new Dictionary<TKey, object[]>();
+            var converters = entityType.GetProperties().Select(p => p.GetValueConverter()).ToArray();
+            foreach (var keyValuePair in list)
+            {
+                result[keyValuePair.Key] = keyValuePair.Value.Select((value, index) =>
+                {
+                    var converter = converters[index];
+                    return converter == null ? value : conversionFunc(converter)(value);
+                }).ToArray();
+            }
+            return result;
+        }
+
+        private Dictionary<TKey, object[]> ConvertToProvider(Dictionary<TKey, object[]> list)
+        {
+            return ApplyValueConverter(list, converter => converter.ConvertToProvider);
+        }
+
+        private Dictionary<TKey, object[]> ConvertFromProvider(Dictionary<TKey, object[]> list)
+        {
+            return ApplyValueConverter(list, converter => converter.ConvertFromProvider);
+        }
     }
 }