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

Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts

Browse Source 
# Conflicts:
#	osu.Game/Database/ArchiveModelManager.cs
This commit is contained in:
smoogipoo
2018-05-31 14:02:52 +09:00
parent 749a69567b 3fc2bfd313
commit 9da7bfd615
21 changed files with 154 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@ namespace osu.Game.Database
/// <param name="archive">The archive to be imported.</param>
public TModel Import(ArchiveReader archive)
{
TModel item;
TModel item = null;
delayEvents();
try
@ -212,14 +212,17 @@ namespace osu.Game.Database
Logger.Log($"Import of {archive.Name} successfully completed!", LoggingTarget.Database);
}
catch
catch (Exception e)
{
Logger.Log($"Import of {archive.Name} failed and has been rolled back.", LoggingTarget.Database);
Logger.Error(e, $"Import of {archive.Name} failed and has been rolled back.", LoggingTarget.Database);
item = null;
}
finally
{
// we only want to flush events after we've confirmed the write context didn't have any errors.
flushEvents(item != null);
}
// we only want to flush events after we've confirmed the write context didn't have any errors.
flushEvents(item != null);
return item;
}
@ -243,12 +246,8 @@ namespace osu.Game.Database
/// <param name="item">The item to delete.</param>
public void Delete(TModel item)
{
using (var usage = ContextFactory.GetForWrite())
using (ContextFactory.GetForWrite())
{
var context = usage.Context;
context.ChangeTracker.AutoDetectChangesEnabled = false;
// re-fetch the model on the import context.
var foundModel = queryModel().Include(s => s.Files).ThenInclude(f => f.FileInfo).First(s => s.ID == item.ID);
@ -256,8 +255,6 @@ namespace osu.Game.Database
if (ModelStore.Delete(foundModel))
Files.Dereference(foundModel.Files.Select(f => f.FileInfo).ToArray());
context.ChangeTracker.AutoDetectChangesEnabled = true;
}
}