Merge pull request #16 from CarterGames/release/0.7.0

📦  Release/0.7.0

Author: JonathanMCarter

Carter Games/Notion Database To Unity/Code/Editor/CarterGames.NotionData.Editor.asmdef

@@ -3,7 +3,6 @@
     "rootNamespace": "CarterGames.NotionData.Editor",
     "references": [
         "GUID:aa312903d0d2e3541bf075ab426e5d8d",
-        "GUID:f091c6eaefcd9154fbffa0b3a07f41fe",
         "GUID:f0ee9ecf377e42043831037e8ccfaaf9",
         "GUID:b7ef0f805fe70004c8b0b07af22ee394"
     ],

Carter Games/Notion Database To Unity/Code/Editor/Editors/Auto Download All/DownloadAllHandler.cs

@@ -21,12 +21,14 @@
  * THE SOFTWARE.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using CarterGames.Shared.NotionData;
 using CarterGames.Shared.NotionData.Editor;
 using CarterGames.NotionData.Filters;
+using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
 
@@ -41,12 +43,23 @@ public sealed class DownloadAllHandler : EditorWindow
         |   Fields
         ───────────────────────────────────────────────────────────────────────────────────────────────────────────── */
 
-        private static bool haltOnDownload = true;
+        private static bool haltOnError = true;
         private static List<NdAsset> toProcess;
         private static int TotalToProcessed = 0;
         private static int TotalProcessed = 0;
         private static bool hasErrorOnDownload;
         private static List<NotionRequestError> silencedErrors;
+
+        /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
+        |   Properties
+        ───────────────────────────────────────────────────────────────────────────────────────────────────────────── */
+        
+        public static bool IsDownloadingAllAssets { get; private set; }
+        
+        public static float AllDownloadProgress01 => TotalProcessed / TotalToProcessed;
+        
+        private static NdAsset TargetAsset { get; set; }
+        private static SerializedObject TargetAssetObject { get; set; }
 
         /* ─────────────────────────────────────────────────────────────────────────────────────────────────────────────
         |   Menu Item
@@ -55,7 +68,7 @@ public sealed class DownloadAllHandler : EditorWindow
         [MenuItem("Tools/Carter Games/Notion Data/Update All Notion Data", priority = 21)]
         private static void DownloadAll()
         {
-            haltOnDownload = true;
+            haltOnError = true;
             TotalToProcessed = 0;
             TotalProcessed = 0;
             hasErrorOnDownload = false;
@@ -69,7 +82,7 @@ private static void DownloadAll()
             }
             else
             {
-                var window = GetWindow<DownloadAllHandler>(true, "Download Notion Data");
+                var window = GetWindow<DownloadAllHandler>(true, "Download All Notion Data");
                 window.minSize = new Vector2(400, 150);
                 window.maxSize = new Vector2(400, 150);
             }
@@ -92,7 +105,7 @@ private void OnGUI()
             EditorGUILayout.LabelField("Settings", EditorStyles.boldLabel);
             GeneralUtilEditor.DrawHorizontalGUILine();
 
-            haltOnDownload = EditorGUILayout.Toggle(new GUIContent("Halt download on error:"), haltOnDownload);
+            haltOnError = EditorGUILayout.Toggle(new GUIContent("Halt download on error:"), haltOnError);
 
             GUILayout.Space(1.5f);
             EditorGUILayout.EndVertical();
@@ -106,17 +119,24 @@ private void OnGUI()
             {
                 if (Application.internetReachability == NetworkReachability.NotReachable)
                 {
-                    EditorUtility.DisplayDialog("Standalone Notion Data", "You cannot download data while offline.",
+                    EditorUtility.DisplayDialog("Download All Notion Data", "You cannot download data while offline.",
                         "Continue");
                     return;
                 }
 
-                toProcess = NotionDataAccessor.GetAllAssets();
+                NdAssetIndexHandler.UpdateIndex();
+
+                toProcess = NotionDataAccessor.GetAllAssets().Where(t => t.GetType() != typeof(EditorOnlyNdAsset))
+                    .ToList();
+                
                 TotalToProcessed = toProcess.Count;
                 TotalProcessed = 0;
                 hasErrorOnDownload = false;
                 silencedErrors ??= new List<NotionRequestError>();
                 silencedErrors.Clear();
+                TargetAsset = null;
+
+                IsDownloadingAllAssets = true;
 
                 ProcessNextAsset();
             }
@@ -130,74 +150,146 @@ private void OnGUI()
 
         private static void ProcessNextAsset()
         {
-            if (toProcess.Count <= 0)
+            if (TotalProcessed == TotalToProcessed)
             {
                 OnAllDownloadCompleted();
                 return;
             }
 
-            var asset = toProcess.First();
-            toProcess.RemoveAt(0);
-            
-            var assetObject = new SerializedObject(asset);
-
-            if (assetObject.Fp("databaseApiKey") == null)
+            try
             {
-                ProcessNextAsset();
-                return;
-            }
-            
-            TotalProcessed++;
+                TargetAsset = toProcess[TotalProcessed];
+                TargetAssetObject = new SerializedObject(TargetAsset);
+
+                if (TargetAssetObject.Fp("databaseApiKey") == null)
+                {
+                    TotalProcessed++;
+                    ProcessNextAsset();
+                    Debug.LogWarning($"No api key assigned to asset {TargetAssetObject.targetObject.name}, skipping it.");
+                    return;
+                }
 
-            var databaseId = assetObject.Fp("linkToDatabase").stringValue.Split('/').Last().Split('?').First();
+                var databaseId = TargetAssetObject.Fp("linkToDatabase").stringValue.Split('/').Last().Split('?').First();
 
-            NotionApiRequestHandler.DataReceived.Remove(OnAssetDownloadComplete);
-            NotionApiRequestHandler.DataReceived.Add(OnAssetDownloadComplete);
+                EditorUtility.DisplayProgressBar("Download All Notion Data", $"Downloading {TargetAsset.name}", AllDownloadProgress01);
 
-            NotionApiRequestHandler.RequestError.Remove(OnAssetDownloadComplete);
-            NotionApiRequestHandler.RequestError.Add(OnAssetDownloadComplete);
-            
-            EditorUtility.DisplayProgressBar("Standalone Notion Data", $"Downloading {asset.name}", (float) TotalProcessed / TotalToProcessed);
-            
-            NotionApiRequestHandler.ResetRequestData();
-            
-            var filters = (NotionFilterContainer) assetObject.GetType().BaseType!
-                .GetField("filters", BindingFlags.NonPublic | BindingFlags.Instance)
-                !.GetValue(assetObject.targetObject);
-            
-            var requestData = new NotionRequestData(asset, databaseId, assetObject.Fp("databaseApiKey").stringValue, assetObject.Fp("sortProperties").ToSortPropertyArray(), filters, true);
-            NotionApiRequestHandler.WebRequestPostWithAuth(requestData);
+                NotionFilterContainer filters = null;
+                
+                if (TargetAssetObject.GetType().BaseType!
+                        .GetField("filters", BindingFlags.NonPublic | BindingFlags.Instance) != null)
+                {
+                    filters = (NotionFilterContainer) TargetAssetObject.GetType().BaseType!
+                        .GetField("filters", BindingFlags.NonPublic | BindingFlags.Instance)
+                        !.GetValue(TargetAssetObject.targetObject);
+                }
+                
+                
+                var requestData = new NotionRequestData(TargetAsset, databaseId, TargetAssetObject.Fp("databaseApiKey").stringValue, TargetAssetObject.Fp("sortProperties").ToSortPropertyArray(), filters, true);
+                
+                NotionApiRequestManager.RunRequest(requestData, OnAssetDownloadComplete, OnAssetDownloadComplete);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+                EditorUtility.ClearProgressBar();
+                IsDownloadingAllAssets = false;
+                throw;
+            }
         }
 
 
         private static void OnAssetDownloadComplete(NotionRequestResult result)
         {
+            NotionDatabaseQueryResult queryResult;
+            
+            try
+            {
+                queryResult = NotionDownloadParser.Parse(result.Data);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError("Parsing of downloaded data failed. See message below for more information:");
+                Debug.LogError(e);
+                EditorUtility.ClearProgressBar();
+                throw;
+            }
+            
+            try
+            {
+                TargetAsset.GetType().BaseType.GetMethod("Apply", BindingFlags.NonPublic | BindingFlags.Instance)
+                    ?.Invoke(TargetAssetObject.targetObject, new object[] { queryResult });
+                
+                EditorUtility.ClearProgressBar();
+                
+                if (!result.SilentResponse)
+                {
+                    EditorUtility.DisplayDialog("Notion Data Download", "Download completed & parsed successfully", "Continue");
+                }
+            }
+            catch (Exception e)
+            {
+                if (!haltOnError)
+                {
+                    hasErrorOnDownload = true;
+                    silencedErrors.Add(new NotionRequestError(TargetAsset, new JObject()
+                    {
+                        ["message"] = $"Applying values from parsed data failed. See message below for more information: {e}"
+                    }));
+                }
+                else
+                {
+                    Debug.LogError("Applying values from parsed data failed. See message below for more information:");
+                    Debug.LogError(e);
+                
+                    EditorUtility.ClearProgressBar();
+                
+                    if (!result.SilentResponse)
+                    {
+                        EditorUtility.DisplayDialog("Notion Data Download", "Download completed, but failed to parse all properties. See console for more information.", "Continue");
+                    }
+                }
+            }
+
+            TargetAssetObject.ApplyModifiedProperties();
+            TargetAssetObject.Update();
+            
+            TotalProcessed++;
             ProcessNextAsset();
         }
 
 
         private static void OnAssetDownloadComplete(NotionRequestError error)
         {
-            if (!haltOnDownload)
+            TotalProcessed++;
+            
+            if (!haltOnError)
             {
                 hasErrorOnDownload = true;
                 silencedErrors.Add(error);
+                
+                TargetAssetObject.ApplyModifiedProperties();
+                TargetAssetObject.Update();
+                
                 ProcessNextAsset();
                 return;
             }
 
             EditorUtility.ClearProgressBar();
-            EditorUtility.DisplayDialog("Standalone Notion Data", $"Download failed due to an error:\n{error.Asset.name}\n{error.Error}\n{error.Message}", "Continue");
+            EditorUtility.DisplayDialog("Download All Notion Data", $"Download failed due to an error:\n{error.Asset.name}\n{error.Error}\n{error.Message}", "Continue");
+            
+            TargetAssetObject.ApplyModifiedProperties();
+            TargetAssetObject.Update();
         }
 
 
         private static void OnAllDownloadCompleted()
         {
             EditorUtility.ClearProgressBar();
+            IsDownloadingAllAssets = false;
 
             if (hasErrorOnDownload)
             {
-                if (EditorUtility.DisplayDialog("Standalone Notion Data",
+                if (EditorUtility.DisplayDialog("Download All Notion Data",
                         "Download completed with errors.\nSee console for errors.", "Continue"))
                 {
                     foreach (var error in silencedErrors)
@@ -208,8 +300,14 @@ private static void OnAllDownloadCompleted()
             }
             else
             {
-                EditorUtility.DisplayDialog("Standalone Notion Data", "Download completed.", "Continue");
+                EditorUtility.DisplayDialog("Download All Notion Data", "Download completed.", "Continue");
             }
         }
+
+
+        public static void SetProgressMessage(string message)
+        {
+            EditorUtility.DisplayProgressBar("Download All Notion Data", message, AllDownloadProgress01);
+        }
     }
 }

Carter Games/Notion Database To Unity/Code/Editor/Editors/Creator Tool/NotionDataAssetTemplate.txt

@@ -1,7 +1,6 @@
-using CarterGames.Standalone.NotionData;
+using CarterGames.NotionData;
 using UnityEngine;
 
-
 namespace Data
 {
     [CreateAssetMenu(fileName = "%DataAssetName%")]

Carter Games/Notion Database To Unity/Code/Editor/Editors/Creator Tool/NotionDataTemplate.txt

@@ -1,6 +1,5 @@
 using System;
 
-
 namespace Data
 {
     [Serializable]

Carter Games/Notion Database To Unity/Code/Editor/Editors/Drawer/NotionWrapperEditor.cs

@@ -33,11 +33,11 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
         {
             EditorGUI.BeginProperty(position, label, property);
 
-            var spriteRef = property.Fpr("value");
+            var valueRef = property.Fpr("value");
 
             EditorGUI.BeginChangeCheck();
 
-            EditorGUI.PropertyField(position, spriteRef, label);
+            EditorGUI.PropertyField(position, valueRef, label);
 
             if (EditorGUI.EndChangeCheck())
             {