move key value parser to own project

nager · Dec 9, 2024 · b57766b · b57766b
1 parent c0a2c04
commit b57766b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 304 deletions.
diff --git a/src/Nager.EmailAuthentication.UnitTest/KeyValueParserTest.cs b/src/Nager.EmailAuthentication.UnitTest/KeyValueParserTest.cs
diff --git a/src/Nager.EmailAuthentication/DmarcRecordParser.cs b/src/Nager.EmailAuthentication/DmarcRecordParser.cs
@@ -40,53 +40,61 @@ public static bool TryParse(
                 return false;
             }
 
+            var keyValueParser = new KeyValueParser.MemoryEfficientKeyValueParser(';', '=');
+            if (!keyValueParser.TryParse(dmarcRaw, out var parseResult))
+            {
+                dmarcDataFragment = null;
+                return false;
+            }
+
+            if (parseResult == null)
+            {
+                dmarcDataFragment = null;
+                return false;
+            }
+
             var dataFragment = new DmarcDataFragment();
-            var internalUnrecognizedParts = new List<string>();
+
+            var unrecognizedHandlers = new List<string>();
 
             var handlers = new Dictionary<string, Action<string>>
             {
-                { "v=", value => dataFragment.Version = value },
-                { "p=", value => dataFragment.DomainPolicy = value },
-                { "sp=", value => dataFragment.SubdomainPolicy = value },
-                { "rua=", value => dataFragment.AggregateReportUri = value },
-                { "ruf=", value => dataFragment.ForensicReportUri = value },
-                { "rf=", value => dataFragment.ReportFormat = value },
-                { "fo=", value => dataFragment.FailureOptions = value },
-                { "pct=", value => dataFragment.PolicyPercentage = value },
-                { "ri=", value => dataFragment.ReportingInterval = value },
-                { "adkim=", value => dataFragment.DkimAlignmentMode = value },
-                { "aspf=", value => dataFragment.SpfAlignmentMode = value }
+                { "v", value => dataFragment.Version = value },
+                { "p", value => dataFragment.DomainPolicy = value },
+                { "sp", value => dataFragment.SubdomainPolicy = value },
+                { "rua", value => dataFragment.AggregateReportUri = value },
+                { "ruf", value => dataFragment.ForensicReportUri = value },
+                { "rf", value => dataFragment.ReportFormat = value },
+                { "fo", value => dataFragment.FailureOptions = value },
+                { "pct", value => dataFragment.PolicyPercentage = value },
+                { "ri", value => dataFragment.ReportingInterval = value },
+                { "adkim", value => dataFragment.DkimAlignmentMode = value },
+                { "aspf", value => dataFragment.SpfAlignmentMode = value }
             };
 
-            var parts = dmarcRaw.Split(";", StringSplitOptions.RemoveEmptyEntries);
-            foreach (var part in parts)
+            foreach (var keyValue in parseResult.KeyValues)
             {
-                var cleanPart = part.AsSpan().TrimStart(' ');
-                var keyValueSeparatorIndex = cleanPart.IndexOf('=');
-
-                if (keyValueSeparatorIndex <= 0)
+                if (string.IsNullOrEmpty(keyValue.Key))
                 {
-                    internalUnrecognizedParts.Add(cleanPart.ToString());
                     continue;
                 }
 
-                var key = cleanPart[..(keyValueSeparatorIndex + 1)];
-                var value = cleanPart[(keyValueSeparatorIndex + 1)..];
-
-                if (handlers.TryGetValue(key.ToString().ToLowerInvariant(), out var handler))
+                if (handlers.TryGetValue(keyValue.Key.ToLowerInvariant(), out var handler))
                 {
-                    handler(value.ToString());
+                    handler(keyValue.Value ?? "");
                     continue;
                 }
 
-                internalUnrecognizedParts.Add(cleanPart.ToString());
+                unrecognizedHandlers.Add($"{keyValue.Key} {keyValue.Value}");
             }
 
-            if (internalUnrecognizedParts.Count > 0)
+            if (parseResult.UnrecognizedParts != null && parseResult.UnrecognizedParts.Length > 0)
             {
-                unrecognizedParts = [.. internalUnrecognizedParts];
+                unrecognizedHandlers.AddRange(parseResult.UnrecognizedParts);
             }
 
+            unrecognizedParts = unrecognizedHandlers.Count == 0 ? null : [.. unrecognizedHandlers];
+
             dmarcDataFragment = dataFragment;
 
             return true;

diff --git a/src/Nager.EmailAuthentication/KeyValueParser/IKeyValueParser.cs b/src/Nager.EmailAuthentication/KeyValueParser/IKeyValueParser.cs
diff --git a/src/Nager.EmailAuthentication/KeyValueParser/IndexedKeyValueItem.cs b/src/Nager.EmailAuthentication/KeyValueParser/IndexedKeyValueItem.cs
diff --git a/src/Nager.EmailAuthentication/KeyValueParser/MemoryEfficientKeyValueParser.cs b/src/Nager.EmailAuthentication/KeyValueParser/MemoryEfficientKeyValueParser.cs
diff --git a/src/Nager.EmailAuthentication/KeyValueParser/ParseResult.cs b/src/Nager.EmailAuthentication/KeyValueParser/ParseResult.cs
diff --git a/src/Nager.EmailAuthentication/KeyValueParser/StringSplitKeyValueParser.cs b/src/Nager.EmailAuthentication/KeyValueParser/StringSplitKeyValueParser.cs
diff --git a/src/Nager.EmailAuthentication/Nager.EmailAuthentication.csproj b/src/Nager.EmailAuthentication/Nager.EmailAuthentication.csproj
@@ -6,7 +6,6 @@
     <Description>Email Authentication, DMARC</Description>
 
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
     <ImplicitUsings>enable</ImplicitUsings>
 
@@ -24,4 +23,8 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Nager.KeyValueParser" Version="1.0.0" />
+  </ItemGroup>
+
 </Project>