Merge pull request #4 from CoderGamester/develop

0.2.0

Author: CoderGamester

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2020-01-15
+
+- Added ParseIgnoreAttribute to allow fields to be ignored during deserialization
+- Improved tests with [ParseIgnore] attribute test
+
+**Changed**:
+- Moved CsvParser to the runtime assembly to be able to use during a project runtime
+
 ## [0.1.2] - 2020-01-08
 
 - Added missing meta files

Editor/GameLovers.GoogleSheetImporter.Editor.asmdef

@@ -4,7 +4,8 @@
         "GUID:9e24947de15b9834991c9d8411ea37cf",
         "GUID:69448af7b92c7f342b298e06a37122aa",
         "GUID:1b354f7d3d1d147e9b3ba2ee219c0839",
-        "GUID:22c6cdfa54ae844a9a9eda2f0014b020"
+        "GUID:22c6cdfa54ae844a9a9eda2f0014b020",
+        "GUID:97e8c5e426b7946028b98691397a84d4"
     ],
     "includePlatforms": [
         "Editor"

Editor/GoogleSheetConfigsImporter.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Runtime.Remoting.Messaging;
 using GameLovers.ConfigsContainer;
+using GameLovers.GoogleSheetImporter;
 using UnityEditor;
 using UnityEngine;
 
@@ -37,10 +39,18 @@ public void Import(List<Dictionary<string, string>> data)
 
 			foreach (var pair in data)
 			{
-				scriptableObject.Configs.Add(CsvParser.DeserializeTo<TConfig>(pair));
+				scriptableObject.Configs.Add(Deserialize(pair));
 			}
 
 			EditorUtility.SetDirty(scriptableObject);
 		}
+
+		/// <summary>
+		/// Override this method to have your own deserialization of the given <paramref name="data"/>
+		/// </summary>
+		protected virtual TConfig Deserialize(Dictionary<string, string> data)
+		{
+			return CsvParser.DeserializeTo<TConfig>(data);
+		}
 	}
 }

Editor/GoogleSheetToolImporter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using GameLovers.GoogleSheetImporter;
 using UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEngine;

Runtime.meta

@@ -8,7 +8,7 @@
 
 // ReSharper disable once CheckNamespace
 
-namespace GameLoversEditor.GoogleSheetImporter
+namespace GameLovers.GoogleSheetImporter
 {
 	/// <summary>
 	/// Helper class to parse CSV text
@@ -24,6 +24,7 @@ public static T DeserializeTo<T>(Dictionary<string, string> data)
 			var dictionaryType = typeof(IDictionary);
 			var listType = typeof(IList);
 			var keyValueType = typeof(KeyValuePair<,>);
+			var ignoreType = typeof(ParseIgnoreAttribute);
 			var instance = Activator.CreateInstance(type);
 
 			foreach (var field in type.GetFields())
@@ -33,6 +34,13 @@ public static T DeserializeTo<T>(Dictionary<string, string> data)
 					Debug.LogWarning($"The data does not contain the field {field.Name} data for the object of {type} type");
 					continue;
 				}
+
+				if (field.GetCustomAttributes(ignoreType, false).Length == 1)
+				{
+					continue;
+				}
+				
+				Debug.Log(field.Name + "  " + field.GetCustomAttributes(ignoreType, false).Length);
 
 				var stringSerialized = "";
 

Editor/CsvParser.cs renamed to Runtime/CsvParser.cs

@@ -0,0 +1,13 @@
+{
+    "name": "GameLovers.GoogleSheetImporter",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Editor/CsvParser.cs.meta renamed to Runtime/CsvParser.cs.meta

@@ -0,0 +1,14 @@
+using System;
+
+// ReSharper disable once CheckNamespace
+
+namespace GameLovers.GoogleSheetImporter
+{
+	/// <summary>
+	/// Attribute to ignore the parsing of a field in <seealso cref="CsvParse"/>
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Field)]
+	public class ParseIgnoreAttribute : Attribute
+	{
+	}
+}