h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 13:47:21 +08:00
Code Issues Releases Wiki Activity

Handle missing files without hard failure

Browse Source 
Also adds support for lookups with file extensions
This commit is contained in:
Dean Herbert 2018-03-14 18:42:13 +09:00
parent 62e908e22c
commit 8e52d91180
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Skinning/LegacySkin.cs
View File

@ -60,10 +60,12 @@ namespace osu.Game.Skinning
private string getPathForFile(string filename) private string getPathForFile(string filename)
{ {
bool hasExtension = filename.Contains('.');
string lastPiece = filename.Split('/').Last(); string lastPiece = filename.Split('/').Last();
var file = skin.Files.FirstOrDefault(f => var file = skin.Files.FirstOrDefault(f =>
string.Equals(Path.GetFileNameWithoutExtension(f.Filename), lastPiece, StringComparison.InvariantCultureIgnoreCase)); string.Equals(hasExtension ? f.Filename : Path.GetFileNameWithoutExtension(f.Filename), lastPiece, StringComparison.InvariantCultureIgnoreCase));
return file?.FileInfo.StoragePath; return file?.FileInfo.StoragePath;
} }
@ -73,9 +75,17 @@ namespace osu.Game.Skinning
this.underlyingStore = underlyingStore; this.underlyingStore = underlyingStore;
} }
public Stream GetStream(string name) => underlyingStore.GetStream(getPathForFile(name)); public Stream GetStream(string name)
{
string path = getPathForFile(name);
return path == null ? null : underlyingStore.GetStream(path);
}
byte[] IResourceStore<byte[]>.Get(string name) => underlyingStore.Get(getPathForFile(name)); byte[] IResourceStore<byte[]>.Get(string name)
{
string path = getPathForFile(name);
return path == null ? null : underlyingStore.Get(path);
}
} }
} }
} }