RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 02:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

FileStore logic fixes

Browse Source
This commit is contained in:
Dean Herbert 2017-10-17 10:25:18 +09:00
parent 81476ebe75
commit 799f510217
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -95,8 +95,6 @@ namespace osu.Game.Tests.Beatmaps.IO
private OsuGameBase loadOsu(GameHost host)
{
host.Storage.DeleteDatabase(@"client");
var osu = new OsuGameBase();
Task.Run(() => host.Run(osu));

16
osu.Game/IO/FileStore.cs
View File

@ -31,10 +31,6 @@ namespace osu.Game.IO
{
if (reset)
{
// in earlier versions we stored beatmaps as solid archives, but not any more.
if (Storage.ExistsDirectory("beatmaps"))
Storage.DeleteDirectory("beatmaps");
if (Storage.ExistsDirectory(prefix))
Storage.DeleteDirectory(prefix);
@ -70,12 +66,14 @@ namespace osu.Game.IO
}
if (existing == null)
{
Connection.FileInfo.Add(info);
Connection.SaveChanges();
}
if (reference || existing == null)
Reference(info);
Connection.SaveChanges();
return info;
}
@ -85,6 +83,7 @@ namespace osu.Game.IO
{
var refetch = Connection.Find<FileInfo>(f.First().ID);
refetch.ReferenceCount += f.Count();
Connection.Update(refetch);
}
Connection.SaveChanges();
@ -94,8 +93,9 @@ namespace osu.Game.IO
{
foreach (var f in files.GroupBy(f => f.ID))
{
var accurateRefCount = Connection.Find<FileInfo>(f.First().ID);
accurateRefCount.ReferenceCount -= f.Count();
var refetch = Connection.Find<FileInfo>(f.First().ID);
refetch.ReferenceCount -= f.Count();
Connection.Update(refetch);
}
Connection.SaveChanges();
@ -115,6 +115,8 @@ namespace osu.Game.IO
Logger.Error(e, $@"Could not delete beatmap {f}");
}
}
Connection.SaveChanges();
}
}
}