Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Graceful fossil error handling #3951

Merged
merged 4 commits into from
Jan 2, 2023
Merged

Graceful fossil error handling #3951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99b7529
Fossil error handling
Oliveriver Dec 17, 2022
83f6303
Print error
Oliveriver Dec 17, 2022
56768a5
Update comments
Oliveriver Dec 28, 2022
4256890
Merge branch 'master' into fossil_error_handling
hhyyrylainen Jan 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/thriveopedia/fossilisation/FossilisedSpecies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 5 additions & 2 deletions src/thriveopedia/pages/ThriveopediaMuseumPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down