h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 08:43:01 +08:00
Code Issues Releases Wiki Activity

Fix download tracking components getting stuck on import failur… (#6639)

Browse Source 
Fix download tracking components getting stuck on import failures
This commit is contained in:
Dean Herbert 2019-10-29 18:16:23 +09:00 committed by GitHub
commit 89d3f461e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ namespace osu.Game.Database
return Import(notification, paths); return Import(notification, paths);
} }
protected async Task Import(ProgressNotification notification, params string[] paths) protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params string[] paths)
{ {
notification.Progress = 0; notification.Progress = 0;
notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising..."; notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...";
@ -168,6 +168,8 @@ namespace osu.Game.Database
notification.State = ProgressNotificationState.Completed; notification.State = ProgressNotificationState.Completed;
} }
return imported;
} }
/// <summary> /// <summary>

7
osu.Game/Database/DownloadableArchiveModelManager.cs
View File

@ -76,7 +76,12 @@ namespace osu.Game.Database
Task.Factory.StartNew(async () => Task.Factory.StartNew(async () =>
{ {
// This gets scheduled back to the update thread, but we want the import to run in the background. // This gets scheduled back to the update thread, but we want the import to run in the background.
await Import(notification, filename); var imported = await Import(notification, filename);
// for now a failed import will be marked as a failed download for simplicity.
if (!imported.Any())
DownloadFailed?.Invoke(request);
currentDownloads.Remove(request); currentDownloads.Remove(request);
}, TaskCreationOptions.LongRunning); }, TaskCreationOptions.LongRunning);
}; };