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

Merge pull request #24943 from peppy/fix-batch-import-score-missing-notifications

Browse Source 
Don't show replay import "missing beatmap" notifications during stable import
This commit is contained in:
Bartłomiej Dach 2023-09-27 18:11:42 +02:00 committed by GitHub
commit 41efee19e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,7 @@ namespace osu.Game.Beatmaps
public override string HumanisedModelName => "beatmap"; public override string HumanisedModelName => "beatmap";
protected override BeatmapSetInfo? CreateModel(ArchiveReader reader) protected override BeatmapSetInfo? CreateModel(ArchiveReader reader, ImportParameters parameters)
{ {
// let's make sure there are actually .osu files to import. // let's make sure there are actually .osu files to import.
string? mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase)); string? mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));

5
osu.Game/Database/RealmArchiveModelImporter.cs
View File

@ -229,7 +229,7 @@ namespace osu.Game.Database
try try
{ {
model = CreateModel(archive); model = CreateModel(archive, parameters);
if (model == null) if (model == null)
return null; return null;
@ -474,8 +474,9 @@ namespace osu.Game.Database
/// Actual expensive population should be done in <see cref="Populate"/>; this should just prepare for duplicate checking. /// Actual expensive population should be done in <see cref="Populate"/>; this should just prepare for duplicate checking.
/// </summary> /// </summary>
/// <param name="archive">The archive to create the model for.</param> /// <param name="archive">The archive to create the model for.</param>
/// <param name="parameters">Parameters to further configure the import process.</param>
/// <returns>A model populated with minimal information. Returning a null will abort importing silently.</returns> /// <returns>A model populated with minimal information. Returning a null will abort importing silently.</returns>
protected abstract TModel? CreateModel(ArchiveReader archive); protected abstract TModel? CreateModel(ArchiveReader archive, ImportParameters parameters);
/// <summary> /// <summary>
/// Populate the provided model completely from the given archive. /// Populate the provided model completely from the given archive.

14
osu.Game/Scoring/ScoreImporter.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Scoring
this.api = api; this.api = api;
} }
protected override ScoreInfo? CreateModel(ArchiveReader archive) protected override ScoreInfo? CreateModel(ArchiveReader archive, ImportParameters parameters)
{ {
string name = archive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase)); string name = archive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase));
@ -56,10 +56,14 @@ namespace osu.Game.Scoring
{ {
Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{notFound.Hash}' could be found.", LoggingTarget.Database); Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{notFound.Hash}' could be found.", LoggingTarget.Database);
// In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap. if (!parameters.Batch)
var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = notFound.Hash }); {
req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, notFound.Hash)); // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
api.Queue(req); var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = notFound.Hash });
req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, notFound.Hash));
api.Queue(req);
}
return null; return null;
} }
catch (Exception e) catch (Exception e)

2
osu.Game/Skinning/SkinImporter.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Skinning
protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == @".osk"; protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == @".osk";
protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name ?? @"No name" }; protected override SkinInfo CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
private const string unknown_creator_string = @"Unknown"; private const string unknown_creator_string = @"Unknown";