From 03414c9c94bc8e63367ceadb79e7530f081474a6 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Sun, 24 Jul 2022 19:29:50 +0200
Subject: [PATCH] add some failsafes around assignment and application of data

---
 .../Factories/CharacterDataFactory.cs         | 41 +++++++++++++++----
 MareSynchronos/Managers/CachedPlayer.cs       |  7 +++-
 MareSynchronos/MareSynchronos.csproj          |  2 +-
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs
index 6d5a2a3..986e954 100644
--- a/MareSynchronos/Factories/CharacterDataFactory.cs
+++ b/MareSynchronos/Factories/CharacterDataFactory.cs
@@ -68,8 +68,11 @@ public class CharacterDataFactory
     {
         var indentation = GetIndentationForInheritanceLevel(inheritanceLevel);
 
-        Logger.Verbose(indentation.Item1 + objectKind + resourceType + " [" + string.Join(", ", fileReplacement.GamePaths) + "]");
-        Logger.Verbose(indentation.Item2 + "=> " + fileReplacement.ResolvedPath);
+        if (fileReplacement.HasFileReplacement)
+        {
+            Logger.Verbose(indentation.Item1 + objectKind + resourceType + " [" + string.Join(", ", fileReplacement.GamePaths) + "]");
+            Logger.Verbose(indentation.Item2 + "=> " + fileReplacement.ResolvedPath);
+        }
     }
 
     private unsafe void AddReplacementsFromRenderModel(RenderModel* mdl, ObjectKind objectKind, CharacterData cache, int inheritanceLevel = 0)
@@ -89,7 +92,7 @@ public class CharacterDataFactory
             Logger.Warn("Could not get model data for " + objectKind);
             return;
         }
-        Logger.Verbose("Adding File Replacement for Model " + mdlPath);
+        //Logger.Verbose("Adding File Replacement for Model " + mdlPath);
 
         FileReplacement mdlFileReplacement = CreateFileReplacement(mdlPath);
         DebugPrint(mdlFileReplacement, objectKind, "Model", inheritanceLevel);
@@ -119,7 +122,7 @@ public class CharacterDataFactory
             return;
         }
 
-        Logger.Verbose("Adding File Replacement for Material " + fileName);
+        //Logger.Verbose("Adding File Replacement for Material " + fileName);
         var mtrlPath = fileName.Split("|")[2];
 
         var mtrlFileReplacement = CreateFileReplacement(mtrlPath);
@@ -130,7 +133,15 @@ public class CharacterDataFactory
         var mtrlResourceHandle = (MtrlResource*)mtrl->ResourceHandle;
         for (var resIdx = 0; resIdx < mtrlResourceHandle->NumTex; resIdx++)
         {
-            var texPath = new Utf8String(mtrlResourceHandle->TexString(resIdx)).ToString();
+            string? texPath = null;
+            try
+            {
+                texPath = new Utf8String(mtrlResourceHandle->TexString(resIdx)).ToString();
+            }
+            catch
+            {
+                Logger.Warn("Could not get Texture data for Material " + fileName);
+            }
 
             if (string.IsNullOrEmpty(texPath)) continue;
 
@@ -142,7 +153,7 @@ public class CharacterDataFactory
     {
         if (texPath.IsNullOrEmpty()) return;
 
-        Logger.Verbose("Adding File Replacement for Texture " + texPath);
+        //Logger.Verbose("Adding File Replacement for Texture " + texPath);
 
         var texFileReplacement = CreateFileReplacement(texPath, doNotReverseResolve);
         DebugPrint(texFileReplacement, objectKind, "Texture", inheritanceLevel);
@@ -213,8 +224,22 @@ public class CharacterDataFactory
             }
 
             AddReplacementSkeleton(((HumanExt*)human)->Human.RaceSexId, objectKind, previousData);
-            AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->Decal->FileName()).ToString(), objectKind, previousData, 0, false);
-            AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->LegacyBodyDecal->FileName()).ToString(), objectKind, previousData, 0, false);
+            try
+            {
+                AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->Decal->FileName()).ToString(), objectKind, previousData, 0, false);
+            }
+            catch
+            {
+                Logger.Warn("Could not get Decal data");
+            }
+            try
+            {
+                AddReplacementsFromTexture(new Utf8String(((HumanExt*)human)->LegacyBodyDecal->FileName()).ToString(), objectKind, previousData, 0, false);
+            }
+            catch
+            {
+                Logger.Warn("Could not get Legacy Body Decal Data");
+            }
         }
 
         st.Stop();
diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs
index b23d2c2..c5db90e 100644
--- a/MareSynchronos/Managers/CachedPlayer.cs
+++ b/MareSynchronos/Managers/CachedPlayer.cs
@@ -138,7 +138,10 @@ public class CachedPlayer
 
             foreach (var kind in objectKind)
             {
-                ApplyCustomizationData(kind);
+                if (_cachedData.GlamourerData.ContainsKey(kind))
+                {
+                    ApplyCustomizationData(kind);
+                }
             }
         }, downloadToken).ContinueWith(task =>
         {
@@ -147,6 +150,8 @@ public class CachedPlayer
             Logger.Debug("Download Task was cancelled");
             _apiController.CancelDownload(downloadId);
         });
+
+        _downloadCancellationTokenSource = null;
     }
 
     private List<FileReplacementDto> TryCalculateModdedDictionary(out Dictionary<string, string> moddedDictionary)
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index b5af78d..f6afc70 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.2.0.0</Version>
+    <Version>0.2.1.0</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>