sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

extract findBestNumber() from GetNextBestName() into private method

Browse Source
This commit is contained in:
Piggey 2022-12-01 18:42:52 +01:00
parent 8f59aad91c
commit 5de01686a9
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
osu.Game/Utils/NamingUtils.cs
View File

@ -31,6 +31,30 @@ namespace osu.Game.Utils
{ {
string pattern = $@"^(?i){Regex.Escape(desiredName)}(?-i)( \((?<copyNumber>[1-9][0-9]*)\))?$"; string pattern = $@"^(?i){Regex.Escape(desiredName)}(?-i)( \((?<copyNumber>[1-9][0-9]*)\))?$";
var regex = new Regex(pattern, RegexOptions.Compiled); var regex = new Regex(pattern, RegexOptions.Compiled);
int bestNumber = findBestNumber(existingNames, regex);
return bestNumber == 0
? desiredName
: $"{desiredName} ({bestNumber.ToString()})";
}
/// <summary>
/// Given a set of <paramref name="existingFilenames"/> and a desired target <paramref name="desiredName"/>
/// finds a filename closest to <paramref name="desiredName"/> that is not in <paramref name="existingFilenames"/>
/// <remarks>
/// <paramref name="desiredName"/> SHOULD NOT CONTAIN the file extension.
/// </remarks>
/// </summary>
public static string GetNextBestFilename(IEnumerable<string> existingFilenames, string desiredName, string fileExtension)
{
var stripped = existingFilenames.Select(filename => filename.Substring(0, filename.Length - fileExtension.Length));
return $"{GetNextBestName(stripped, desiredName)}{fileExtension}";
}
private static int findBestNumber(IEnumerable<string> existingNames, Regex regex)
{
var takenNumbers = new HashSet<int>(); var takenNumbers = new HashSet<int>();
foreach (string name in existingNames) foreach (string name in existingNames)
@ -54,23 +78,7 @@ namespace osu.Game.Utils
while (takenNumbers.Contains(bestNumber)) while (takenNumbers.Contains(bestNumber))
bestNumber += 1; bestNumber += 1;
return bestNumber == 0 return bestNumber;
? desiredName
: $"{desiredName} ({bestNumber})";
}
/// <summary>
/// Given a set of <paramref name="existingFilenames"/> and a desired target <paramref name="desiredName"/>
/// finds a filename closest to <paramref name="desiredName"/> that is not in <paramref name="existingFilenames"/>
/// <remarks>
/// <paramref name="desiredName"/> SHOULD NOT CONTAIN the file extension.
/// </remarks>
/// </summary>
public static string GetNextBestFilename(IEnumerable<string> existingFilenames, string desiredName, string fileExtension)
{
var stripped = existingFilenames.Select(filename => filename.Substring(0, filename.Length - fileExtension.Length));
return $"{GetNextBestName(stripped, desiredName)}{fileExtension}";
} }
} }
} }