RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-11 17:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify beatmap store retrieval

Browse Source
This commit is contained in:
Dean Herbert 2018-02-09 19:12:29 +09:00
parent 541068235d
commit 5e0cb9d4b9
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -67,7 +67,9 @@ namespace osu.Game.Beatmaps
private readonly Storage storage;
private BeatmapStore createBeatmapStore(Func<OsuDbContext> context)
private BeatmapStore getBeatmapStoreWithContext(OsuDbContext context) => getBeatmapStoreWithContext(() => context);
private BeatmapStore getBeatmapStoreWithContext(Func<OsuDbContext> context)
{
var store = new BeatmapStore(context);
store.BeatmapSetAdded += s => BeatmapSetAdded?.Invoke(s);
@ -123,7 +125,7 @@ namespace osu.Game.Beatmaps
refreshImportContext();
beatmaps = createBeatmapStore(context);
beatmaps = getBeatmapStoreWithContext(context);
files = new FileStore(context, storage);
this.storage = files.Storage;
@ -368,14 +370,10 @@ namespace osu.Game.Beatmaps
// re-fetch the beatmap set on the import context.
beatmapSet = context.BeatmapSetInfo.Include(s => s.Files).ThenInclude(f => f.FileInfo).First(s => s.ID == beatmapSet.ID);
// create local stores so we can isolate and thread safely, and share a context/transaction.
var iFiles = new FileStore(() => context, storage);
var iBeatmaps = createBeatmapStore(() => context);
if (iBeatmaps.Delete(beatmapSet))
if (getBeatmapStoreWithContext(context).Delete(beatmapSet))
{
if (!beatmapSet.Protected)
iFiles.Dereference(beatmapSet.Files.Select(f => f.FileInfo).ToArray());
new FileStore(() => context, storage).Dereference(beatmapSet.Files.Select(f => f.FileInfo).ToArray());
}
context.ChangeTracker.AutoDetectChangesEnabled = true;
@ -428,10 +426,7 @@ namespace osu.Game.Beatmaps
{
context.ChangeTracker.AutoDetectChangesEnabled = false;
var iFiles = new FileStore(() => context, storage);
var iBeatmaps = createBeatmapStore(() => context);
undelete(iBeatmaps, iFiles, beatmapSet);
undelete(getBeatmapStoreWithContext(context), new FileStore(() => context, storage), beatmapSet);
context.ChangeTracker.AutoDetectChangesEnabled = true;
context.SaveChanges(transaction);
@ -522,7 +517,7 @@ namespace osu.Game.Beatmaps
/// <returns>Results from the provided query.</returns>
public IEnumerable<BeatmapInfo> QueryBeatmaps(Expression<Func<BeatmapInfo, bool>> query) => beatmaps.Beatmaps.AsNoTracking().Where(query);
private void import(BeatmapSetInfo beatmapSet, OsuDbContext context) => createBeatmapStore(() => context).Add(beatmapSet);
private void import(BeatmapSetInfo beatmapSet, OsuDbContext context) => getBeatmapStoreWithContext(context).Add(beatmapSet);
/// <summary>
/// Creates an <see cref="ArchiveReader"/> from a valid storage path.