h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 21:13:21 +08:00
Code Issues Releases Wiki Activity

Adjust logic to preserve existing desired behaviour

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-05-07 15:37:50 +02:00
parent af579be0e4
commit b895d4a42f
No known key found for this signature in database
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
View File

@ -40,7 +40,8 @@ namespace osu.Game.Beatmaps
{
foreach (var beatmapInfo in beatmapSet.Beatmaps)
{
var res = lookup(beatmapInfo, preferOnlineFetch);
if (!tryLookup(beatmapInfo, preferOnlineFetch, out var res))
continue;
if (res == null)
{
@ -71,22 +72,42 @@ namespace osu.Game.Beatmaps
}
}
private OnlineBeatmapMetadata? lookup(BeatmapInfo beatmapInfo, bool preferOnlineFetch)
/// <summary>
/// Attempts to retrieve the <see cref="OnlineBeatmapMetadata"/> for the given <paramref name="beatmapInfo"/>.
/// </summary>
/// <param name="beatmapInfo">The beatmap to perform the online lookup for.</param>
/// <param name="preferOnlineFetch">Whether online sources should be preferred for the lookup.</param>
/// <param name="result">The result of the lookup. Can be <see langword="null"/> if no matching beatmap was found (or the lookup failed).</param>
/// <returns>
/// <see langword="true"/> if any of the metadata sources were available and returned a valid <paramref name="result"/>.
/// <see langword="false"/> if none of the metadata sources were available, or if there was insufficient data to return a valid <paramref name="result"/>.
/// </returns>
/// <remarks>
/// There are two cases wherein this method will return <see langword="false"/>:
/// <list type="bullet">
/// <item>If neither the local cache or the API are available to query.</item>
/// <item>If the API is not available to query, and a positive match was not made in the local cache.</item>
/// </list>
/// In either case, the online ID read from the .osu file will be preserved, which may not necessarily be what we want.
/// TODO: reconsider this if/when a better flow for queueing online retrieval is implemented.
/// </remarks>
private bool tryLookup(BeatmapInfo beatmapInfo, bool preferOnlineFetch, out OnlineBeatmapMetadata? result)
{
OnlineBeatmapMetadata? result = null;
bool useLocalCache = !apiMetadataSource.Available || !preferOnlineFetch;
if (useLocalCache)
if (localCachedMetadataSource.Available && (!apiMetadataSource.Available || !preferOnlineFetch))
{
result = localCachedMetadataSource.Lookup(beatmapInfo);
if (result != null)
return result;
if (result != null)
return true;
}
if (apiMetadataSource.Available)
{
result = apiMetadataSource.Lookup(beatmapInfo);
return true;
}
return result;
result = null;
return false;
}
/// <summary>

2
osu.Game/Beatmaps/IOnlineBeatmapMetadataSource.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps
/// Looks up the online metadata for the supplied <paramref name="beatmapInfo"/>.
/// </summary>
/// <returns>
/// An <see cref="OnlineBeatmapMetadata"/> instance if the lookup is successful, or <see langword="null"/> if the lookup failed.
/// An <see cref="OnlineBeatmapMetadata"/> instance if the lookup is successful, or <see langword="null"/> if the lookup did not return a matching beatmap.
/// </returns>
OnlineBeatmapMetadata? Lookup(BeatmapInfo beatmapInfo);
}