From 020e74f3f2296d7e71e604b17b833c9d6ea9a551 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sun, 29 Jun 2025 08:35:06 -0700 Subject: [PATCH] Removed Obsolete A_Property Methods Changed GetDimensions to handle a stream at the end and one exit --- Metadata/Models/Stateless/Dimensions.cs | 45 ++-- Property/Models/A_Property.cs | 227 ------------------ Shared/Models/FaceFileSystem.cs | 2 +- Shared/Models/Stateless/Methods/Dimensions.cs | 149 ++++++++++++ .../Models/Stateless/Methods/ImageHelper.cs | 132 ---------- 5 files changed, 181 insertions(+), 374 deletions(-) create mode 100644 Shared/Models/Stateless/Methods/Dimensions.cs delete mode 100644 Shared/Models/Stateless/Methods/ImageHelper.cs diff --git a/Metadata/Models/Stateless/Dimensions.cs b/Metadata/Models/Stateless/Dimensions.cs index fd53715..e156efb 100644 --- a/Metadata/Models/Stateless/Dimensions.cs +++ b/Metadata/Models/Stateless/Dimensions.cs @@ -8,18 +8,18 @@ internal static class Dimensions #pragma warning disable IDE0230 private static readonly Dictionary> _ImageFormatDecoders = new() { + { new byte[] { 0xff, 0xd8 }, DecodeJfif }, { new byte[] { 0x42, 0x4D }, DecodeBitmap }, + { new byte[] { 0x52, 0x49, 0x46, 0x46 }, DecodeWebP }, { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif }, { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif }, { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng }, - { new byte[] { 0xff, 0xd8 }, DecodeJfif }, - { new byte[] { 0x52, 0x49, 0x46, 0x46 }, DecodeWebP }, }; #pragma warning restore IDE0230 - private static bool StartsWith(byte[] thisBytes, byte[] thatBytes) + private static bool StartsWith(List thisBytes, byte[] thatBytes) { - for (int i = 0; i < thatBytes.Length; i += 1) + for (int i = 0; i < thisBytes.Count && i < thatBytes.Length; i += 1) { if (thisBytes[i] == thatBytes[i]) continue; @@ -103,24 +103,41 @@ internal static class Dimensions internal static Size? GetDimensions(BinaryReader binaryReader) { - int maxMagicBytesLength = _ImageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length; - byte[] magicBytes = new byte[maxMagicBytesLength]; - for (int i = 0; i < maxMagicBytesLength; i += 1) + Size? result; + List magicBytes = []; + int[] magicBytesLengths = (from l in _ImageFormatDecoders.Keys where l.Length <= binaryReader.BaseStream.Length orderby l.Length descending select l.Length).ToArray(); + if (magicBytesLengths.Length == 0) + result = null; + else { - magicBytes[i] = binaryReader.ReadByte(); - foreach (KeyValuePair> kvPair in _ImageFormatDecoders) + result = null; + if (binaryReader.BaseStream.Length == binaryReader.BaseStream.Position) + _ = binaryReader.BaseStream.Seek(0, SeekOrigin.Begin); + for (int i = 0; i < magicBytesLengths[0]; i++) { - if (StartsWith(magicBytes, kvPair.Key)) - return kvPair.Value(binaryReader); + magicBytes.Add(binaryReader.ReadByte()); + foreach (KeyValuePair> kvPair in _ImageFormatDecoders) + { + if (StartsWith(magicBytes, kvPair.Key)) + { + result = kvPair.Value(binaryReader); + break; + } + } + if (result is not null) + break; } } - return null; + return result; } internal static Size? GetDimensions(string path) { - using BinaryReader binaryReader = new(File.OpenRead(path)); - return GetDimensions(binaryReader); + Size? result; + using FileStream fileStream = File.OpenRead(path); + using BinaryReader binaryReader = new(fileStream); + result = GetDimensions(binaryReader); + return result; } } \ No newline at end of file diff --git a/Property/Models/A_Property.cs b/Property/Models/A_Property.cs index dd3826e..eb4094a 100644 --- a/Property/Models/A_Property.cs +++ b/Property/Models/A_Property.cs @@ -1,4 +1,3 @@ -using ShellProgressBar; using System.Collections.ObjectModel; using System.Text; using System.Text.Json; @@ -66,40 +65,6 @@ public class A_Property converted: false)); } - [Obsolete("Use ExifDirectory")] - public void SavePropertyParallelWork(long ticks, Shared.Models.Methods.IMetadata metadata, int t, Container.Models.Container[] containers) - { - int total = 0; - string message; - int totalSeconds; - bool anyNullOrNoIsUniqueFileName; - List exceptions = []; - Container.Models.Container container; - int containersLength = containers.Length; - const string outputResolution = "Original"; - List> sourceDirectoryChanges = []; - string propertyRoot = IResult.GetResultsGroupDirectory(_PropertyConfiguration, nameof(A_Property)); - for (int i = 0; i < containers.Length; i++) - { - container = containers[i]; - if (container.Items.Count == 0) - continue; - sourceDirectoryChanges.Clear(); - if (container.Items.Count == 0) - continue; - anyNullOrNoIsUniqueFileName = container.Items.Any(l => !l.IsUniqueFileName); - SetAngleBracketCollection(container.SourceDirectory, anyNullOrNoIsUniqueFileName); - totalSeconds = (int)Math.Truncate(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds); - message = $"{i + 1:000} [{container.Items.Count:000}] / {containersLength:000} - {total} / {t} total - {totalSeconds} total second(s) - {outputResolution} - {container.SourceDirectory}"; - SavePropertyParallelWork(_MaxDegreeOfParallelism, metadata, exceptions, sourceDirectoryChanges, container, container.Items, message); - if (exceptions.Count == container.Items.Count) - throw new Exception(string.Concat("All in [", container.SourceDirectory, "]failed!")); - if (exceptions.Count != 0) - _ExceptionsDirectories.Add(container.SourceDirectory); - total += container.Items.Count; - } - } - private void SetAngleBracketCollection(string sourceDirectory, bool anyNullOrNoIsUniqueFileName) { _AngleBracketCollection.Clear(); @@ -112,180 +77,6 @@ public class A_Property SetAngleBracketCollection(aResultsFullGroupDirectory, sourceDirectory, anyNullOrNoIsUniqueFileName); } - [Obsolete("Use ExifDirectory")] - private void SavePropertyParallelWork(int maxDegreeOfParallelism, Shared.Models.Methods.IMetadata metadata, List exceptions, List> sourceDirectoryChanges, Container.Models.Container container, ReadOnlyCollection items, string message) - { - List> sourceDirectoryFileTuples = []; - ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism }; - ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }; - using ProgressBar progressBar = new(items.Count, message, options); - _ = Parallel.For(0, items.Count, parallelOptions, (i, state) => - { - try - { - long ticks = DateTime.Now.Ticks; - DateTime dateTime = DateTime.Now; - List> collection; - SavePropertyParallelForWork(metadata, container.SourceDirectory, sourceDirectoryChanges, sourceDirectoryFileTuples, items[i]); - if (i == 0 || sourceDirectoryChanges.Count != 0) - progressBar.Tick(); - lock (sourceDirectoryFileTuples) - collection = (from l in sourceDirectoryFileTuples where l.Item2 > dateTime select l).ToList(); - lock (sourceDirectoryChanges) - sourceDirectoryChanges.AddRange(collection); - } - catch (Exception ex) - { - lock (exceptions) - exceptions.Add(ex); - } - }); - } - - [Obsolete("Use ExifDirectory")] - private void SavePropertyParallelForWork(Shared.Models.Methods.IMetadata metadata, string sourceDirectory, List> sourceDirectoryFileTuples, List> sourceDirectoryChanges, Item item) - { - Shared.Models.Property property; - List parseExceptions = []; - bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered); - string filteredSourceDirectoryFileExtensionLowered = Path.Combine(sourceDirectory, $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}"); - if (item.IsValidImageFormatExtension && item.FilePath.FullName.Length == filteredSourceDirectoryFileExtensionLowered.Length && item.FilePath.FullName != filteredSourceDirectoryFileExtensionLowered) - File.Move(item.FilePath.FullName, filteredSourceDirectoryFileExtensionLowered); - if (item.FileSizeChanged is null || item.FileSizeChanged.Value || item.LastWriteTimeChanged is null || item.LastWriteTimeChanged.Value || item.ExifDirectory is null) - { - property = GetImageProperty(metadata, item, sourceDirectoryFileTuples, parseExceptions, isIgnoreExtension); - lock (sourceDirectoryChanges) - sourceDirectoryChanges.Add(new Tuple(nameof(A_Property), DateTime.Now)); - lock (item) - item.Update(null); - } - } - - [Obsolete("Use ExifDirectory")] - private Shared.Models.Property GetImageProperty(Shared.Models.Methods.IMetadata metadata, Item item, List> sourceDirectoryFileTuples, List parseExceptions, bool isIgnoreExtension) - { - Shared.Models.Property? result; - int? id = null; - FileInfo fileInfo; - string? json = null; - bool hasWrongYearProperty = false; - string[] changesFrom = []; - string angleBracket = _AngleBracketCollection[0]; - bool populateId = _Configuration.PopulatePropertyId; - if (!item.IsUniqueFileName) - fileInfo = new(Path.Combine(angleBracket.Replace("<>", _PropertyConfiguration.ResultSingleton), $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json")); - else - { - string fileName = $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json"; - CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, item.FilePath); - string directory = _ResultSingletonFileGroups[0][cei.Enum][cei.Index]; - fileInfo = new(Path.Combine(directory, fileName)); - MoveIf(fileName, cei, directory, fileInfo); - } - List dateTimes = (from l in sourceDirectoryFileTuples where l is not null && changesFrom.Contains(l.Item1) select l.Item2).ToList(); - if (_Configuration.ForcePropertyLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete"))) - { - File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName); - fileInfo.Refresh(); - } - if (_Configuration.ForcePropertyLastWriteTimeToCreationTime && fileInfo.Exists && fileInfo.LastWriteTime != fileInfo.CreationTime) - { - File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime); - fileInfo.Refresh(); - } - if (_Configuration.PropertiesChangedForProperty) - result = null; - else if (!fileInfo.Exists) - result = null; - else if (!fileInfo.FullName.EndsWith(".json") && !fileInfo.FullName.EndsWith(".old")) - throw new ArgumentException("must be a *.json file"); - else if (dateTimes.Count != 0 && dateTimes.Max() > fileInfo.LastWriteTime) - result = null; - else - { - json = File.ReadAllText(fileInfo.FullName); - try - { - if (item.ExifDirectory is not null) - result = null; - else - result = JsonSerializer.Deserialize(json, PropertyGenerationContext.Default.Property); - if (result is not null && json.Contains("WrongYear")) - { - id = result.Id; - hasWrongYearProperty = true; - result = null; - } - if (!isIgnoreExtension && item.IsValidImageFormatExtension && ((populateId && result?.Id is null) || result?.Width is null || result.Height is null)) - { - id = result?.Id; - result = null; - } - if (!isIgnoreExtension && item.IsValidImageFormatExtension && populateId && result is not null && result.LastWriteTime.Ticks != item.FilePath.LastWriteTicks) - { - id = null; - result = null; - } - if (!isIgnoreExtension && item.IsValidImageFormatExtension && result?.Width is not null && result.Height is not null && result.Width.Value == result.Height.Value) - { - id = result.Id; - result = null; - if (result?.Width is not null && result.Height is not null && result.Width.Value != result.Height.Value) - throw new Exception("Was square!"); - } - if (!isIgnoreExtension && item.IsValidImageFormatExtension && result is not null && result.FileSize != item.FilePath.Length) - { - id = result.Id; - result = null; - } - if (result is not null) - { - sourceDirectoryFileTuples.Add(new Tuple(nameof(A_Property), fileInfo.LastWriteTime)); - if (fileInfo.CreationTime != result.LastWriteTime) - { - File.SetCreationTime(fileInfo.FullName, result.LastWriteTime); - File.SetLastWriteTime(fileInfo.FullName, fileInfo.LastWriteTime); - } - } - } - catch (Exception) - { - result = null; - parseExceptions.Add(nameof(A_Property)); - } - } - if (result is null) - { - id ??= item.FilePath.Id; - (_, _, result) = Stateless.Property.GetProperty(populateId, metadata, item.FilePath, result, isIgnoreExtension, item.IsValidImageFormatExtension, id, _ASCIIEncoding); - json = JsonSerializer.Serialize(result, PropertyGenerationContext.Default.Property); - if (populateId && Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches: true, compareBeforeWrite: true)) - { - File.SetCreationTime(fileInfo.FullName, result.LastWriteTime); - if (!_Configuration.ForcePropertyLastWriteTimeToCreationTime) - sourceDirectoryFileTuples.Add(new Tuple(nameof(A_Property), DateTime.Now)); - else - { - File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime); - fileInfo.Refresh(); - sourceDirectoryFileTuples.Add(new Tuple(nameof(A_Property), fileInfo.CreationTime)); - } - } - } - else if (hasWrongYearProperty) - { - json = JsonSerializer.Serialize(result, PropertyGenerationContext.Default.Property); - if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches: true, compareBeforeWrite: true)) - { - File.SetCreationTime(fileInfo.FullName, result.LastWriteTime); - File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime); - fileInfo.Refresh(); - sourceDirectoryFileTuples.Add(new Tuple(nameof(A_Property), fileInfo.CreationTime)); - } - } - return result; - } - private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, FileInfo fileInfo) { string[] segments = directory.Split(cei.Combined); @@ -305,22 +96,4 @@ public class A_Property } } - [Obsolete("Use ExifDirectory")] - public Shared.Models.Property GetProperty(Shared.Models.Methods.IMetadata metadata, Item item, List> sourceDirectoryFileTuples, List parseExceptions) - { - Shared.Models.Property result; - bool angleBracketCollectionAny = _AngleBracketCollection.Count != 0; - if (!angleBracketCollectionAny) - { - if (item.FilePath.DirectoryFullPath is null) - throw new NullReferenceException(nameof(item.FilePath.DirectoryFullPath)); - SetAngleBracketCollection(item.FilePath.DirectoryFullPath, !item.IsUniqueFileName); - } - bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered); - result = GetImageProperty(metadata, item, sourceDirectoryFileTuples, parseExceptions, isIgnoreExtension); - if (!angleBracketCollectionAny) - _AngleBracketCollection.Clear(); - return result; - } - } \ No newline at end of file diff --git a/Shared/Models/FaceFileSystem.cs b/Shared/Models/FaceFileSystem.cs index 0f529bc..776ab2e 100644 --- a/Shared/Models/FaceFileSystem.cs +++ b/Shared/Models/FaceFileSystem.cs @@ -76,7 +76,7 @@ public class FaceFileSystem : FileSystem, Properties.IFaceFileSystem } else { - System.Drawing.Size size = Stateless.Methods.ImageHelper.GetDimensions(fileInfo.FullName, faceRight, faceBottom); + System.Drawing.Size size = Stateless.Methods.Dimensions.GetDimensions(fileInfo.FullName, faceRight, faceBottom); imageWidth = size.Width; imageHeight = size.Height; } diff --git a/Shared/Models/Stateless/Methods/Dimensions.cs b/Shared/Models/Stateless/Methods/Dimensions.cs new file mode 100644 index 0000000..05d3535 --- /dev/null +++ b/Shared/Models/Stateless/Methods/Dimensions.cs @@ -0,0 +1,149 @@ +using System.Drawing; + +namespace View_by_Distance.Shared.Models.Stateless.Methods; + +internal static class Dimensions +{ + +#pragma warning disable IDE0230 + private static readonly Dictionary> _ImageFormatDecoders = new() + { + { new byte[] { 0xff, 0xd8 }, DecodeJfif }, + { new byte[] { 0x42, 0x4D }, DecodeBitmap }, + { new byte[] { 0x52, 0x49, 0x46, 0x46 }, DecodeWebP }, + { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif }, + { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif }, + { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng }, + }; +#pragma warning restore IDE0230 + + private static bool StartsWith(List thisBytes, byte[] thatBytes) + { + for (int i = 0; i < thisBytes.Count && i < thatBytes.Length; i += 1) + { + if (thisBytes[i] == thatBytes[i]) + continue; + return false; + } + return true; + } + + private static short ReadLittleEndianInt16(BinaryReader binaryReader) + { + byte[] bytes = new byte[sizeof(short)]; + for (int i = 0; i < sizeof(short); i += 1) + bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte(); + return BitConverter.ToInt16(bytes, 0); + } + + private static int ReadLittleEndianInt32(BinaryReader binaryReader) + { + byte[] bytes = new byte[sizeof(int)]; + for (int i = 0; i < sizeof(int); i += 1) + bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte(); + return BitConverter.ToInt32(bytes, 0); + } + + private static Size? DecodeBitmap(BinaryReader binaryReader) + { + _ = binaryReader.ReadBytes(16); + int width = binaryReader.ReadInt32(); + int height = binaryReader.ReadInt32(); + return new Size(width, height); + } + + private static Size? DecodeGif(BinaryReader binaryReader) + { + int width = binaryReader.ReadInt16(); + int height = binaryReader.ReadInt16(); + return new Size(width, height); + } + + private static Size? DecodePng(BinaryReader binaryReader) + { + _ = binaryReader.ReadBytes(8); + int width = ReadLittleEndianInt32(binaryReader); + int height = ReadLittleEndianInt32(binaryReader); + return new Size(width, height); + } + + private static Size? DecodeJfif(BinaryReader binaryReader) + { + while (binaryReader.ReadByte() == 0xff) + { + byte marker = binaryReader.ReadByte(); + short chunkLength = ReadLittleEndianInt16(binaryReader); + if (marker == 0xc0) + { + _ = binaryReader.ReadByte(); + int height = ReadLittleEndianInt16(binaryReader); + int width = ReadLittleEndianInt16(binaryReader); + return new Size(width, height); + } + if (chunkLength >= 0) + _ = binaryReader.ReadBytes(chunkLength - 2); + else + { + ushort uChunkLength = (ushort)chunkLength; + _ = binaryReader.ReadBytes(uChunkLength - 2); + } + } + return null; + } + + private static Size? DecodeWebP(BinaryReader binaryReader) + { + _ = binaryReader.ReadUInt32(); // Size + _ = binaryReader.ReadBytes(15); // WEBP, VP8 + more + _ = binaryReader.ReadBytes(3); // SYNC + int width = binaryReader.ReadUInt16() & 0b00_11111111111111; // 14 bits width + int height = binaryReader.ReadUInt16() & 0b00_11111111111111; // 14 bits height + return new Size(width, height); + } + + internal static Size GetDimensions(BinaryReader binaryReader, int? faceRight, int? faceBottom) + { + Size? result; + List magicBytes = []; + int[] magicBytesLengths = (from l in _ImageFormatDecoders.Keys where l.Length <= binaryReader.BaseStream.Length orderby l.Length descending select l.Length).ToArray(); + if (magicBytesLengths.Length == 0) + result = null; + else + { + result = null; + if (binaryReader.BaseStream.Length == binaryReader.BaseStream.Position) + _ = binaryReader.BaseStream.Seek(0, SeekOrigin.Begin); + for (int i = 0; i < magicBytesLengths[0]; i++) + { + magicBytes.Add(binaryReader.ReadByte()); + foreach (KeyValuePair> kvPair in _ImageFormatDecoders) + { + if (StartsWith(magicBytes, kvPair.Key)) + { + result = kvPair.Value(binaryReader); + break; + } + } + if (result is not null) + break; + } + } + if (result is null) + { + if (faceRight is null || faceBottom is null) + throw new Exception("face is null!"); + result = new(faceRight.Value, faceBottom.Value); + } + return result.Value; + } + + internal static Size GetDimensions(string path, int? faceRight, int? faceBottom) + { + Size result; + using FileStream fileStream = File.OpenRead(path); + using BinaryReader binaryReader = new(fileStream); + result = GetDimensions(binaryReader, faceRight, faceBottom); + return result; + } + +} \ No newline at end of file diff --git a/Shared/Models/Stateless/Methods/ImageHelper.cs b/Shared/Models/Stateless/Methods/ImageHelper.cs deleted file mode 100644 index e4493f2..0000000 --- a/Shared/Models/Stateless/Methods/ImageHelper.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System.Drawing; - -namespace View_by_Distance.Shared.Models.Stateless.Methods; - -internal abstract class ImageHelper -{ - - private static bool StartsWith(byte[] thisBytes, byte[] thatBytes) - { - for (int i = 0; i < thatBytes.Length; i += 1) - { - if (thisBytes[i] != thatBytes[i]) - return false; - } - return true; - } - - private static short ReadLittleEndianInt16(BinaryReader binaryReader) - { - byte[] bytes = new byte[sizeof(short)]; - for (int i = 0; i < sizeof(short); i += 1) - bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte(); - return BitConverter.ToInt16(bytes, 0); - } - - private static int ReadLittleEndianInt32(BinaryReader binaryReader) - { - byte[] bytes = new byte[sizeof(int)]; - for (int i = 0; i < sizeof(int); i += 1) - bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte(); - return BitConverter.ToInt32(bytes, 0); - } - - private static Size DecodeBitmap(BinaryReader binaryReader) - { - _ = binaryReader.ReadBytes(16); - int width = binaryReader.ReadInt32(); - int height = binaryReader.ReadInt32(); - return new Size(width, height); - } - - private static Size DecodeGif(BinaryReader binaryReader) - { - int width = binaryReader.ReadInt16(); - int height = binaryReader.ReadInt16(); - return new Size(width, height); - } - - private static Size DecodePng(BinaryReader binaryReader) - { - _ = binaryReader.ReadBytes(8); - int width = ReadLittleEndianInt32(binaryReader); - int height = ReadLittleEndianInt32(binaryReader); - return new Size(width, height); - } - - private static Size DecodeJfif(BinaryReader binaryReader) - { - while (binaryReader.ReadByte() == 0xff) - { - byte marker = binaryReader.ReadByte(); - short chunkLength = ReadLittleEndianInt16(binaryReader); - if (marker == 0xc0) - { - _ = binaryReader.ReadByte(); - int height = ReadLittleEndianInt16(binaryReader); - int width = ReadLittleEndianInt16(binaryReader); - return new Size(width, height); - } - _ = binaryReader.ReadBytes(chunkLength - 2); - } - throw new ArgumentException("Could not recognize image format."); - } - - /// - /// Gets the dimensions of an image. - /// - /// The path of the image to get the dimensions of. - /// The dimensions of the specified image. - /// The image was of an unrecognized format. - internal static Size GetDimensions(BinaryReader binaryReader, int? faceRight, int? faceBottom) - { - Size? result = null; -#pragma warning disable IDE0230 - Dictionary> _ImageFormatDecoders = new() - { - { new byte[] { 0x42, 0x4D }, DecodeBitmap }, - { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif }, - { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif }, - { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng }, - { new byte[] { 0xff, 0xd8 }, DecodeJfif }, - }; -#pragma warning restore IDE0230 - int maxMagicBytesLength = _ImageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length; - byte[] magicBytes = new byte[maxMagicBytesLength]; - for (int i = 0; i < maxMagicBytesLength; i += 1) - { - magicBytes[i] = binaryReader.ReadByte(); - foreach (KeyValuePair> kvPair in _ImageFormatDecoders) - { - if (!StartsWith(magicBytes, kvPair.Key)) - continue; - result = kvPair.Value(binaryReader); - break; - } - if (result is not null) - break; - } - if (result is null) - { - if (faceRight is null || faceBottom is null) - throw new Exception("face is null!"); - result = new(faceRight.Value, faceBottom.Value); - } - return result.Value; - } - - /// - /// Gets the dimensions of an image. - /// - /// The path of the image to get the dimensions of. - /// The dimensions of the specified image. - /// The image was of an unrecognized format. - internal static Size GetDimensions(string path, int? faceRight, int? faceBottom) - { - Size result; - using BinaryReader binaryReader = new(File.OpenRead(path)); - result = GetDimensions(binaryReader, faceRight, faceBottom); - return result; - } - -} \ No newline at end of file