Fix skins containing subdirectories breaking on external edit on windows #33999
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closes ppy#33994. The reason for the breakage is that `Directory.EnumerateFiles()` used in https://github.com/ppy/osu/blob/b1435d35e56eed08a57d1909fa0b16e67bd9c2a2/osu.Game/Skinning/SkinImporter.cs#L63 will use the primary platform directory separator character, which is `\` on windows and `/` on unices. The internal realm storage structure is expecting paths to be normalised to the unix convention, which is evident in https://github.com/ppy/osu/blob/b1435d35e56eed08a57d1909fa0b16e67bd9c2a2/osu.Game/Database/RealmArchiveModelImporter.cs#L499 on the write side and in https://github.com/ppy/osu/blob/b1435d35e56eed08a57d1909fa0b16e67bd9c2a2/osu.Game/Skinning/RealmBackedResourceStore.cs#L50 on the read side. Rather than applying this locally to the skin importer I kinda think it's better to have this call in `ModelManager` to hopefully avoid future footgunnage of this kind.
bdach
added
realm
peppy
approved these changes
Jul 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For anyone who broke their skins because of this, this change also allows them to be retroactively fixed by starting an external edit operation and immediately finishing it (you don't need to make any changes to the skin files).
Closes #33994.
The reason for the breakage is that
Directory.EnumerateFiles()used inosu/osu.Game/Skinning/SkinImporter.cs
Line 63 in b1435d3
will use the primary platform directory separator character, which is
\on windows and/on unices. The internal realm storage structure is expecting paths to be normalised to the unix convention, which is evident inosu/osu.Game/Database/RealmArchiveModelImporter.cs
Line 499 in b1435d3
on the write side and in
osu/osu.Game/Skinning/RealmBackedResourceStore.cs
Line 50 in b1435d3
on the read side.
Rather than applying this locally to the skin importer I kinda think it's better to have this call in
ModelManagerto hopefully avoid future footgunnage of this kind.