sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Further simplify import messaging

Browse Source
This commit is contained in:
Dean Herbert
2019-02-25 18:42:08 +09:00
parent 80737b9ef8
commit 314f35b0c5
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -145,8 +145,7 @@ namespace osu.Game.Beatmaps
var downloadNotification = new DownloadNotification var downloadNotification = new DownloadNotification
{ {
CompletionText = $"Imported {beatmapSetInfo.Metadata.Artist} - {beatmapSetInfo.Metadata.Title}!", Text = $"Downloading {beatmapSetInfo}",
Text = $"Downloading {beatmapSetInfo.Metadata.Artist} - {beatmapSetInfo.Metadata.Title}",
}; };
var request = new DownloadBeatmapSetRequest(beatmapSetInfo, noVideo); var request = new DownloadBeatmapSetRequest(beatmapSetInfo, noVideo);

17
osu.Game/Database/ArchiveModelManager.cs
View File

@ -139,6 +139,8 @@ namespace osu.Game.Database
notification.Progress = 0; notification.Progress = 0;
notification.Text = "Import is initialising..."; notification.Text = "Import is initialising...";
var term = $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
List<TModel> imported = new List<TModel>(); List<TModel> imported = new List<TModel>();
int current = 0; int current = 0;
@ -150,7 +152,18 @@ namespace osu.Game.Database
try try
{ {
notification.Text = $"Importing ({++current} of {paths.Length})\n{Path.GetFileName(path)}"; var text = $"Importing ";
if (path.Length > 1)
text += $"{++current} of {paths.Length} {term}s..";
else
text += $"{term}..";
// only show the filename if it isn't a temporary one (as those look ugly).
if (!path.Contains(Path.GetTempPath()))
text += $"\n{Path.GetFileName(path)}";
notification.Text = text;
imported.Add(Import(path)); imported.Add(Import(path));
@ -172,7 +185,7 @@ namespace osu.Game.Database
{ {
notification.CompletionText = imported.Count == 1 notification.CompletionText = imported.Count == 1
? $"Imported {imported.First()}!" ? $"Imported {imported.First()}!"
: $"Imported {current} {typeof(TModel).Name.Replace("Info", "").ToLower()}s!"; : $"Imported {current} {term}s!";
if (imported.Count > 0 && PresentImport != null) if (imported.Count > 0 && PresentImport != null)
{ {

2
osu.Game/OsuGame.cs
View File

@ -275,7 +275,7 @@ namespace osu.Game
Beatmap.Value.Mods.Value = databasedScoreInfo.Mods; Beatmap.Value.Mods.Value = databasedScoreInfo.Mods;
menuScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore))); menuScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore)));
}, $"watch {databasedScoreInfo.User.Username} play {databasedScoreInfo.Beatmap}", bypassScreenAllowChecks: true); }, $"watch {databasedScoreInfo}", bypassScreenAllowChecks: true);
} }
private ScheduledDelegate performFromMainMenuTask; private ScheduledDelegate performFromMainMenuTask;

2
osu.Game/Scoring/ScoreInfo.cs
View File

@ -158,5 +158,7 @@ namespace osu.Game.Scoring
{ {
public string Acronym { get; set; } public string Acronym { get; set; }
} }
public override string ToString() => $"{User} playing {Beatmap}";
} }
} }