tidy up the path in the report.

KevinJump · Mar 11, 2024 · 199a407 · 199a407
1 parent 2437d6e
commit 199a407
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 1 deletion.
diff --git a/uSync.BackOffice/Extensions/PathExtensions.cs b/uSync.BackOffice/Extensions/PathExtensions.cs
@@ -0,0 +1,35 @@
+using System;
+using System.IO;
+using System.Linq;
+
+namespace uSync.BackOffice.Extensions;
+
+/// <summary>
+///  extensions to manipulate folder path strings.
+/// </summary>
+public static class PathExtensions
+{
+    /// <summary>
+    ///  truncate a folder path to only show the last count paths..
+    /// </summary>
+    public static string TruncatePath(this string path, int count = 3, bool includeFile = false)
+    {
+        if (string.IsNullOrWhiteSpace(path)) return path;
+
+        var result = "";
+
+        var fullPath = includeFile ? path : Path.GetDirectoryName(path);
+        if (string.IsNullOrWhiteSpace(fullPath)) return fullPath ?? string.Empty;
+
+        var bits = fullPath.Split([Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar]);
+
+        foreach (var item in bits.Reverse().Take(count))
+        {
+            if (Path.IsPathRooted(item)) continue;
+
+            result = $"{Path.DirectorySeparatorChar}{item}{result}";
+        }
+
+        return result;
+    }
+}
diff --git a/uSync.BackOffice/SyncHandlers/SyncHandlerRoot.cs b/uSync.BackOffice/SyncHandlers/SyncHandlerRoot.cs
@@ -17,6 +17,7 @@
 using Umbraco.Extensions;
 
 using uSync.BackOffice.Configuration;
+using uSync.BackOffice.Extensions;
 using uSync.BackOffice.Models;
 using uSync.BackOffice.Services;
 using uSync.BackOffice.SyncHandlers.Models;
@@ -570,7 +571,7 @@ private string GetRootFolder(string path)
                 if (path.Contains(folder) is true) return Path.GetFileName(folder.TrimEnd('/'));
             }
 
-            return path;
+            return path.TruncatePath(3, false);
         }
 
 

diff --git a/uSync.Tests/Extensions/PathNameTests.cs b/uSync.Tests/Extensions/PathNameTests.cs
@@ -1,5 +1,8 @@
 using NUnit.Framework;
 
+using Umbraco.Extensions;
+
+using uSync.BackOffice.Extensions;
 using uSync.Core;
 
 namespace uSync.Tests.Extensions
@@ -27,5 +30,35 @@ public void BadFileNamesAreAppended(string filename, string expected)
 
             Assert.AreEqual(expected, value);
         }
+
+        [TestCase("C:\\Source\\OpenSource\\v13\\uSync\\README.md", "\\OpenSource\\v13\\uSync")]
+        [TestCase("C:\\Source\\OpenSource\\v13\\README.md", "\\Source\\OpenSource\\v13")]
+        [TestCase("C:\\Source\\OpenSource\\README.md", "\\Source\\OpenSource")]
+        [TestCase("C:\\Source\\README.md", "\\Source")]
+        [TestCase("C:\\Source/OpenSource\\v13\\uSync\\README.md", "\\OpenSource\\v13\\uSync")]
+        [TestCase("C:\\Source/OpenSource\\v13\\README.md", "\\Source\\OpenSource\\v13")]
+        [TestCase("C:\\Source/OpenSource/README.md", "\\Source\\OpenSource")]
+        [TestCase("C:/Source\\README.md", "\\Source")]
+        [TestCase("README.md", "")]
+        [TestCase("", "")]
+        public void TruncatedPathsWithoutFileName(string filename, string expected)
+        {
+            var result = filename.TruncatePath(3, false);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [TestCase("C:\\Source\\OpenSource\\v13\\uSync\\README.md", "\\v13\\uSync\\README.md")]
+        [TestCase("C:\\Source\\OpenSource\\v13\\README.md", "\\OpenSource\\v13\\README.md")]
+        [TestCase("C:\\Source\\OpenSource\\README.md", "\\Source\\OpenSource\\README.md")]
+        [TestCase("C:\\Source\\README.md", "\\Source\\README.md")]
+        [TestCase("README.md", "\\README.md")]
+        [TestCase("", "")]
+        public void TruncatedPathsWithFileName(string filename, string expected)
+        {
+            var result = filename.TruncatePath(3, true);
+
+            Assert.AreEqual(expected, result);
+        }
     }
 }