fix: trim trailing path separator

Life is easier without trailing separators. If always trim them then comparing ignore paths is less complicated.
corytodd · Apr 26, 2024 · f23181d · f23181d
1 parent 82b4dbe
commit f23181d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Walrus.Core.Tests/PathHelperTests.cs b/Walrus.Core.Tests/PathHelperTests.cs
@@ -23,7 +23,7 @@ public IEnumerator<object[]> GetEnumerator()
                     yield return new object[] { "relative", "relative" };
                     yield return new object[] { @"relative\path\to\boot", @"relative\path\to\boot" };
                     yield return new object[] { @"relative\path\to\..\boot", @"relative\path\to\..\boot" };
-                    yield return new object[] { @"~/", @"C:\Users\user\" };
+                    yield return new object[] { @"~/", @"C:\Users\user" };
                     yield return new object[] { @"~/%FOO%", @"C:\Users\user\foo" };
                 }
                 else
@@ -32,7 +32,7 @@ public IEnumerator<object[]> GetEnumerator()
                     yield return new object[] { "relative", "relative" };
                     yield return new object[] { "relative/path/to/boot", "relative/path/to/boot" };
                     yield return new object[] { "relative/path/to/../boot", "relative/path/to/../boot" };
-                    yield return new object[] { "~/", "/home/user/" };
+                    yield return new object[] { "~/", "/home/user" };
                     yield return new object[] { "~/$FOO", "/home/user/foo" };
                 }
             }

diff --git a/Walrus.Core/PathHelper.cs b/Walrus.Core/PathHelper.cs
@@ -29,6 +29,7 @@ public static string ResolvePath(string path)
             }
 
             path = ResolveAllEnvironmentVariables(path);
+            path = path.TrimEnd(Path.DirectorySeparatorChar);
 
             return path;
 
@@ -49,6 +50,7 @@ internal static bool ContainsPath(IList<string> pathList, string repositoryPath)
                 var normalizedIgnoredRepo = Path.GetFullPath(ResolvePath(ignoredRepo));
                 if (normalizedIgnoredRepo == normalizedPath)
                 {
+                    WalrusLog.Logger.LogDebug("Ignoring repository {RepositoryPath}", repositoryPath);
                     found = true;
                     break;
                 }