sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Further improvements to messaging

Browse Source
This commit is contained in:
Dean Herbert
2018-03-19 20:30:45 +09:00
parent 18368d2446
commit 994c7bfabd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,6 @@ namespace osu.Game.Database
var notification = new ProgressNotification var notification = new ProgressNotification
{ {
Text = "Import is initialising...", Text = "Import is initialising...",
CompletionText = "Import successful!",
Progress = 0, Progress = 0,
State = ProgressNotificationState.Active, State = ProgressNotificationState.Active,
}; };
@ -88,7 +87,7 @@ namespace osu.Game.Database
List<TModel> imported = new List<TModel>(); List<TModel> imported = new List<TModel>();
int success = 0; int current = 0;
int errors = 0; int errors = 0;
foreach (string path in paths) foreach (string path in paths)
{ {
@ -98,11 +97,11 @@ namespace osu.Game.Database
try try
{ {
notification.Text = $"Importing ({success} of {paths.Length})\n{Path.GetFileName(path)}"; notification.Text = $"Importing ({++current} of {paths.Length})\n{Path.GetFileName(path)}";
using (ArchiveReader reader = getReaderFrom(path)) using (ArchiveReader reader = getReaderFrom(path))
imported.Add(Import(reader)); imported.Add(Import(reader));
notification.Progress = (float)++success / paths.Length; notification.Progress = (float)(current - 1) / paths.Length;
// We may or may not want to delete the file depending on where it is stored. // We may or may not want to delete the file depending on where it is stored.
// e.g. reconstructing/repairing database with items from default storage. // e.g. reconstructing/repairing database with items from default storage.
@ -126,7 +125,8 @@ namespace osu.Game.Database
} }
} }
notification.State = errors == 0 ? ProgressNotificationState.Completed : ProgressNotificationState.Cancelled; notification.Text = errors > 0 ? $"Import complete with {errors} errors" : "Import successful!";
notification.State = ProgressNotificationState.Completed;
} }
/// <summary> /// <summary>
@ -333,7 +333,7 @@ namespace osu.Game.Database
{ {
if (ZipFile.IsZipFile(path)) if (ZipFile.IsZipFile(path))
return new ZipArchiveReader(Files.Storage.GetStream(path), Path.GetFileName(path)); return new ZipArchiveReader(Files.Storage.GetStream(path), Path.GetFileName(path));
return new LegacyFilesystemReader(path); return new LegacyFilesystemReader(path);
} }
} }
} }