From 314f35b0c51417c2ab91711e1b7ecbacaf415185 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Feb 2019 18:42:08 +0900
Subject: [PATCH] Further simplify import messaging

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  3 +--
 osu.Game/Database/ArchiveModelManager.cs | 17 +++++++++++++++--
 osu.Game/OsuGame.cs                      |  2 +-
 osu.Game/Scoring/ScoreInfo.cs            |  2 ++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 002bd2063e..64dfc497ee 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -145,8 +145,7 @@ namespace osu.Game.Beatmaps
 
             var downloadNotification = new DownloadNotification
             {
-                CompletionText = $"Imported {beatmapSetInfo.Metadata.Artist} - {beatmapSetInfo.Metadata.Title}!",
-                Text = $"Downloading {beatmapSetInfo.Metadata.Artist} - {beatmapSetInfo.Metadata.Title}",
+                Text = $"Downloading {beatmapSetInfo}",
             };
 
             var request = new DownloadBeatmapSetRequest(beatmapSetInfo, noVideo);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index f632865ba3..61f0867381 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -139,6 +139,8 @@ namespace osu.Game.Database
             notification.Progress = 0;
             notification.Text = "Import is initialising...";
 
+            var term = $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
+
             List<TModel> imported = new List<TModel>();
 
             int current = 0;
@@ -150,7 +152,18 @@ namespace osu.Game.Database
 
                 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));
 
@@ -172,7 +185,7 @@ namespace osu.Game.Database
             {
                 notification.CompletionText = imported.Count == 1
                     ? $"Imported {imported.First()}!"
-                    : $"Imported {current} {typeof(TModel).Name.Replace("Info", "").ToLower()}s!";
+                    : $"Imported {current} {term}s!";
 
                 if (imported.Count > 0 && PresentImport != null)
                 {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5aafc11c92..93acc949ef 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -275,7 +275,7 @@ namespace osu.Game
                 Beatmap.Value.Mods.Value = databasedScoreInfo.Mods;
 
                 menuScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore)));
-            }, $"watch {databasedScoreInfo.User.Username} play {databasedScoreInfo.Beatmap}", bypassScreenAllowChecks: true);
+            }, $"watch {databasedScoreInfo}", bypassScreenAllowChecks: true);
         }
 
         private ScheduledDelegate performFromMainMenuTask;
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c88fd77eb2..6f1466fb6b 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -158,5 +158,7 @@ namespace osu.Game.Scoring
         {
             public string Acronym { get; set; }
         }
+
+        public override string ToString() => $"{User} playing {Beatmap}";
     }
 }