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

Use a regex for matching invalid characters instead

Browse Source 
What the regex does is it matches everything except alphanumeric and [_()[] -], excluding EOL since regex101 seems to also match it, and we probably don't want that to happen.
This commit is contained in:
nullium21 2022-10-27 10:33:50 +03:00
parent dffebdf7ed
commit 68d1febe6e
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Extensions/ModelExtensions.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.IO;
using System.Text.RegularExpressions;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.IO;
@ -136,34 +137,14 @@ namespace osu.Game.Extensions
return instance.OnlineID.Equals(other.OnlineID);
}
private static bool isValidFilenameChar(this char ch)
{
if (ch >= '0' && ch <= '9')
return true;
if (ch >= 'A' && ch <= 'Z')
return true;
if (ch >= 'a' && ch <= 'z')
return true;
return "-_()[]".Contains(ch);
}
private static Regex invalid_filename_chars = new(@"(?!$)[^A-Za-z0-9_()[\] -]", RegexOptions.Compiled);
/// <summary>
/// Get a valid filename for use inside a zip file. Avoids backslashes being incorrectly converted to directories.
/// </summary>
public static string GetValidArchiveContentFilename(this string filename)
{
char[] resultData = filename.ToCharArray();
for (int i = 0; i < resultData.Length; i++)
{
if (!isValidFilenameChar(resultData[i]))
resultData[i] = '_';
}
return new string(resultData);
return invalid_filename_chars.Replace(filename, "_");
}
}
}