h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-10 22:17:20 +08:00
Code Issues Releases Wiki Activity

Replace error handling with logs

Browse Source 
- Handling all errors matches master a little bit better. Logging
exceptions in any case.
- Not throwing when beatmaps are missing simplifies tests.
This commit is contained in:
Dan Balasescu 2025-02-26 18:00:16 +09:00
parent c7fd7cf9cd
commit 3dde024650
No known key found for this signature in database
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemResultsScreen.cs
View File

@ -9,6 +9,7 @@ using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Logging;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Graphics.UserInterface;
@ -131,10 +132,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
return await transformScores(allScores).ConfigureAwait(false);
}
catch (OperationCanceledException)
{
return [];
}
catch
{
return await fetchScoresAround().ConfigureAwait(false);
@ -192,8 +189,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
return await transformScores(index.Scores).ConfigureAwait(false);
}
catch (OperationCanceledException)
catch (Exception ex)
{
Logger.Log($"Failed to fetch scores (room: {RoomId}, item: {PlaylistItem.ID}): {ex}");
return [];
}
}
@ -242,7 +240,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
foreach (int id in allBeatmapIds)
{
if (!beatmapsById.ContainsKey(id))
throw new MissingBeatmapException(PlaylistItem, id);
{
Logger.Log($"Failed to fetch beatmap {id} to display scores for playlist item {PlaylistItem.ID}");
beatmapsById[id] = Beatmap.Value.BeatmapInfo;
}
}
// Exclude the score provided to this screen since it's added already.
@ -313,13 +314,5 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
X = (float)(list.ScrollableExtent - list.Current - panelOffset);
}
}
private class MissingBeatmapException : Exception
{
public MissingBeatmapException(PlaylistItem item, int beatmapId)
: base($"Missing beatmap {beatmapId} for playlist item {item.ID}")
{
}
}
}
}

4
osu.Game/Screens/Ranking/SoloResultsScreen.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Logging;
using osu.Game.Beatmaps;
using osu.Game.Extensions;
using osu.Game.Online.API;
@ -72,8 +73,9 @@ namespace osu.Game.Screens.Ranking
return toDisplay.ToArray();
}
catch (OperationCanceledException)
catch (Exception ex)
{
Logger.Log($"Failed to fetch scores (beatmap: {Score.BeatmapInfo}, ruleset: {Score.Ruleset}): {ex}");
return [];
}
}