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

Apply NRT and fix code style

Browse Source
This commit is contained in:
Dean Herbert 2022-09-09 23:29:04 +09:00
parent d961b96897
commit 602ffebd54
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
@ -126,16 +124,21 @@ namespace osu.Game.Screens.Select
{ {
if (Enum.TryParse(value, true, out result)) return true; if (Enum.TryParse(value, true, out result)) return true;
value = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture)); string? prefixMatch = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
if (prefixMatch == null)
return false;
return Enum.TryParse(value, true, out result); return Enum.TryParse(value, true, out result);
} }
private static GroupCollection tryMatchRegex(string value, string regex)
private static GroupCollection? tryMatchRegex(string value, string regex)
{ {
Match matchs = Regex.Match(value, regex); Match matches = Regex.Match(value, regex);
if (matchs.Success)
{ if (matches.Success)
return matchs.Groups; return matches.Groups;
}
return null; return null;
} }
@ -324,7 +327,8 @@ namespace osu.Game.Screens.Select
{ {
List<string> parts = new List<string>(); List<string> parts = new List<string>();
GroupCollection match = null; GroupCollection? match = null;
match ??= tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$"); match ??= tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$");
match ??= tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$"); match ??= tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$");
match ??= tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$"); match ??= tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$");
@ -358,6 +362,7 @@ namespace osu.Game.Screens.Select
totalLength += length * scale; totalLength += length * scale;
minScale = Math.Min(minScale, scale); minScale = Math.Min(minScale, scale);
} }
return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0); return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
} }
} }