From 5a511a38e11d6620906e1b3b0090d893f65fb82a Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sat, 11 Nov 2023 16:37:04 -0700 Subject: [PATCH] Format --- Metadata/Models/A_Metadata.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Metadata/Models/A_Metadata.cs b/Metadata/Models/A_Metadata.cs index 59068e2..453364d 100644 --- a/Metadata/Models/A_Metadata.cs +++ b/Metadata/Models/A_Metadata.cs @@ -21,19 +21,19 @@ public class A_Metadata _AAConfiguration = aAConfiguration; _PropertiesChangedForMetadata = propertiesChangedForMetadata; _ForceMetadataLastWriteTimeToCreationTime = forceMetadataLastWriteTimeToCreationTime; - string bResultsFullGroupDirectory = Shared.Models.Stateless.Methods.IResult.GetResultsFullGroupDirectory(_AAConfiguration, + string bResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(_AAConfiguration, nameof(A_Metadata), string.Empty, includeResizeGroup: false, includeModel: false, includePredictorModel: false); - _FileGroups = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(aAConfiguration, bResultsFullGroupDirectory, [aAConfiguration.ResultSingleton]); + _FileGroups = IPath.GetKeyValuePairs(aAConfiguration, bResultsFullGroupDirectory, [aAConfiguration.ResultSingleton]); } public ExifDirectory GetMetadataCollection(IMetadataConfiguration metadataConfiguration, FilePath filePath, DeterministicHashCode deterministicHashCode) { ExifDirectory? results; - (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_AAConfiguration.ResultAllInOneSubdirectoryLength, filePath.Name); + (_, int directoryIndex) = IPath.GetDirectoryNameAndIndex(_AAConfiguration.ResultAllInOneSubdirectoryLength, filePath.Name); FileInfo fileInfo = new(Path.Combine(_FileGroups[_AAConfiguration.ResultSingleton][directoryIndex], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json")); if (_ForceMetadataLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete"))) { @@ -72,11 +72,10 @@ public class A_Metadata { size = Dimensions.GetDimensions(filePath.FullName); } catch (Exception) { size = null; } - IReadOnlyList directories = ImageMetadataReader.ReadMetadata(filePath.FullName); results = Exif.Covert(filePath, deterministicHashCode, fileInfo, size, directories); string json = JsonSerializer.Serialize(results, ExifDirectorySourceGenerationContext.Default.ExifDirectory); - if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null) && _ForceMetadataLastWriteTimeToCreationTime) + if (IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null) && _ForceMetadataLastWriteTimeToCreationTime) { File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime); fileInfo.Refresh(); @@ -90,7 +89,7 @@ public class A_Metadata return file => { tick.Invoke(); - FilePath filePath = Shared.Models.Stateless.Methods.IId.GetFilePath(metadataConfiguration, file); + FilePath filePath = IId.GetFilePath(metadataConfiguration, file); if (filePath.ExtensionLowered is not ".paddedId" and not ".lsv") { if (filePath.Id is null || (!filePath.IsIdFormat && !filePath.IsPaddedIdFormat))