Merge pull request #12 from CoderGamester/develop

Release 0.6.0

Author: CoderGamester

CHANGELOG.md

@@ -4,7 +4,15 @@ 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.5.3] - 2020-03-07
+## [0.6.0] - 2020-07-28
+
+- Added *ConfigsProvider* to provide the loaded google sheet configs
+- Added *IConfigsContainer* to provide the interface to maintain the loaded google sheet configs
+
+**Changed**:
+- Removed the dependency to the *com.gamelovers.configscontainer* & *com.gamelovers.asyncawait* package
+
+## [0.5.3] - 2020-04-25
 
 - Updated the package *com.gamelovers.configscontainer* to version 0.7.0
 - Updated *GoogleSheetImporter* documentation
@@ -35,7 +43,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Improved the parsing performance
 
 **Changed**:
-
 - Now generic types have their values properly parsed to their value instead of paring always to string. This will allow to avoid unnecessary later conversion on the importers.
 
 ## [0.3.0] - 2020-01-20

Editor/GameLovers.GoogleSheetImporter.Editor.asmdef

@@ -3,8 +3,6 @@
     "references": [
         "GUID:9e24947de15b9834991c9d8411ea37cf",
         "GUID:69448af7b92c7f342b298e06a37122aa",
-        "GUID:1b354f7d3d1d147e9b3ba2ee219c0839",
-        "GUID:22c6cdfa54ae844a9a9eda2f0014b020",
         "GUID:97e8c5e426b7946028b98691397a84d4"
     ],
     "includePlatforms": [

Editor/GoogleSheetConfigsImporter.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
-using GameLovers.ConfigsContainer;
 using GameLovers.GoogleSheetImporter;
 using UnityEditor;
 using UnityEngine;

Editor/GoogleSheetToolImporter.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading.Tasks;
 using GameLovers.GoogleSheetImporter;
 using UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEngine;
 using UnityEngine.Networking;
-using GameLovers.AsyncAwait;
 using Debug = UnityEngine.Debug;
 
 // ReSharper disable once CheckNamespace
@@ -148,7 +148,7 @@ private static async void ImportSheetAsync(ImportData data, string spreadsheetId
 			var finalUrl = string.IsNullOrWhiteSpace(spreadsheetId) ? url : url.Remove(indexStart, indexCount).Insert(indexStart, spreadsheetId);
 			var request = UnityWebRequest.Get(finalUrl);
 
-			await request.SendWebRequest();
+			await AsyncOperation(request.SendWebRequest());
 
 			if (request.isHttpError || request.isNetworkError)
 			{
@@ -169,6 +169,14 @@ private static async void ImportSheetAsync(ImportData data, string spreadsheetId
 			Debug.Log($"Finished importing google sheet data from {data.Type.Name}");
 		}
 
+		private static async Task AsyncOperation(AsyncOperation operation)
+		{
+			while (!operation.isDone)
+			{
+				await Task.Delay(100);
+			}
+		}
+
 		private struct ImportData
 		{
 			public Type Type;

Runtime/ConfigsProvider.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+// ReSharper disable once CheckNamespace
+
+namespace GameLovers.GoogleSheetImporter
+{
+	/// <summary>
+	/// Provides all the Game's config static data, including the game design data
+	/// Has the imported data from the Universal Google Sheet file on the web
+	/// </summary>
+	public interface IConfigsProvider
+	{
+		/// <summary>
+		/// Requests the single unique Config of <typeparamref name="T"/> type
+		/// </summary>
+		T GetSingleConfig<T>();
+		
+		/// <summary>
+		/// Requests the Config of <typeparamref name="T"/> type and with the given <paramref name="id"/>
+		/// </summary>
+		T GetConfig<T>(int id);
+
+		/// <summary>
+		/// Requests the Config List of <typeparamref name="T"/> type
+		/// </summary>
+		IReadOnlyList<T> GetConfigsList<T>();
+
+		/// <summary>
+		/// Requests the Config Dictionary of <typeparamref name="T"/> type
+		/// </summary>
+		IReadOnlyDictionary<int, T> GetConfigsDictionary<T>();
+	}
+	
+	/// <inheritdoc />
+	public class ConfigsProvider : IConfigsProvider
+	{
+		private const int _singleConfigId = 0;
+		
+		private readonly IDictionary<Type, IEnumerable> _configs = new Dictionary<Type, IEnumerable>();
+		
+		/// <inheritdoc />
+		public T GetSingleConfig<T>()
+		{
+			return GetConfigsDictionary<T>()[_singleConfigId];
+		}
+
+		/// <inheritdoc />
+		public T GetConfig<T>(int id)
+		{
+			return GetConfigsDictionary<T>()[id];
+		}
+
+		/// <inheritdoc />
+		public IReadOnlyList<T> GetConfigsList<T>()
+		{
+			return new List<T>(GetConfigsDictionary<T>().Values);
+		}
+
+		/// <inheritdoc />
+		public IReadOnlyDictionary<int, T> GetConfigsDictionary<T>() 
+		{
+			return _configs[typeof(T)] as IReadOnlyDictionary<int, T>;
+		}
+
+		/// <summary>
+		/// Adds the given unique single <paramref name="config"/> to the container.
+		/// Use the <seealso cref="GetSingletonConfig{T}"/> to retrieve it.
+		/// </summary>
+		public void AddSingletonConfig<T>(T config)
+		{
+			_configs.Add(typeof(T), new ReadOnlyDictionary<int, T>(new Dictionary<int, T> {{ _singleConfigId, config }}));
+		}
+
+		/// <summary>
+		/// Adds the given <paramref name="configList"/> to the container.
+		/// The configuration will use the given <paramref name="referenceIdResolver"/> to map each config to it's defined id.
+		/// Use the <seealso cref="GetConfig{T}"/> to retrieve it.
+		/// </summary>
+		public void AddConfigs<T>(Func<T, int> referenceIdResolver, IList<T> configList) where T : struct
+		{
+			var dictionary = new Dictionary<int, T>();
+
+			for (int i = 0; i < configList.Count; i++)
+			{
+				dictionary.Add(referenceIdResolver(configList[i]), configList[i]);
+			}
+
+			_configs.Add(typeof(T), new ReadOnlyDictionary<int, T>(dictionary));
+		}
+	}
+}

Runtime/ConfigsProvider.cs.meta

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+// ReSharper disable once CheckNamespace
+
+namespace GameLovers.GoogleSheetImporter
+{
+	/// <summary>
+	/// Generic container of the configs imported with a ConfigsImporter script
+	/// The given <typeparamref name="T"/> type is the same of the config struct defined to be serialized in the scriptable object
+	/// </summary>
+	public interface IConfigsContainer<T> where T : struct
+	{
+		List<T> Configs { get; }
+	}
+	
+	/// <summary>
+	/// Generic container of the unique single config imported with a ConfigsImporter script
+	/// The given <typeparamref name="T"/> type is the same of the config struct defined to be serialized in the scriptable object
+	/// </summary>
+	public interface ISingleConfigContainer<T> where T : struct
+	{
+		T Config { get; set; }
+	}
+}

Runtime/IConfigsContainer.cs

@@ -1,13 +1,11 @@
 {
   "name": "com.gamelovers.googlesheetimporter",
   "displayName": "GoogleSheet Importer",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "unity": "2019.3",
   "description": "This package provides a tool to import GoogleSheet data into ScriptableObject persistent config data.\n\nTo help configure the GoogleSheet Import data you need to create a configuration ScriptableObject by:\n- Right Click on the Project View > Create > ScriptableObjects > Editor > GoogleSheetImporter.\n- You can import all the GoogleSheet data without a ScriptableObject by clicking in Tools > Import Google Sheet Data",
   "type": "tool",
   "dependencies": {
-    "com.gamelovers.configscontainer": "0.7.0",
-    "com.unity.nuget.newtonsoft-json": "2.0.0-preview",
-    "com.gamelovers.asyncawait": "0.2.0"
+    "com.unity.nuget.newtonsoft-json": "2.0.0-preview"
   }
 }