RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up exception and null handling in Import process

This commit is contained in:
Dean Herbert 2019-06-10 17:12:37 +09:00
parent 559413f766
commit c8bd92659b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,15 +252,15 @@ public async Task<TModel> Import(ArchiveReader archive, CancellationToken cancel
{
cancellationToken.ThrowIfCancellationRequested();
TModel model;
try
{
var model = CreateModel(archive);
model = CreateModel(archive);
if (model == null) return null;
model.Hash = computeHash(archive);
return await Import(model, archive, cancellationToken);
}
catch (TaskCanceledException)
{
@ -271,6 +271,8 @@ public async Task<TModel> Import(ArchiveReader archive, CancellationToken cancel
Logger.Error(e, $"Model creation of {archive.Name} failed.", LoggingTarget.Database);
return null;
}
return await Import(model, archive, cancellationToken);
}
/// <summary>
@ -340,7 +342,9 @@ void rollback()
Logger.Log($"Found existing {nameof(TModel)} for {item} (ID {existing.ID}). Skipping import.", LoggingTarget.Database);
handleEvent(() => ItemAdded?.Invoke(existing, true));
// existing item will be used; rollback new import and exit early.
rollback();
flushEvents(true);
return existing;
}
else
@ -370,14 +374,11 @@ void rollback()
Logger.Error(e, $"Import of {item} failed and has been rolled back.", LoggingTarget.Database);
rollback();
item = null;
}
finally
{
// we only want to flush events after we've confirmed the write context didn't have any errors.
flushEvents(item != null);
flushEvents(false);
throw;
}
flushEvents(true);
return item;
}, cancellationToken, TaskCreationOptions.HideScheduler, IMPORT_SCHEDULER).Unwrap();