From cd88e340a336f28cb434dda56dbba0c33c623b67 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sun, 19 May 2024 22:30:33 -0700 Subject: [PATCH] Format Try when running synchronously --- .editorconfig | 2 +- Metadata/Models/Stateless/GPS.cs | 4 ++-- Metadata/Models/Stateless/Get.cs | 2 +- Rename/Rename.cs | 16 +++++++++++----- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index a76e8b3..4bc0a31 100644 --- a/.editorconfig +++ b/.editorconfig @@ -119,7 +119,7 @@ dotnet_diagnostic.IDE0048.severity = error # Parentheses preferences (IDE0047 an dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049) dotnet_diagnostic.IDE0051.severity = error # Private member '' is unused [, ] dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter -dotnet_diagnostic.IDE0130.severity = error # Namespace does not match folder structure (IDE0130) +dotnet_diagnostic.IDE0130.severity = none # Namespace does not match folder structure (IDE0130) dotnet_diagnostic.IDE0230.severity = warning # IDE0230: Use UTF-8 string literal dotnet_diagnostic.IDE0290.severity = error # Use primary constructor [Distance]csharp(IDE0290) dotnet_diagnostic.IDE0300.severity = error # IDE0300: Collection initialization can be simplified diff --git a/Metadata/Models/Stateless/GPS.cs b/Metadata/Models/Stateless/GPS.cs index 946c5b7..8bec4f5 100644 --- a/Metadata/Models/Stateless/GPS.cs +++ b/Metadata/Models/Stateless/GPS.cs @@ -47,9 +47,9 @@ internal abstract class GPS Math.Asin(Math.Min(1, Math.Sqrt( Math.Pow(Math.Sin(DiffRadian(originLatitude, destinationLatitude) / 2.0), 2.0) + - Math.Cos(ToRadian(originLatitude)) * Math.Cos(ToRadian(destinationLatitude)) * + (Math.Cos(ToRadian(originLatitude)) * Math.Cos(ToRadian(destinationLatitude)) * Math.Pow(Math.Sin(DiffRadian(originLongitude, destinationLongitude) / 2.0), - 2.0)))), decimalPlaces); + 2.0))))), decimalPlaces); } private static double ParseValueFromDmsString(string value) diff --git a/Metadata/Models/Stateless/Get.cs b/Metadata/Models/Stateless/Get.cs index 2a88a63..9f2f301 100644 --- a/Metadata/Models/Stateless/Get.cs +++ b/Metadata/Models/Stateless/Get.cs @@ -46,7 +46,7 @@ internal static class Get string key = $"{Path.Combine(fileHolder.DirectoryName ?? throw new NotSupportedException(), fileHolder.NameWithoutExtension)}"; if (distinct.Contains(key)) throw new NotSupportedException("Turn off parallelism when sidecar files are present!"); - if (!renameConfiguration.SkipIdFiles || filePath.Id is null || !filePath.IsIntelligentIdFormat && filePath.SortOrder is not null) + if (!renameConfiguration.SkipIdFiles || filePath.Id is null || (!filePath.IsIntelligentIdFormat && filePath.SortOrder is not null)) { if (filePath.Id is not null) { diff --git a/Rename/Rename.cs b/Rename/Rename.cs index 3df4ed8..122e412 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -140,7 +140,7 @@ public partial class Rename : IRename, IDisposable } } - private static List GetRecordACollection(IRename rename, RenameConfiguration renameConfiguration, IEnumerable files, A_Metadata metadata) + private static List GetRecordACollection(ILogger? logger, IRename rename, RenameConfiguration renameConfiguration, IEnumerable files, A_Metadata metadata) { List results = []; int index = -1; @@ -192,7 +192,13 @@ public partial class Rename : IRename, IDisposable continue; sidecarFiles.Add(keyValuePair.Value[i]); } - (fileInfo, exifDirectory) = metadata.GetMetadataCollection(renameConfiguration.MetadataConfiguration, filePath, deterministicHashCode); + try + { (fileInfo, exifDirectory) = metadata.GetMetadataCollection(renameConfiguration.MetadataConfiguration, filePath, deterministicHashCode); } + catch (Exception) + { + logger?.LogWarning("<{filePath}>", filePath.FullName); + continue; + } results.Add(new(exifDirectory, fileInfo, filePath, new(sidecarFiles))); if (ffmpegFiles is not null) { @@ -223,7 +229,7 @@ public partial class Rename : IRename, IDisposable return new(results); } - private ReadOnlyCollection GetRecordBCollection(IRename rename, AppSettings appSettings, RenameConfiguration renameConfiguration, DirectoryInfo directoryInfo) + private ReadOnlyCollection GetRecordBCollection(ILogger? logger, IRename rename, AppSettings appSettings, RenameConfiguration renameConfiguration, DirectoryInfo directoryInfo) { ReadOnlyCollection results; List recordACollection = []; @@ -233,7 +239,7 @@ public partial class Rename : IRename, IDisposable int filesCount = appSettingsMaxDegreeOfParallelism == 1 ? files.Count() : 123000; _ProgressBar = new(filesCount, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }); if (appSettingsMaxDegreeOfParallelism == 1) - recordACollection.AddRange(GetRecordACollection(rename, renameConfiguration, files, metadata)); + recordACollection.AddRange(GetRecordACollection(logger, rename, renameConfiguration, files, metadata)); else { List distinct = []; @@ -455,7 +461,7 @@ public partial class Rename : IRename, IDisposable throw new Exception($"Invalid {nameof(renameConfiguration.RelativePropertyCollectionFile)}"); DirectoryInfo directoryInfo = new(Path.GetFullPath(renameConfiguration.MetadataConfiguration.ResultConfiguration.RootDirectory)); logger?.LogInformation("{Ticks} {RootDirectory}", ticks, directoryInfo.FullName); - ReadOnlyCollection recordBCollection = GetRecordBCollection(rename, appSettings, renameConfiguration, directoryInfo); + ReadOnlyCollection recordBCollection = GetRecordBCollection(logger, rename, appSettings, renameConfiguration, directoryInfo); SaveIdentifiersToDisk(ticks, renameConfiguration, aMetadataCollectionDirectory, recordBCollection); if (!renameConfiguration.OnlySaveIdentifiersToDisk) {