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

Remove storage class variable

Browse Source
This commit is contained in:
Dean Herbert 2018-02-09 19:24:17 +09:00
parent 5e0cb9d4b9
commit c7de79caf6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
/// </summary> /// </summary>
public WorkingBeatmap DefaultBeatmap { private get; set; } public WorkingBeatmap DefaultBeatmap { private get; set; }
private readonly Storage storage; private FileStore getFileStoreWithContext(OsuDbContext context) => new FileStore(() => context, files.Storage);
private BeatmapStore getBeatmapStoreWithContext(OsuDbContext context) => getBeatmapStoreWithContext(() => context); private BeatmapStore getBeatmapStoreWithContext(OsuDbContext context) => getBeatmapStoreWithContext(() => context);
@ -128,7 +128,6 @@ namespace osu.Game.Beatmaps
beatmaps = getBeatmapStoreWithContext(context); beatmaps = getBeatmapStoreWithContext(context);
files = new FileStore(context, storage); files = new FileStore(context, storage);
this.storage = files.Storage;
this.rulesets = rulesets; this.rulesets = rulesets;
this.api = api; this.api = api;
@ -233,7 +232,7 @@ namespace osu.Game.Beatmaps
Delete(existingOnlineId); Delete(existingOnlineId);
} }
beatmapSet.Files = createFileInfos(archive, new FileStore(() => context, storage)); beatmapSet.Files = createFileInfos(archive, getFileStoreWithContext(context));
beatmapSet.Beatmaps = createBeatmapDifficulties(archive); beatmapSet.Beatmaps = createBeatmapDifficulties(archive);
// remove metadata from difficulties where it matches the set // remove metadata from difficulties where it matches the set
@ -373,7 +372,7 @@ namespace osu.Game.Beatmaps
if (getBeatmapStoreWithContext(context).Delete(beatmapSet)) if (getBeatmapStoreWithContext(context).Delete(beatmapSet))
{ {
if (!beatmapSet.Protected) if (!beatmapSet.Protected)
new FileStore(() => context, storage).Dereference(beatmapSet.Files.Select(f => f.FileInfo).ToArray()); getFileStoreWithContext(context).Dereference(beatmapSet.Files.Select(f => f.FileInfo).ToArray());
} }
context.ChangeTracker.AutoDetectChangesEnabled = true; context.ChangeTracker.AutoDetectChangesEnabled = true;
@ -426,7 +425,7 @@ namespace osu.Game.Beatmaps
{ {
context.ChangeTracker.AutoDetectChangesEnabled = false; context.ChangeTracker.AutoDetectChangesEnabled = false;
undelete(getBeatmapStoreWithContext(context), new FileStore(() => context, storage), beatmapSet); undelete(getBeatmapStoreWithContext(context), getFileStoreWithContext(context), beatmapSet);
context.ChangeTracker.AutoDetectChangesEnabled = true; context.ChangeTracker.AutoDetectChangesEnabled = true;
context.SaveChanges(transaction); context.SaveChanges(transaction);
@ -528,7 +527,7 @@ namespace osu.Game.Beatmaps
{ {
if (ZipFile.IsZipFile(path)) if (ZipFile.IsZipFile(path))
// ReSharper disable once InconsistentlySynchronizedField // ReSharper disable once InconsistentlySynchronizedField
return new OszArchiveReader(storage.GetStream(path)); return new OszArchiveReader(files.Storage.GetStream(path));
return new LegacyFilesystemReader(path); return new LegacyFilesystemReader(path);
} }