Skip to content

Commit 40620c6

Browse files
committed
refactor(parser): improve browser rule variable naming
1 parent 5161624 commit 40620c6

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

.vscode/tasks.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
{
22
"version": "2.0.0",
33
"tasks": [
4-
{
5-
"label": "test",
6-
"type": "shell",
7-
"command": "dotnet test --nologo",
8-
"args": [],
9-
"problemMatcher": [
10-
"$msCompile"
11-
],
12-
"group": "build"
13-
},
144
{
155
"label": "test",
166
"type": "shell",
@@ -21,5 +11,3 @@
2111
],
2212
"group": "build"
2313
}
24-
]
25-
}

MyCSharp.HttpUserAgentParser.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{5738CE0D-5E6E-47
2727
Directory.Build.props = Directory.Build.props
2828
Directory.Packages.props = Directory.Packages.props
2929
global.json = global.json
30+
Justfile = Justfile
3031
LICENSE = LICENSE
3132
NuGet.config = NuGet.config
3233
README.md = README.md

src/HttpUserAgentParser/HttpUserAgentParser.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,30 @@ public static bool TryGetPlatform(string userAgent, [NotNullWhen(true)] out Http
7979
public static (string Name, string? Version)? GetBrowser(string userAgent)
8080
{
8181
ReadOnlySpan<char> ua = userAgent.AsSpan();
82-
foreach ((string Name, string DetectToken, string? VersionToken) rule in HttpUserAgentStatics.s_browserRules)
82+
foreach ((string Name, string DetectToken, string? VersionToken) browserRule in HttpUserAgentStatics.s_browserRules)
8383
{
84-
if (!TryIndexOf(ua, rule.DetectToken, out int detectIndex))
84+
if (!TryIndexOf(ua, browserRule.DetectToken, out int detectIndex))
8585
{
8686
continue;
8787
}
8888

8989
// Version token may differ (e.g., Safari uses "Version/")
9090
int versionSearchStart = detectIndex;
91-
if (!string.IsNullOrEmpty(rule.VersionToken))
91+
if (!string.IsNullOrEmpty(browserRule.VersionToken))
9292
{
93-
if (TryIndexOf(ua, rule.VersionToken!, out int vtIndex))
93+
if (TryIndexOf(ua, browserRule.VersionToken!, out int vtIndex))
9494
{
95-
versionSearchStart = vtIndex + rule.VersionToken!.Length;
95+
versionSearchStart = vtIndex + browserRule.VersionToken!.Length;
9696
}
9797
else
9898
{
9999
// If specific version token wasn't found, fall back to detect token area
100-
versionSearchStart = detectIndex + rule.DetectToken.Length;
100+
versionSearchStart = detectIndex + browserRule.DetectToken.Length;
101101
}
102102
}
103103
else
104104
{
105-
versionSearchStart = detectIndex + rule.DetectToken.Length;
105+
versionSearchStart = detectIndex + browserRule.DetectToken.Length;
106106
}
107107

108108
string? version = null;
@@ -111,7 +111,7 @@ public static (string Name, string? Version)? GetBrowser(string userAgent)
111111
version = userAgent.AsSpan(range.Start.Value, range.End.Value - range.Start.Value).ToString();
112112
}
113113

114-
return (rule.Name, version);
114+
return (browserRule.Name, version);
115115
}
116116

117117
return null;

0 commit comments

Comments
 (0)