From a4dd0fae45992b58a50657e45840a47662787e18 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 28 Jun 2023 21:14:11 -0700 Subject: [PATCH] dd514b88 Length --- .vscode/tasks.json | 2 +- Compare/appsettings.Development.json | 4 ++-- Compare/appsettings.json | 2 +- Copy-Distinct/CopyDistinct.cs | 2 +- Copy-Distinct/appsettings.json | 2 +- Date-Group/.vscode/UserSecrets/secrets.json | 6 ++--- Date-Group/appsettings.json | 2 +- Delete-By-Distinct/appsettings.json | 4 ++-- Delete-By-Relative/appsettings.json | 4 ++-- Duplicate-Search/appsettings.Development.json | 4 ++-- Duplicate-Search/appsettings.json | 4 ++-- Move-By-Id/appsettings.json | 4 ++-- Person/appsettings.json | 6 ++--- PrepareForOld/appsettings.Development.json | 2 +- Rename/.vscode/UserSecrets/secrets.json | 2 +- Rename/.vscode/tasks.json | 2 +- Rename/appsettings.json | 2 +- Set-Created-Date/appsettings.json | 2 +- Tests/UnitTestHardCoded.cs | 22 +++++++++---------- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b32072d..081120a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -28,7 +28,7 @@ "${workspaceFolder}/Person/Person.csproj", "set", "SaveDirectory", - "D:/1) Images A/Images-1e85c0ba-Results/A2) People/1e85c0ba/([])" + "D:/1) Images A/Images-dd514b88-Results/A2) People/dd514b88/([])" ], "problemMatcher": "$msCompile" }, diff --git a/Compare/appsettings.Development.json b/Compare/appsettings.Development.json index 6ecb5d7..b5adec2 100644 --- a/Compare/appsettings.Development.json +++ b/Compare/appsettings.Development.json @@ -79,7 +79,7 @@ "/zzz Phares Slides/Slides 2015-06-10/Magazine 01" ], "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -87,7 +87,7 @@ "Pattern": "[^ABCDEFGHIJKLMNOPQRSTUVWXYZbcdfghjklmnpqrstvwxyz0-9]", "PopulatePropertyId": true, "PropertiesChangedForProperty": false, - "RootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", + "RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", "WriteBitmapDataBytes": false, "IgnoreExtensions": [ ".gif", diff --git a/Compare/appsettings.json b/Compare/appsettings.json index 3920cfe..2e2c827 100644 --- a/Compare/appsettings.json +++ b/Compare/appsettings.json @@ -50,7 +50,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, diff --git a/Copy-Distinct/CopyDistinct.cs b/Copy-Distinct/CopyDistinct.cs index 521fb85..3a61a4c 100644 --- a/Copy-Distinct/CopyDistinct.cs +++ b/Copy-Distinct/CopyDistinct.cs @@ -97,7 +97,7 @@ public class CopyDistinct continue; (_, directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration.ResultAllInOneSubdirectoryLength, fileHolder.NameWithoutExtension); directoryName = Path.GetFileName(fileHolder.DirectoryName); - if (!fileHolder.Name.StartsWith(directoryName)) + if (directoryName.Length < _PropertyConfiguration.ResultAllInOneSubdirectoryLength || !fileHolder.Name.StartsWith(directoryName)) { if (wrapped) continue; diff --git a/Copy-Distinct/appsettings.json b/Copy-Distinct/appsettings.json index cda8ada..9001764 100644 --- a/Copy-Distinct/appsettings.json +++ b/Copy-Distinct/appsettings.json @@ -52,7 +52,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, diff --git a/Date-Group/.vscode/UserSecrets/secrets.json b/Date-Group/.vscode/UserSecrets/secrets.json index 9e01026..29b18bc 100644 --- a/Date-Group/.vscode/UserSecrets/secrets.json +++ b/Date-Group/.vscode/UserSecrets/secrets.json @@ -7,9 +7,9 @@ "xPopulatePropertyId": false, "PopulatePropertyId": true, "RootDirectory": "D:/Tmp/phares/Pictures", - "xxRootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", - "xxxRootDirectory": "F:/Tmp/Phares/Compare/Not-Copy-Copy-1e85c0ba", - "xxxxRootDirectory": "C:/Tmp/Phares/Compare/Not-Copy-Copy-1e85c0ba", + "xxRootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", + "xxxRootDirectory": "F:/Tmp/Phares/Compare/Not-Copy-Copy-dd514b88", + "xxxxRootDirectory": "C:/Tmp/Phares/Compare/Not-Copy-Copy-dd514b88", "xxxxxRootDirectory": "F:/Tmp/Phares/2022-11-03-DCIM/DCIM/100D3400 2022" } } diff --git a/Date-Group/appsettings.json b/Date-Group/appsettings.json index 988a7e2..fe3cda4 100644 --- a/Date-Group/appsettings.json +++ b/Date-Group/appsettings.json @@ -55,7 +55,7 @@ "ByHash": false, "BySeason": false, "ByWeek": false, - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, "KeepFullPath": false, diff --git a/Delete-By-Distinct/appsettings.json b/Delete-By-Distinct/appsettings.json index 2f52075..9969fac 100644 --- a/Delete-By-Distinct/appsettings.json +++ b/Delete-By-Distinct/appsettings.json @@ -56,7 +56,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -70,7 +70,7 @@ "ResultCollection": "[]", "ResultContent": "()", "ResultSingleton": "{}", - "RootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", + "RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", "WriteBitmapDataBytes": false, "IgnoreExtensions": [ ".gif", diff --git a/Delete-By-Relative/appsettings.json b/Delete-By-Relative/appsettings.json index 563c05f..f6ddcd6 100644 --- a/Delete-By-Relative/appsettings.json +++ b/Delete-By-Relative/appsettings.json @@ -51,7 +51,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -65,7 +65,7 @@ "ResultCollection": "[]", "ResultContent": "()", "ResultSingleton": "{}", - "RootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", + "RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", "WriteBitmapDataBytes": false, "IgnoreExtensions": [ ".gif", diff --git a/Duplicate-Search/appsettings.Development.json b/Duplicate-Search/appsettings.Development.json index 1ba627c..d0abe27 100644 --- a/Duplicate-Search/appsettings.Development.json +++ b/Duplicate-Search/appsettings.Development.json @@ -124,8 +124,8 @@ ], "Windows": { "Configuration": { - "xRootDirectory": "F:/Tmp/Phares/Compare/Images-1e85c0ba", - "xxRootDirectory": "F:/Tmp/Phares/Compare/Not-Copy-Copy-1e85c0ba", + "xRootDirectory": "F:/Tmp/Phares/Compare/Images-dd514b88", + "xxRootDirectory": "F:/Tmp/Phares/Compare/Not-Copy-Copy-dd514b88", "RootDirectory": "E:/", "VerifyToSeason": [ ". 2000", diff --git a/Duplicate-Search/appsettings.json b/Duplicate-Search/appsettings.json index 1ce1ea2..1e12fb4 100644 --- a/Duplicate-Search/appsettings.json +++ b/Duplicate-Search/appsettings.json @@ -53,7 +53,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -67,7 +67,7 @@ "ResultCollection": "[]", "ResultContent": "()", "ResultSingleton": "{}", - "RootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", + "RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", "WriteBitmapDataBytes": false, "IgnoreExtensions": [ ".gif", diff --git a/Move-By-Id/appsettings.json b/Move-By-Id/appsettings.json index b290ae9..4e8411b 100644 --- a/Move-By-Id/appsettings.json +++ b/Move-By-Id/appsettings.json @@ -53,7 +53,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -68,7 +68,7 @@ "ResultCollection": "[]", "ResultContent": "()", "ResultSingleton": "{}", - "RootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", + "RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", "WriteBitmapDataBytes": false, "IgnoreExtensions": [ ".gif", diff --git a/Person/appsettings.json b/Person/appsettings.json index 606eb2e..9b15739 100644 --- a/Person/appsettings.json +++ b/Person/appsettings.json @@ -2,7 +2,7 @@ "Company": "Mike Phares", "Linux": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -124,7 +124,7 @@ }, "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, @@ -139,7 +139,7 @@ "ResultCollection": "[]", "ResultContent": "()", "ResultSingleton": "{}", - "RootDirectory": "C:/Tmp/Phares/Compare/Images-1e85c0ba", + "RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88", "SaveDirectory": "D:/Tmp", "WriteBitmapDataBytes": false, "IgnoreExtensions": [ diff --git a/PrepareForOld/appsettings.Development.json b/PrepareForOld/appsettings.Development.json index a3b9413..909538b 100644 --- a/PrepareForOld/appsettings.Development.json +++ b/PrepareForOld/appsettings.Development.json @@ -50,7 +50,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, "KeepFullPath": false, diff --git a/Rename/.vscode/UserSecrets/secrets.json b/Rename/.vscode/UserSecrets/secrets.json index bccf74a..062dea1 100644 --- a/Rename/.vscode/UserSecrets/secrets.json +++ b/Rename/.vscode/UserSecrets/secrets.json @@ -3,7 +3,7 @@ "ComparePathsFile": "C:/Users/mikep/AppData/Local/PharesApps/Drag-Drop-Explorer/2023_21/638202586000194405.json", "Windows": { "Configuration": { - "RootDirectory": "D:/1) Images A/Images-1e85c0ba" + "RootDirectory": "D:/1) Images A/Images-dd514b88" } } } \ No newline at end of file diff --git a/Rename/.vscode/tasks.json b/Rename/.vscode/tasks.json index be99a3b..062f433 100644 --- a/Rename/.vscode/tasks.json +++ b/Rename/.vscode/tasks.json @@ -28,7 +28,7 @@ "${workspaceFolder}/Rename.csproj", "set", "SaveDirectory", - "D:/1) Images A/Images-1e85c0ba-Results/A2) People/1e85c0ba/([])" + "D:/1) Images A/Images-dd514b88-Results/A2) People/dd514b88/([])" ], "problemMatcher": "$msCompile" }, diff --git a/Rename/appsettings.json b/Rename/appsettings.json index 5cd6d24..164b0e9 100644 --- a/Rename/appsettings.json +++ b/Rename/appsettings.json @@ -53,7 +53,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, diff --git a/Set-Created-Date/appsettings.json b/Set-Created-Date/appsettings.json index cda8ada..9001764 100644 --- a/Set-Created-Date/appsettings.json +++ b/Set-Created-Date/appsettings.json @@ -52,7 +52,7 @@ "WorkingDirectoryName": "PharesApps", "Windows": { "Configuration": { - "DateGroup": "1e85c0ba", + "DateGroup": "dd514b88", "DiffPropertyDirectory": "", "FileNameDirectorySeparator": ".Z.", "ForcePropertyLastWriteTimeToCreationTime": false, diff --git a/Tests/UnitTestHardCoded.cs b/Tests/UnitTestHardCoded.cs index 7266ef6..132b9b0 100644 --- a/Tests/UnitTestHardCoded.cs +++ b/Tests/UnitTestHardCoded.cs @@ -97,7 +97,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodGetApproximateYears() { - string personDisplayDirectory = @"D:\1) Images A\Images-1e85c0ba-Results\A2) People\1e85c0ba\{}\^\Sydney Dupray^9"; + string personDisplayDirectory = @"D:\1) Images A\Images-dd514b88-Results\A2) People\dd514b88\{}\^\Sydney Dupray^9"; if (Directory.Exists(Directory.GetDirectoryRoot(personDisplayDirectory)) && Directory.Exists(personDisplayDirectory)) { char numberSign = '#'; @@ -200,7 +200,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameAbandoned() { - string directory = @"D:\1) Images A\Images-1e85c0ba-Results\A2) People\1e85c0ba\{}\!\Abandoned"; + string directory = @"D:\1) Images A\Images-dd514b88-Results\A2) People\dd514b88\{}\!\Abandoned"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -220,7 +220,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameDelete() { - string directory = @"D:\1) Images A\Images-1e85c0ba-Results\A) Property\1e85c0ba\{}"; + string directory = @"D:\1) Images A\Images-dd514b88-Results\A) Property\dd514b88\{}"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -240,7 +240,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameOld() { - string directory = @"D:\2) Images B\Not-Copy-Copy-1e85c0ba-Results\E) Distance\1e85c0ba\()"; + string directory = @"D:\2) Images B\Not-Copy-Copy-dd514b88-Results\E) Distance\dd514b88\()"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string checkFile; @@ -260,7 +260,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodAncestryGenealogicalDataCommunication() { - string directory = "D:/1) Images A/Images-1e85c0ba-Results/A2) People/1e85c0ba/([])"; + string directory = "D:/1) Images A/Images-dd514b88-Results/A2) People/dd514b88/([])"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { List mappedLines; @@ -302,7 +302,7 @@ public partial class UnitTestHardCoded public void TestMethodAncestryGenealogicalDataCommunicationCleanToExport() { DateTime dateTime = DateTime.Now; - string saveDirectory = "D:/1) Images A/Images-1e85c0ba-Results/A2) People/1e85c0ba/([])"; + string saveDirectory = "D:/1) Images A/Images-dd514b88-Results/A2) People/dd514b88/([])"; if (Directory.Exists(Path.GetPathRoot(saveDirectory)) && Directory.Exists(saveDirectory)) { int age; @@ -662,7 +662,7 @@ public partial class UnitTestHardCoded public void TestMethodFamily() { DateTime dateTime = DateTime.Now; - string saveDirectory = $"D:/1) Images A/Images-1e85c0ba-Results/A2) People/1e85c0ba/([])/Norman-{dateTime.Ticks}"; + string saveDirectory = $"D:/1) Images A/Images-dd514b88-Results/A2) People/dd514b88/([])/Norman-{dateTime.Ticks}"; if (Directory.Exists(Path.GetPathRoot(saveDirectory)) && Directory.Exists(saveDirectory)) { int age; @@ -751,9 +751,9 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRename() { - // string directory = @"D:\2) Images B\Not-Copy-Copy-1e85c0ba"; - string directory = @"D:\1) Images A\Images-1e85c0ba"; - // string directory = @"D:\2) Images B\Not-Copy-Copy-1e85c0ba"; + // string directory = @"D:\2) Images B\Not-Copy-Copy-dd514b88"; + string directory = @"D:\1) Images A\Images-dd514b88"; + // string directory = @"D:\2) Images B\Not-Copy-Copy-dd514b88"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string[] directories = Directory.GetDirectories(directory, "*;*", SearchOption.AllDirectories); @@ -770,7 +770,7 @@ public partial class UnitTestHardCoded [TestMethod] public void TestMethodRenameForUnkown() { - string directory = @"D:\1) Images A\Images-1e85c0ba-Results\E) Distance\1e85c0ba\(RectInt-2023-06-19-less-0.99)"; + string directory = @"D:\1) Images A\Images-dd514b88-Results\E) Distance\dd514b88\(RectInt-2023-06-19-less-0.99)"; if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory)) { string[] files = Directory.GetFiles(directory, "*.unk", SearchOption.AllDirectories);