h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:43:22 +08:00
Code Issues Releases Wiki Activity

Remove unused reader parameter

Browse Source
This commit is contained in:
Dean Herbert 2021-10-24 23:48:46 +09:00
parent 5303cae044
commit 26cf5370c3
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Database/ArchiveModelManager.cs
View File

@ -315,7 +315,7 @@ namespace osu.Game.Database
/// <remarks> /// <remarks>
/// In the case of no matching files, a hash will be generated from the passed archive's <see cref="ArchiveReader.Name"/>. /// In the case of no matching files, a hash will be generated from the passed archive's <see cref="ArchiveReader.Name"/>.
/// </remarks> /// </remarks>
protected virtual string ComputeHash(TModel item, ArchiveReader reader = null) protected virtual string ComputeHash(TModel item)
{ {
var hashableFiles = item.Files var hashableFiles = item.Files
.Where(f => HashableFileTypes.Any(ext => f.Filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase))) .Where(f => HashableFileTypes.Any(ext => f.Filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
@ -397,7 +397,7 @@ namespace osu.Game.Database
LogForModel(item, @"Beginning import..."); LogForModel(item, @"Beginning import...");
item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>(); item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>();
item.Hash = ComputeHash(item, archive); item.Hash = ComputeHash(item);
await Populate(item, archive, cancellationToken).ConfigureAwait(false); await Populate(item, archive, cancellationToken).ConfigureAwait(false);

4
osu.Game/Skinning/SkinManager.cs
View File

@ -155,7 +155,7 @@ namespace osu.Game.Skinning
protected override bool HasCustomHashFunction => true; protected override bool HasCustomHashFunction => true;
protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null) protected override string ComputeHash(SkinInfo item)
{ {
var instance = GetSkin(item); var instance = GetSkin(item);
@ -186,7 +186,7 @@ namespace osu.Game.Skinning
if (skinIniSourcedName != item.Name) if (skinIniSourcedName != item.Name)
updateSkinIniMetadata(item); updateSkinIniMetadata(item);
return base.ComputeHash(item, reader); return base.ComputeHash(item);
} }
private void updateSkinIniMetadata(SkinInfo item) private void updateSkinIniMetadata(SkinInfo item)

3
osu.Game/Tests/Visual/EditorTestScene.cs
View File

@ -10,7 +10,6 @@ using osu.Framework.Platform;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.IO.Archives;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
@ -154,7 +153,7 @@ namespace osu.Game.Tests.Visual
{ {
} }
protected override string ComputeHash(BeatmapSetInfo item, ArchiveReader reader = null) protected override string ComputeHash(BeatmapSetInfo item)
=> string.Empty; => string.Empty;
} }