Graceful fossil error handling (#3951)

* Fossil error handling * Print error * Update comments
Revolutionary-Games · Jan 2, 2023 · 277d387 · 277d387
1 parent 618dc01
commit 277d387
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/thriveopedia/fossilisation/FossilisedSpecies.cs b/src/thriveopedia/fossilisation/FossilisedSpecies.cs
@@ -118,16 +118,25 @@ public static bool IsSpeciesAlreadyFossilised(string name, List<string>? existin
     ///   Loads a fossilised species by its filename.
     /// </summary>
     /// <param name="fossilName">The name of the .thrivefossil file (including extension)</param>
-    /// <returns>The species saved in the provided file</returns>
-    public static FossilisedSpecies LoadSpeciesFromFile(string fossilName)
+    /// <returns>The species saved in the provided file, or null if the file doesn't exist or is corrupt</returns>
+    public static FossilisedSpecies? LoadSpeciesFromFile(string fossilName)
     {
         var target = Path.Combine(Constants.FOSSILISED_SPECIES_FOLDER, fossilName);
-        var (fossilisedInfo, species, previewImage) = LoadFromFile(target);
+        try
+        {
+            var (fossilisedInfo, species, previewImage) = LoadFromFile(target);
 
-        return new FossilisedSpecies(fossilisedInfo, species, Path.GetFileNameWithoutExtension(fossilName))
+            return new FossilisedSpecies(fossilisedInfo, species, Path.GetFileNameWithoutExtension(fossilName))
+            {
+                PreviewImage = previewImage,
+            };
+        }
+        catch (Exception e)
         {
-            PreviewImage = previewImage,
-        };
+            // This fossil doesn't exist or is corrupt, so just don't bother showing it
+            GD.PrintErr($"Error loading fossil: {e}");
+            return null;
+        }
     }
 
     /// <summary>

diff --git a/src/thriveopedia/pages/ThriveopediaMuseumPage.cs b/src/thriveopedia/pages/ThriveopediaMuseumPage.cs
@@ -59,10 +59,13 @@ public override void OnThriveopediaOpened()
 
         foreach (var speciesName in FossilisedSpecies.CreateListOfFossils(true))
         {
-            var card = (MuseumCard)museumCardScene.Instance();
-
             var savedSpecies = FossilisedSpecies.LoadSpeciesFromFile(speciesName);
 
+            // Don't add cards for corrupt fossils
+            if (savedSpecies == null)
+                continue;
+
+            var card = (MuseumCard)museumCardScene.Instance();
             card.SavedSpecies = savedSpecies.Species;
             card.FossilPreviewImage = savedSpecies.PreviewImage;
             card.Connect(nameof(MuseumCard.OnSpeciesSelected), this, nameof(UpdateSpeciesPreview));