h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00
Code Issues Releases Wiki Activity

Simplify length parsing

Browse Source
This commit is contained in:
solstice23 2022-07-23 18:13:19 +08:00
parent 7c222505e9
commit 3f2c341369
No known key found for this signature in database
GPG Key ID: 7E7F5973D9260C8A
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
View File

@ -138,6 +138,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1), true }, new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1), true },
new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1), true }, new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1), true },
new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1), true }, new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1), true },
new object[] { "1h20s", TimeSpan.FromSeconds(3620), TimeSpan.FromSeconds(1), true },
new object[] { "7.5m27s", new TimeSpan(), new TimeSpan(), false }, new object[] { "7.5m27s", new TimeSpan(), new TimeSpan(), false },
new object[] { "7m27", new TimeSpan(), new TimeSpan(), false }, new object[] { "7m27", new TimeSpan(), new TimeSpan(), false },
new object[] { "7m7m7m", new TimeSpan(), new TimeSpan(), false }, new object[] { "7m7m7m", new TimeSpan(), new TimeSpan(), false },

42
osu.Game/Screens/Select/FilterQueryParser.cs
View File

@ -129,6 +129,16 @@ namespace osu.Game.Screens.Select
value = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture)); value = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
return Enum.TryParse(value, true, out result); return Enum.TryParse(value, true, out result);
} }
private static bool tryMatchRegex(string value, string regex, ref GroupCollection result)
{
Match matchs = Regex.Match(value, regex);
if (matchs.Success)
{
result = matchs.Groups;
return true;
}
return false;
}
/// <summary> /// <summary>
/// Attempts to parse a keyword filter with the specified <paramref name="op"/> and textual <paramref name="value"/>. /// Attempts to parse a keyword filter with the specified <paramref name="op"/> and textual <paramref name="value"/>.
@ -314,28 +324,22 @@ namespace osu.Game.Screens.Select
private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val) private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
{ {
List<string> parts = new List<string>(); List<string> parts = new List<string>();
GroupCollection groups = null;
if (Regex.IsMatch(val, @"^\d+(:\d+){1,2}$")) // formats like 12:34 if (
tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$", ref groups) ||
tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$", ref groups) ||
tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$", ref groups)
)
{ {
List<string> splitted = val.Split(':').ToList(); if (groups["seconds"].Success)
while (splitted.Count < 3) parts.Add(groups["seconds"].Value + "s");
splitted.Insert(0, "0"); if (groups["minutes"].Success)
parts.Add(groups["minutes"].Value + "m");
parts.Add(splitted[2] + 's'); if (groups["hours"].Success)
parts.Add(splitted[1] + 'm'); parts.Add(groups["hours"].Value + "h");
parts.Add(splitted[0] + 'h');
} }
else if (Regex.IsMatch(val, @"^(\d+(\.\d+)?[hms]){1,3}$") && "hms".Contains(Regex.Replace(val, @"[\d\.]", ""))) // formats like 1h2m3s else
{
string[] splitted = Regex.Split(val, @"(?<=[hms])").Where(x => x.Length > 0).Reverse().ToArray();
parts.AddRange(splitted);
}
else if (Regex.IsMatch(val, @"^\d+(\.\d+)?$")) // only one number
{
parts.Add(val + 's');
}
if (parts.Count == 0)
return false; return false;
double totalLength = 0; double totalLength = 0;