Skip to content

Fix populate from score doesn't finishing properly if failed #268

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

Merged
stanriders merged 4 commits into from
Jun 30, 2025
Merged

Fix populate from score doesn't finishing properly if failed #268

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3adf9cd
Update SimulateScreen.cs
Givikap120 Jun 22, 2025
f131abe
Update SimulateScreen.cs
Givikap120 Jun 22, 2025
eeb6d53
Update SimulateScreen.cs
Givikap120 Jun 29, 2025
a6d227e
Merge branch 'master' into fix-score-id-loading
stanriders Jun 30, 2025
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
129 changes: 66 additions & 63 deletions PerformanceCalculatorGUI/Screens/SimulateScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,89 +1000,92 @@ private void populateSettingsFromScore(long scoreId)

Task.Run(async () =>
{
try
{
var scoreInfo = await apiManager.GetJsonFromApi<SoloScoreInfo>($"scores/{scoreId}").ConfigureAwait(false);
var scoreInfo = await apiManager.GetJsonFromApi<SoloScoreInfo>($"scores/{scoreId}").ConfigureAwait(false);

Schedule(() =>
Schedule(() =>
{
if (scoreInfo.BeatmapID != working.BeatmapInfo.OnlineID)
{
if (scoreInfo.BeatmapID != working.BeatmapInfo.OnlineID)
{
beatmapIdTextBox.Text = string.Empty;
changeBeatmap(scoreInfo.BeatmapID.ToString());
}
beatmapIdTextBox.Text = string.Empty;
changeBeatmap(scoreInfo.BeatmapID.ToString());
}

ruleset.Value = rulesets.GetRuleset(scoreInfo.RulesetID);
appliedMods.Value = scoreInfo.Mods.Select(x => x.ToMod(ruleset.Value.CreateInstance())).ToList();
ruleset.Value = rulesets.GetRuleset(scoreInfo.RulesetID);
appliedMods.Value = scoreInfo.Mods.Select(x => x.ToMod(ruleset.Value.CreateInstance())).ToList();

legacyTotalScore = scoreInfo.LegacyTotalScore;
legacyTotalScore = scoreInfo.LegacyTotalScore;

fullScoreDataSwitch.Current.Value = true;
fullScoreDataSwitch.Current.Value = true;

// TODO: this shouldn't be done in 2 lines
comboTextBox.Value.Value = scoreInfo.MaxCombo;
comboTextBox.Text = scoreInfo.MaxCombo.ToString();
// TODO: this shouldn't be done in 2 lines
comboTextBox.Value.Value = scoreInfo.MaxCombo;
comboTextBox.Text = scoreInfo.MaxCombo.ToString();

resetMisses();
updateMissesTextboxes();
resetMisses();
updateMissesTextboxes();

if (scoreInfo.Statistics.TryGetValue(HitResult.Miss, out int misses))
{
missesTextBox.Value.Value = misses;
missesTextBox.Text = misses.ToString();
}
if (scoreInfo.Statistics.TryGetValue(HitResult.Miss, out int misses))
{
missesTextBox.Value.Value = misses;
missesTextBox.Text = misses.ToString();
}

if (scoreInfo.Statistics.TryGetValue(HitResult.Ok, out int oks))
{
goodsTextBox.Value.Value = oks;
goodsTextBox.Text = oks.ToString();
}
if (scoreInfo.Statistics.TryGetValue(HitResult.Ok, out int oks))
{
goodsTextBox.Value.Value = oks;
goodsTextBox.Text = oks.ToString();
}

if (scoreInfo.Statistics.TryGetValue(HitResult.Meh, out int mehs))
{
mehsTextBox.Value.Value = mehs;
mehsTextBox.Text = mehs.ToString();
}
if (scoreInfo.Statistics.TryGetValue(HitResult.Meh, out int mehs))
{
mehsTextBox.Value.Value = mehs;
mehsTextBox.Text = mehs.ToString();
}

if (ruleset.Value?.ShortName == "fruits")
if (ruleset.Value?.ShortName == "fruits")
{
if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickHit, out int largeTickHits))
{
if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickHit, out int largeTickHits))
{
goodsTextBox.Value.Value = largeTickHits;
goodsTextBox.Text = largeTickHits.ToString();
}

if (scoreInfo.Statistics.TryGetValue(HitResult.SmallTickHit, out int smallTickHits))
{
mehsTextBox.Value.Value = smallTickHits;
mehsTextBox.Text = smallTickHits.ToString();
}
goodsTextBox.Value.Value = largeTickHits;
goodsTextBox.Text = largeTickHits.ToString();
}

if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickMiss, out int largeTickMisses))
if (scoreInfo.Statistics.TryGetValue(HitResult.SmallTickHit, out int smallTickHits))
{
largeTickMissesTextBox.Value.Value = largeTickMisses;
largeTickMissesTextBox.Text = largeTickMisses.ToString();
mehsTextBox.Value.Value = smallTickHits;
mehsTextBox.Text = smallTickHits.ToString();
}
}

if (scoreInfo.Statistics.TryGetValue(HitResult.SliderTailHit, out int sliderTailHits))
{
int sliderTailMisses = scoreInfo.MaximumStatistics[HitResult.SliderTailHit] - sliderTailHits;
sliderTailMissesTextBox.Value.Value = sliderTailMisses;
sliderTailMissesTextBox.Text = sliderTailMisses.ToString();
}
if (scoreInfo.Statistics.TryGetValue(HitResult.LargeTickMiss, out int largeTickMisses))
{
largeTickMissesTextBox.Value.Value = largeTickMisses;
largeTickMissesTextBox.Text = largeTickMisses.ToString();
}

calculateDifficulty();
calculatePerformance();
if (scoreInfo.Statistics.TryGetValue(HitResult.SliderTailHit, out int sliderTailHits))
{
int sliderTailMisses = scoreInfo.MaximumStatistics[HitResult.SliderTailHit] - sliderTailHits;
sliderTailMissesTextBox.Value.Value = sliderTailMisses;
sliderTailMissesTextBox.Text = sliderTailMisses.ToString();
}

scoreIdPopulateButton.State.Value = ButtonState.Done;
});
}
catch (Exception e)
calculateDifficulty();
calculatePerformance();

scoreIdPopulateButton.State.Value = ButtonState.Done;
});
}).ContinueWith(t =>
{
Logger.Log(t.Exception?.ToString(), level: LogLevel.Error);
notificationDisplay.Display(new Notification(t.Exception?.Flatten().Message));
Comment thread
Givikap120 marked this conversation as resolved.
Outdated
}, TaskContinuationOptions.OnlyOnFaulted).ContinueWith(t =>
{
Schedule(() =>
{
Schedule(() => showError(e));
}
});
scoreIdPopulateButton.State.Value = ButtonState.Done;
});
}, TaskContinuationOptions.None);
}

private void resetMisses()
Expand Down
Loading