h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #7228 from peppy/fix-skin-crash

Browse Source 
Fix crashes on custom skins due to extension-less file lookups
This commit is contained in:
Dan Balasescu 2019-12-16 15:34:29 +09:00 committed by GitHub
commit c3c0356963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
osu.Game/Skinning/LegacySkinResourceStore.cs
View File

@ -3,77 +3,39 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
using osu.Game.Database; using osu.Game.Database;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
public class LegacySkinResourceStore<T> : IResourceStore<byte[]> public class LegacySkinResourceStore<T> : ResourceStore<byte[]>
where T : INamedFileInfo where T : INamedFileInfo
{ {
private readonly IHasFiles<T> source; private readonly IHasFiles<T> source;
private readonly IResourceStore<byte[]> underlyingStore;
private string getPathForFile(string filename)
{
if (source.Files == null)
return null;
bool hasExtension = filename.Contains('.');
var file = source.Files.Find(f =>
string.Equals(hasExtension ? f.Filename : Path.ChangeExtension(f.Filename, null), filename, StringComparison.InvariantCultureIgnoreCase));
return file?.FileInfo.StoragePath;
}
public LegacySkinResourceStore(IHasFiles<T> source, IResourceStore<byte[]> underlyingStore) public LegacySkinResourceStore(IHasFiles<T> source, IResourceStore<byte[]> underlyingStore)
: base(underlyingStore)
{ {
this.source = source; this.source = source;
this.underlyingStore = underlyingStore;
} }
public Stream GetStream(string name) protected override IEnumerable<string> GetFilenames(string name)
{ {
string path = getPathForFile(name); if (source.Files == null)
return path == null ? null : underlyingStore.GetStream(path); yield break;
}
public IEnumerable<string> GetAvailableResources() => source.Files.Select(f => f.Filename); foreach (var filename in base.GetFilenames(name))
byte[] IResourceStore<byte[]>.Get(string name) => GetAsync(name).Result;
public Task<byte[]> GetAsync(string name)
{
string path = getPathForFile(name);
return path == null ? Task.FromResult<byte[]>(null) : underlyingStore.GetAsync(path);
}
#region IDisposable Support
private bool isDisposed;
protected virtual void Dispose(bool disposing)
{
if (!isDisposed)
{ {
isDisposed = true; var path = getPathForFile(filename);
if (path != null)
yield return path;
} }
} }
~LegacySkinResourceStore() private string getPathForFile(string filename) =>
{ source.Files.Find(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase))?.FileInfo.StoragePath;
Dispose(false);
}
public void Dispose() public override IEnumerable<string> GetAvailableResources() => source.Files.Select(f => f.Filename);
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
} }
} }