From 6909146d90dc42521f1c87f30eb3f48bb137ac98 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 25 Dec 2023 17:19:24 -0700 Subject: [PATCH] Bug --- .../Stateless/Methods/PersonContainer.cs | 4 +--- Tests/UnitTestHardCoded.cs | 22 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Shared/Models/Stateless/Methods/PersonContainer.cs b/Shared/Models/Stateless/Methods/PersonContainer.cs index 38751ec..39827d8 100644 --- a/Shared/Models/Stateless/Methods/PersonContainer.cs +++ b/Shared/Models/Stateless/Methods/PersonContainer.cs @@ -84,10 +84,8 @@ internal abstract class PersonContainer continue; fileHolder = IFileHolder.Get(file); filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null); - if (filePath.Id is null ) - continue; wholePercentages = IMapping.GetWholePercentages(facesFileNameExtension, filePath); - if (wholePercentages is null) + if (filePath.Id is not null && wholePercentages is not null) continue; checkDirectory = Path.GetDirectoryName(file); if (string.IsNullOrEmpty(checkDirectory)) diff --git a/Tests/UnitTestHardCoded.cs b/Tests/UnitTestHardCoded.cs index b4732c7..cdc4c6b 100644 --- a/Tests/UnitTestHardCoded.cs +++ b/Tests/UnitTestHardCoded.cs @@ -86,7 +86,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodGetApproximateYears() { - string personDisplayDirectory = "D:/1-Images-A/Images-4083e56a-Results/A2)People/4083e56a/{}/^/Sydney Dupray^9"; + string personDisplayDirectory = "D:/1-Images-A/Images-7007a9df-Results/A2)People/7007a9df/{}/^/Sydney Dupray^9"; if (Directory.Exists(Directory.GetDirectoryRoot(personDisplayDirectory)) && Directory.Exists(personDisplayDirectory)) { char numberSign = '#'; @@ -189,7 +189,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameAbandoned() { - string directory = "D:/1-Images-A/Images-4083e56a-Results/A2)People/4083e56a/{}/!/Abandoned"; + string directory = "D:/1-Images-A/Images-7007a9df-Results/A2)People/7007a9df/{}/!/Abandoned"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -209,7 +209,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameDelete() { - string directory = "D:/1-Images-A/Images-4083e56a-Results/A)Property/4083e56a/{}"; + string directory = "D:/1-Images-A/Images-7007a9df-Results/A)Property/7007a9df/{}"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -229,7 +229,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameOld() { - string directory = "D:/1-Images-A/Images-4083e56a-Results/E)Distance/4083e56a/()"; + string directory = "D:/1-Images-A/Images-7007a9df-Results/E)Distance/7007a9df/()"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -250,7 +250,7 @@ public partial class UnitTestHardCoded public void TestMethodRenameDup() { string directory; - directory = "D:/1-Images-A/Images-4083e56a-Results/E)Distance/4083e56a/()"; + directory = "D:/1-Images-A/Images-7007a9df-Results/E)Distance/7007a9df/()"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -264,7 +264,7 @@ public partial class UnitTestHardCoded } Assert.IsTrue(true); } - directory = "D:/1-Images-A/Images-4083e56a-Results/A2)People/4083e56a/{}/!"; + directory = "D:/1-Images-A/Images-7007a9df-Results/A2)People/7007a9df/{}/!"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -284,9 +284,9 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRename() { - // string directory = "D:/2-Images-B/Not-Copy-Copy-4083e56a"; - string directory = "D:/1-Images-A/Images-4083e56a"; - // string directory = "D:/2-Images-B/Not-Copy-Copy-4083e56a"; + // string directory = "D:/2-Images-B/Not-Copy-Copy-7007a9df"; + string directory = "D:/1-Images-A/Images-7007a9df"; + // string directory = "D:/2-Images-B/Not-Copy-Copy-7007a9df"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string[] directories = Directory.GetDirectories(directory, "*;*", SearchOption.AllDirectories); @@ -303,7 +303,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameForUnkown() { - string directory = "D:/1-Images-A/Images-4083e56a-Results/E)Distance/4083e56a/(RectInt-2023-06-19-less-0.99)"; + string directory = "D:/1-Images-A/Images-7007a9df-Results/E)Distance/7007a9df/(RectInt-2023-06-19-less-0.99)"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string[] files = Directory.GetFiles(directory, "*.unk", SearchOption.AllDirectories); @@ -316,7 +316,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameForTicks() { - string directory = "D:/1-Images-A/Images-4083e56a-Results/A2)People/4083e56a/([])/ged"; + string directory = "D:/1-Images-A/Images-7007a9df-Results/A2)People/7007a9df/([])/ged"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkName;