Merge pull request #3 from managedcode/codex/fix-all-comments

Restore ArrayPool import

Author: KSemenenko

ManagedCode.MimeTypes.Sync/Program.cs

@@ -16,8 +16,6 @@ internal static class MimeTypeSyncTool
         "https://raw.githubusercontent.com/apache/httpd/trunk/docs/conf/mime.types"
     };
 
-    private static readonly char[] MimeTypeSeparators = new[] { ' ', '\t' };
-
     public static async Task<int> RunAsync(string[] args)
     {
         try
@@ -147,7 +145,7 @@ private static Dictionary<string, string> ParseMimeTypesListing(string source, b
                 continue;
             }
 
-            var parts = line.Split(MimeTypeSeparators, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+            var parts = line.Split(' ', '\t', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
             if (parts.Length < 2)
             {
                 continue;

ManagedCode.MimeTypes.Tests/GeneratorTests.cs

@@ -61,21 +61,18 @@ public void GetExtensionsShouldReturnKnownExtensions()
     [Fact]
     public void RuntimeRegistrationShouldUpdateLookups()
     {
-        const string extension = "customext";
-        const string mime = "application/x-custom";
-
         try
         {
-            MimeHelper.RegisterMimeType(extension, mime);
-            MimeHelper.GetMimeType($"file.{extension}").ShouldBe(mime);
+            MimeHelper.RegisterMimeType("customext", "application/x-custom");
+            MimeHelper.GetMimeType("file.customext").ShouldBe("application/x-custom");
 
-            MimeHelper.TryGetExtensions(mime, out var extensions).ShouldBeTrue();
-            extensions.ShouldContain($".{extension}");
+            MimeHelper.TryGetExtensions("application/x-custom", out var extensions).ShouldBeTrue();
+            extensions.ShouldContain(".customext");
         }
         finally
         {
-            MimeHelper.UnregisterMimeType(extension).ShouldBeTrue();
-            MimeHelper.GetMimeType(extension).ShouldBe("application/octet-stream");
+            MimeHelper.UnregisterMimeType("customext").ShouldBeTrue();
+            MimeHelper.GetMimeType("customext").ShouldBe("application/octet-stream");
         }
     }
-}
+}

ManagedCode.MimeTypes/MimeHelper.cs

@@ -31,7 +31,7 @@ public static partial class MimeHelper
 
     private static readonly Regex ScriptPattern = new(@"^(?:application|text)/(?:javascript|ecmascript|x-php|x-sh|x-shellscript|x-python|x-ruby|x-perl)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-    private static readonly SearchValues<char> QueryFragmentSeparators = SearchValues.Create("?#");
+    private static readonly SearchValues<char> QueryFragmentSeparators = SearchValues.Create(new[] { '?', '#' });
 
     private static readonly HashSet<string> ScriptMimeSet = new(StringComparer.OrdinalIgnoreCase)
     {
@@ -605,40 +605,34 @@ private static int ReadUpTo(Stream stream, byte[] buffer, int count)
     {
         if (header.Length >= 12 && header[..4].SequenceEqual(RiffSignature))
         {
-            if (header.Length >= 12)
+            var format = header.Slice(8, 4);
+            if (format.SequenceEqual(WebpFourCC))
             {
-                var format = header.Slice(8, 4);
-                if (format.SequenceEqual(WebpFourCC))
-                {
-                    return "image/webp";
-                }
+                return "image/webp";
+            }
 
-                if (format.SequenceEqual(AviFourCC))
-                {
-                    return "video/x-msvideo";
-                }
+            if (format.SequenceEqual(AviFourCC))
+            {
+                return "video/x-msvideo";
+            }
 
-                if (format.SequenceEqual(WaveFourCC))
-                {
-                    return "audio/wav";
-                }
+            if (format.SequenceEqual(WaveFourCC))
+            {
+                return "audio/wav";
             }
         }
 
-        if (header.Length >= 12 && header.Slice(4, Math.Min(4, header.Length - 4)).SequenceEqual(FtypFourCC))
+        if (header.Length >= 12 && header.Slice(4, 4).SequenceEqual(FtypFourCC))
         {
-            if (header.Length >= 12)
+            var brand = header.Slice(8, 4);
+            if (IsMp4Brand(brand))
             {
-                var brand = header.Slice(8, Math.Min(4, header.Length - 8));
-                if (IsMp4Brand(brand))
-                {
-                    return "video/mp4";
-                }
+                return "video/mp4";
+            }
 
-                if (brand.SequenceEqual(QuickTimeBrand))
-                {
-                    return "video/quicktime";
-                }
+            if (brand.SequenceEqual(QuickTimeBrand))
+            {
+                return "video/quicktime";
             }
         }