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

Merge pull request #17592 from peppy/skin-mutation-better-naming

Browse Source 
Fix automatically created "(modified)" skins getting conflicting names
This commit is contained in:
Dan Balasescu 2022-04-01 21:25:10 +09:00 committed by GitHub
commit 6776c37bbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ using osu.Game.Database;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.IO.Archives; using osu.Game.IO.Archives;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
using osu.Game.Utils;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
@ -144,20 +145,26 @@ namespace osu.Game.Skinning
if (!s.Protected) if (!s.Protected)
return; return;
string[] existingSkinNames = realm.Run(r => r.All<SkinInfo>()
.Where(skin => !skin.DeletePending)
.AsEnumerable()
.Select(skin => skin.Name).ToArray());
// if the user is attempting to save one of the default skin implementations, create a copy first. // if the user is attempting to save one of the default skin implementations, create a copy first.
var result = skinModelManager.Import(new SkinInfo var skinInfo = new SkinInfo
{ {
Name = s.Name + @" (modified)",
Creator = s.Creator, Creator = s.Creator,
InstantiationInfo = s.InstantiationInfo, InstantiationInfo = s.InstantiationInfo,
}); Name = NamingUtils.GetNextBestName(existingSkinNames, $"{s.Name} (modified)")
};
var result = skinModelManager.Import(skinInfo);
if (result != null) if (result != null)
{ {
// save once to ensure the required json content is populated. // save once to ensure the required json content is populated.
// currently this only happens on save. // currently this only happens on save.
result.PerformRead(skin => Save(skin.CreateInstance(this))); result.PerformRead(skin => Save(skin.CreateInstance(this)));
CurrentSkinInfo.Value = result; CurrentSkinInfo.Value = result;
} }
}); });