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

Merge pull request #15883 from peppy/realm-integration/skins-filename-lookup-performance

Browse Source 
Optimise skin filename lookups post realm migration
This commit is contained in:
Dean Herbert
2021-12-06 18:40:12 +09:00
committed by GitHub
parent cf34b3f70e 07abcf04b4
commit bab9e0542b
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Skinning/LegacyDatabasedSkinResourceStore.cs
View File

@ -1,25 +1,28 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using osu.Framework.Extensions; using osu.Framework.Extensions;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
using osu.Game.Database;
using osu.Game.Extensions; using osu.Game.Extensions;
using Realms;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
public class LegacyDatabasedSkinResourceStore : ResourceStore<byte[]> public class LegacyDatabasedSkinResourceStore : ResourceStore<byte[]>
{ {
private readonly ILive<SkinInfo> source; private readonly Dictionary<string, string> fileToStoragePathMapping = new Dictionary<string, string>();
public LegacyDatabasedSkinResourceStore(SkinInfo source, IResourceStore<byte[]> underlyingStore) public LegacyDatabasedSkinResourceStore(SkinInfo source, IResourceStore<byte[]> underlyingStore)
: base(underlyingStore) : base(underlyingStore)
{ {
this.source = source.ToLive(); initialiseFileCache(source);
}
private void initialiseFileCache(SkinInfo source)
{
fileToStoragePathMapping.Clear();
foreach (var f in source.Files)
fileToStoragePathMapping[f.Filename.ToLowerInvariant()] = f.File.GetStoragePath();
} }
protected override IEnumerable<string> GetFilenames(string name) protected override IEnumerable<string> GetFilenames(string name)
@ -33,17 +36,8 @@ namespace osu.Game.Skinning
} }
private string getPathForFile(string filename) => private string getPathForFile(string filename) =>
source.PerformRead(s => fileToStoragePathMapping.TryGetValue(filename.ToLower(), out string path) ? path : null;
{
if (s.IsManaged)
{
// avoid enumerating all files if this is a managed realm instance.
return s.Files.Filter(@"Filename ==[c] $0", filename).FirstOrDefault()?.File.GetStoragePath();
}
return s.Files.FirstOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath(); public override IEnumerable<string> GetAvailableResources() => fileToStoragePathMapping.Keys;
});
public override IEnumerable<string> GetAvailableResources() => source.PerformRead(s => s.Files.Select(f => f.Filename));
} }
} }