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

Report any error during import to the write context to allow for rollback

This commit is contained in:
Dean Herbert 2018-05-29 13:48:14 +09:00
parent cc081cad5a
commit 3d3026a80c
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,21 +181,29 @@ public TModel Import(ArchiveReader archive)
{
using (var write = ContextFactory.GetForWrite()) // used to share a context for full import. keep in mind this will block all writes.
{
if (!write.IsTransactionLeader) throw new InvalidOperationException($"Ensure there is no parent transaction so errors can correctly be handled by {this}");
try
{
if (!write.IsTransactionLeader) throw new InvalidOperationException($"Ensure there is no parent transaction so errors can correctly be handled by {this}");
// create a new model (don't yet add to database)
item = CreateModel(archive);
// create a new model (don't yet add to database)
item = CreateModel(archive);
var existing = CheckForExisting(item);
var existing = CheckForExisting(item);
if (existing != null) return existing;
if (existing != null) return existing;
item.Files = createFileInfos(archive, Files);
item.Files = createFileInfos(archive, Files);
Populate(item, archive);
Populate(item, archive);
// import to store
ModelStore.Add(item);
// import to store
ModelStore.Add(item);
}
catch (Exception e)
{
write.Errors.Add(e);
throw;
}
}
}
catch