Merge pull request #390 from iamcarbon/cq4

Improve Code Quality / Tiding

MetadataExtractor/DirectoryExtensions.cs

@@ -929,7 +929,7 @@ public static bool TryGetRational(this Directory directory, int tagType, out Rat
         {
             var bytes = directory.GetByteArray(tagType);
             return bytes is null ? null
-                : encoding.GetString(bytes, 0, bytes.Length);
+                : encoding.GetString(bytes);
         }
 
         public static StringValue GetStringValue(this Directory directory, int tagType)

MetadataExtractor/Formats/Avi/AviRiffHandler.cs

@@ -39,13 +39,12 @@ public AviRiffHandler(List<Directory> directories)
             _ => false
         };
 
-        public bool ShouldAcceptList(string fourCc) => fourCc switch
+        public bool ShouldAcceptList(ReadOnlySpan<byte> fourCc)
         {
-            "hdrl" => true,
-            "strl" => true,
-            "AVI " => true,
-            _ => false
-        };
+            return fourCc.SequenceEqual("hdrl"u8)
+                || fourCc.SequenceEqual("strl"u8)
+                || fourCc.SequenceEqual("AVI "u8);
+        }
 
         public void ProcessChunk(string fourCc, byte[] payload)
         {

MetadataExtractor/Formats/Exif/ExifDescriptorBase.cs

@@ -173,7 +173,7 @@ public abstract class ExifDescriptorBase<T>(T directory)
             try
             {
                 // Decode the Unicode string and trim the Unicode zero "\0" from the end.
-                return Encoding.Unicode.GetString(bytes, 0, bytes.Length).TrimEnd('\0');
+                return Encoding.Unicode.GetString(bytes).TrimEnd('\0');
             }
             catch
             {

MetadataExtractor/Formats/Exif/ExifReader.cs

@@ -15,7 +15,7 @@ public sealed class ExifReader : JpegSegmentWithPreambleMetadataReader
     {
         public static ReadOnlySpan<byte> JpegSegmentPreamble => "Exif\x0\x0"u8;
 
-        public static bool StartsWithJpegExifPreamble(byte[] bytes) => bytes.AsSpan().StartsWith(JpegSegmentPreamble);
+        public static bool StartsWithJpegExifPreamble(ReadOnlySpan<byte> bytes) => bytes.StartsWith(JpegSegmentPreamble);
 
         public static int JpegSegmentPreambleLength => JpegSegmentPreamble.Length;
 

MetadataExtractor/Formats/Exif/makernotes/LeicaType5MakernoteDescriptor.cs

@@ -30,15 +30,14 @@ public class LeicaType5MakernoteDescriptor(LeicaType5MakernoteDirectory director
             if (Directory.GetObject(LeicaType5MakernoteDirectory.TagExposureMode) is not byte[] values || values.Length < 4)
                 return null;
 
-            var join = $"{values[0]} {values[1]} {values[2]} {values[3]}";
-            var ret = join switch
+            var ret = (values[0], values[1], values[2], values[3]) switch
             {
-                "0 0 0 0" => "Program AE",
-                "1 0 0 0" => "Aperture-priority AE",
-                "1 1 0 0" => "Aperture-priority AE (1)",
-                "2 0 0 0" => "Shutter speed priority AE",  // guess
-                "3 0 0 0" => "Manual",
-                _ => "Unknown (" + join + ")",
+                (0, 0, 0, 0) => "Program AE",
+                (1, 0, 0, 0) => "Aperture-priority AE",
+                (1, 1, 0, 0) => "Aperture-priority AE (1)",
+                (2, 0, 0, 0) => "Shutter speed priority AE",  // guess
+                (3, 0, 0, 0) => "Manual",
+                _ => $"Unknown ({values[0]} {values[1]} {values[2]} {values[3]})"
             };
             return ret;
         }

MetadataExtractor/Formats/Exif/makernotes/OlympusCameraSettingsMakernoteDescriptor.cs

@@ -651,15 +651,15 @@ public sealed class OlympusCameraSettingsMakernoteDescriptor(OlympusCameraSettin
             if (Directory.GetObject(OlympusCameraSettingsMakernoteDirectory.TagGradation) is not short[] values || values.Length < 3)
                 return null;
 
-            var join = $"{values[0]} {values[1]} {values[2]}";
-            var ret = join switch
+            var ret = (values[0], values[1], values[3]) switch
             {
-                "0 0 0" => "n/a",
-                "-1 -1 1" => "Low Key",
-                "0 -1 1" => "Normal",
-                "1 -1 1" => "High Key",
-                _ => "Unknown (" + join + ")",
+                (0, 0, 0) => "n/a",
+                (-1, -1, 1) => "Low Key",
+                (0, -1, 1) => "Normal",
+                (1, -1, 1) => "High Key",
+                _ => $"Unknown ({values[0]} {values[1]} {values[2]})"
             };
+
             if (values.Length > 3)
             {
                 if (values[3] == 0)

MetadataExtractor/Formats/Exif/makernotes/OlympusFocusInfoMakernoteDescriptor.cs

@@ -30,7 +30,7 @@ public sealed class OlympusFocusInfoMakernoteDescriptor(OlympusFocusInfoMakernot
                 OlympusFocusInfoMakernoteDirectory.TagMacroLed => GetMacroLedDescription(),
                 OlympusFocusInfoMakernoteDirectory.TagSensorTemperature => GetSensorTemperatureDescription(),
                 OlympusFocusInfoMakernoteDirectory.TagImageStabilization => GetImageStabilizationDescription(),
-                _ => base.GetDescription(tagType),
+                _ => base.GetDescription(tagType)
             };
         }
 
@@ -77,13 +77,11 @@ public sealed class OlympusFocusInfoMakernoteDescriptor(OlympusFocusInfoMakernot
             if (Directory.GetObject(OlympusFocusInfoMakernoteDirectory.TagExternalFlash) is not ushort[] values || values.Length < 2)
                 return null;
 
-            var join = $"{values[0]} {values[1]}";
-
-            return join switch
+            return (values[0], values[1]) switch
             {
-                "0 0" => "Off",
-                "1 0" => "On",
-                _ => "Unknown (" + join + ")",
+                (0, 0) => "Off",
+                (1, 0) => "On",
+                _ => $"Unknown ({values[0]} {values[1]})"
             };
         }
 
@@ -109,15 +107,13 @@ public sealed class OlympusFocusInfoMakernoteDescriptor(OlympusFocusInfoMakernot
             if (values.Length == 0)
                 return null;
 
-            var join = $"{values[0]}" + (values.Length > 1 ? $"{ values[1]}" : "");
-
-            return join switch
+            return (values[0], values.Length > 1 ? values[1] : -1) switch
             {
-                "0" => "Off",
-                "1" => "On",
-                "0 0" => "Off",
-                "1 0" => "On",
-                _ => "Unknown (" + join + ")",
+                (0, -1) => "Off",
+                (1, -1) => "On",
+                (0, 0) => "Off",
+                (1, 0) => "On",
+                _ => $"Unknown ({string.Join(" ", values)})"
             };
         }
 

MetadataExtractor/Formats/Exif/makernotes/OlympusImageProcessingMakernoteDescriptor.cs

@@ -130,24 +130,23 @@ public sealed class OlympusImageProcessingMakernoteDescriptor(OlympusImageProces
             if (Directory.GetObject(OlympusImageProcessingMakernoteDirectory.TagAspectRatio) is not byte[] values || values.Length < 2)
                 return null;
 
-            var join = $"{values[0]} {values[1]}";
-            var ret = join switch
+            var ret = (values[0], values[1]) switch
             {
-                "1 1" => "4:3",
-                "1 4" => "1:1",
-                "2 1" => "3:2 (RAW)",
-                "2 2" => "3:2",
-                "3 1" => "16:9 (RAW)",
-                "3 3" => "16:9",
-                "4 1" => "1:1 (RAW)",
-                "4 4" => "6:6",
-                "5 5" => "5:4",
-                "6 6" => "7:6",
-                "7 7" => "6:5",
-                "8 8" => "7:5",
-                "9 1" => "3:4 (RAW)",
-                "9 9" => "3:4",
-                _ => "Unknown (" + join + ")",
+                (1, 1) => "4:3",
+                (1, 4) => "1:1",
+                (2, 1) => "3:2 (RAW)",
+                (2, 2) => "3:2",
+                (3, 1) => "16:9 (RAW)",
+                (3, 3) => "16:9",
+                (4, 1) => "1:1 (RAW)",
+                (4, 4) => "6:6",
+                (5, 5) => "5:4",
+                (6, 6) => "7:6",
+                (7, 7) => "6:5",
+                (8, 8) => "7:5",
+                (9, 1) => "3:4 (RAW)",
+                (9, 9) => "3:4",
+                _ => $"Unknown ({values[0]} {values[1]})"
             };
             return ret;
         }
@@ -157,14 +156,12 @@ public sealed class OlympusImageProcessingMakernoteDescriptor(OlympusImageProces
             if (Directory.GetObject(OlympusImageProcessingMakernoteDirectory.TagKeystoneCompensation) is not byte[] values || values.Length < 2)
                 return null;
 
-            var join = $"{values[0]} {values[1]}";
-            var ret = join switch
+            return (values[0], values[1]) switch
             {
-                "0 0" => "Off",
-                "0 1" => "On",
-                _ => "Unknown (" + join + ")",
+                (0, 0) => "Off",
+                (0, 1) => "On",
+                _ => $"Unknown ({values[0]} {values[1]})"
             };
-            return ret;
         }
 
         public string? GetKeystoneDirectionDescription()

MetadataExtractor/Formats/Exif/makernotes/OlympusMakernoteDescriptor.cs

@@ -471,7 +471,7 @@ public sealed class OlympusMakernoteDescriptor(OlympusMakernoteDirectory directo
             if (Directory.GetObject(OlympusMakernoteDirectory.TagColourMatrix) is not short[] values)
                 return null;
 
-            return string.Join(" ", values.Select(b => b.ToString()).ToArray());
+            return string.Join(" ", values);
         }
 
         public string? GetWbModeDescription()
@@ -574,7 +574,7 @@ public sealed class OlympusMakernoteDescriptor(OlympusMakernoteDirectory directo
             if (bytes is null)
                 return null;
 
-            return Encoding.UTF8.GetString(bytes, 0, bytes.Length);
+            return Encoding.UTF8.GetString(bytes);
         }
 
         public string? GetOneTouchWbDescription()

MetadataExtractor/Formats/Exif/makernotes/OlympusRawInfoMakernoteDescriptor.cs

@@ -32,7 +32,7 @@ public sealed class OlympusRawInfoMakernoteDescriptor(OlympusRawInfoMakernoteDir
             if (Directory.GetObject(OlympusRawInfoMakernoteDirectory.TagColorMatrix2) is not short[] values)
                 return null;
 
-            return string.Join(" ", values.Select(b => b.ToString()).ToArray());
+            return string.Join(" ", values);
         }
 
         public string? GetYCbCrCoefficientsDescription()
@@ -46,7 +46,7 @@ public sealed class OlympusRawInfoMakernoteDescriptor(OlympusRawInfoMakernoteDir
                 ret[i] = new Rational(values[2 * i], values[2 * i + 1]);
             }
 
-            return string.Join(" ", ret.Select(r => r.ToDecimal().ToString()).ToArray());
+            return string.Join(" ", ret.Select(r => r.ToDecimal()));
         }
 
         public string? GetOlympusLightSourceDescription()

MetadataExtractor/Formats/Exif/makernotes/PanasonicMakernoteDescriptor.cs

@@ -255,7 +255,7 @@ public sealed class PanasonicMakernoteDescriptor(PanasonicMakernoteDirectory dir
             if (bytes is null)
                 return null;
 
-            return string.Join(".", bytes.Select(b => b.ToString()).ToArray());
+            return string.Join(".", bytes);
         }
 
         public string? GetIntelligentDRangeDescription()

MetadataExtractor/Formats/Gif/GifReader.cs

@@ -190,35 +190,14 @@ private static GifHeaderDirectory ReadGifHeader(SequentialReader reader)
             var blockSizeBytes = reader.GetByte();
             var blockStartPos = reader.Position;
 
-            Directory? directory;
-            switch (extensionLabel)
+            Directory? directory = extensionLabel switch
             {
-                case 0x01:
-                {
-                    directory = ReadPlainTextBlock(reader, blockSizeBytes);
-                    break;
-                }
-                case 0xf9:
-                {
-                    directory = ReadControlBlock(reader);
-                    break;
-                }
-                case 0xfe:
-                {
-                    directory = ReadCommentBlock(reader, blockSizeBytes);
-                    break;
-                }
-                case 0xff:
-                {
-                    directory = ReadApplicationExtensionBlock(reader, blockSizeBytes);
-                    break;
-                }
-                default:
-                {
-                    directory = new ErrorDirectory($"Unsupported GIF extension block with type 0x{extensionLabel:X2}.");
-                    break;
-                }
-            }
+                0x01 => ReadPlainTextBlock(reader, blockSizeBytes),
+                0xf9 => ReadControlBlock(reader),
+                0xfe => ReadCommentBlock(reader, blockSizeBytes),
+                0xff => ReadApplicationExtensionBlock(reader, blockSizeBytes),
+                _ => new ErrorDirectory($"Unsupported GIF extension block with type 0x{extensionLabel:X2}.")
+            };
 
             var skipCount = blockStartPos + blockSizeBytes - reader.Position;
             if (skipCount > 0)

MetadataExtractor/Formats/Heif/HeicImagePropertyDescriptor.cs

@@ -15,7 +15,7 @@ public class HeicImagePropertyDescriptor(HeicImagePropertiesDirectory directory)
                     return Directory.GetString(tagType) + " degrees";
                 case HeicImagePropertiesDirectory.TagPixelDepths:
                     var o = Directory.GetObject(HeicImagePropertiesDirectory.TagPixelDepths);
-                    return o is null ? null : string.Join(" ", ((byte[])o).Select(i => i.ToString()).ToArray());
+                    return o is byte[] bytes ? string.Join(" ", bytes) : null;
                 case HeicImagePropertiesDirectory.TagColorFormat:
                     return TypeStringConverter.ToTypeString(Directory.GetUInt32(HeicImagePropertiesDirectory.TagColorFormat));
                 case HeicImagePropertiesDirectory.TagColorPrimaries:

MetadataExtractor/Formats/Heif/HeifMetadataReader.cs

@@ -66,7 +66,7 @@ void ParseQuickTimeTest()
                     {
                         dir.Set(
                             QuickTimeFileTypeDirectory.TagCompatibleBrands,
-                            string.Join(", ", ftype.CompatibleBrandStrings.ToArray()));
+                            string.Join(", ", ftype.CompatibleBrandStrings));
                     }
 
                     directories.Add(dir);

MetadataExtractor/Formats/Icc/IccReader.cs

@@ -162,7 +162,7 @@ public static string GetStringFromUInt32(uint d)
                 unchecked((byte)d)
             };
 
-            return Encoding.UTF8.GetString(b, 0, b.Length);
+            return Encoding.UTF8.GetString(b);
         }
     }
 }

MetadataExtractor/Formats/Iptc/IptcReader.cs

@@ -150,7 +150,7 @@ private static void ProcessTag(SequentialReader reader, Directory directory, int
                     if (charset is null)
                     {
                         // Unable to determine the charset, so fall through and treat tag as a regular string
-                        charset = Encoding.UTF8.GetString(bytes, 0, bytes.Length);
+                        charset = Encoding.UTF8.GetString(bytes);
                     }
                     directory.Set(tagIdentifier, charset);
                     return;

MetadataExtractor/Formats/Iptc/Iso2022Converter.cs

@@ -1,5 +1,7 @@
 // Copyright (c) Drew Noakes and contributors. All Rights Reserved. Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+using System.Buffers;
+
 namespace MetadataExtractor.Formats.Iptc
 {
     public static class Iso2022Converter
@@ -89,17 +91,24 @@ public static class Iso2022Converter
 
             foreach (var encoding in encodings)
             {
+                char[] charBuffer = ArrayPool<char>.Shared.Rent(encoding.GetMaxCharCount(bytes.Length));
+
                 try
                 {
-                    var s = encoding.GetString(bytes, 0, bytes.Length);
-                    if (s.IndexOf((char)65533) != -1)
+                    int charCount = encoding.GetChars(bytes, 0, bytes.Length, charBuffer, 0);
+
+                    if (charBuffer.AsSpan(0, charCount).IndexOf((char)65533) != -1)
                         continue;
                     return encoding;
                 }
                 catch
                 {
                     // fall through...
                 }
+                finally
+                {
+                    ArrayPool<char>.Shared.Return(charBuffer);
+                }
             }
 
             // No encodings succeeded. Return null.

MetadataExtractor/Formats/Iso14496/TypeStringConverter.cs

@@ -26,7 +26,7 @@ public static uint ToTypeId(string typeString)
                 (((typeString[0] & 0xFF) << 24) |
                  ((typeString[1] & 0xFF) << 16) |
                  ((typeString[2] & 0xFF) << 8) |
-                 ( typeString[3] & 0xFF));
+                 (typeString[3] & 0xFF));
         }
     }
 }

MetadataExtractor/Formats/Photoshop/PhotoshopDescriptor.cs

@@ -283,7 +283,7 @@ public sealed class PhotoshopDescriptor(PhotoshopDirectory directory)
 
             return bytes is null
                 ? null
-                : Encoding.UTF8.GetString(bytes, 0, bytes.Length);
+                : Encoding.UTF8.GetString(bytes);
         }
 
         private string? GetBinaryDataString(int tagType)

MetadataExtractor/Formats/Png/PngChunkType.cs

@@ -146,7 +146,7 @@ private static void ValidateBytes(byte[] bytes)
 
         private static bool IsValidByte(byte b) => b is >= 65 and <= 90 or >= 97 and <= 122;
 
-        public string Identifier => Encoding.UTF8.GetString(_bytes, 0, _bytes.Length);
+        public string Identifier => Encoding.UTF8.GetString(_bytes);
 
         public override string ToString() => Identifier;
 

MetadataExtractor/Formats/Png/PngDescriptor.cs

@@ -73,9 +73,7 @@ public sealed class PngDescriptor(PngDirectory directory)
         {
             return Directory.GetObject(PngDirectory.TagTextualData) is not IList<KeyValuePair> pairs
                 ? null
-                : string.Join(
-                    "\n",
-                    pairs.Select(kv => $"{kv.Key}: {kv.Value}"));
+                : string.Join("\n", pairs.Select(kv => $"{kv.Key}: {kv.Value}"));
         }
 
         public string? GetBackgroundColorDescription()