improve relative path, local path, full path search system

one-ware · Mar 17, 2024 · 919ff55 · 919ff55
1 parent b0c1dc2
commit 919ff55
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/OneWare.Essentials/Extensions/StringExtensions.cs b/src/OneWare.Essentials/Extensions/StringExtensions.cs
@@ -26,7 +26,13 @@ public static bool ContainsSubPath(this string pathToFile, string subPath)
             return containsIt;
         }
 
-        public static string ToLinuxPath(this string input)
+        public static string ToPlatformPath(this string input)
+        {
+            return input.Replace('/', Path.DirectorySeparatorChar)
+                .Replace('\\', Path.DirectorySeparatorChar);
+        }
+
+        public static string ToUnixPath(this string input)
         {
             return input.Replace('\\', '/');
         }

diff --git a/src/OneWare.Essentials/Helpers/ProjectHelper.cs b/src/OneWare.Essentials/Helpers/ProjectHelper.cs
@@ -39,7 +39,7 @@ public static bool MatchWildCards(string path, IEnumerable<string> include, IEnu
         return include.Any(includePattern => FileSystemName.MatchesSimpleExpression(includePattern, path))  
                && (exclude is null || !exclude.Any(excludePattern => FileSystemName.MatchesSimpleExpression(excludePattern, path) 
                         || Enumerable
-                            .SkipLast<string>(path.ToLinuxPath()
+                            .SkipLast<string>(path.ToUnixPath()
                                 .Split('/', StringSplitOptions.RemoveEmptyEntries), 1)
                             .Any(x => FileSystemName.MatchesSimpleExpression(excludePattern, x))));
     }

diff --git a/src/OneWare.Essentials/Models/IProjectFolder.cs b/src/OneWare.Essentials/Models/IProjectFolder.cs
@@ -10,9 +10,9 @@ public interface IProjectFolder : IProjectEntry
 
     public IProjectFolder AddFolder(string path, bool createNew = false);
 
-    public IProjectEntry? SearchName(string path, bool recursive = true);
+    public IProjectEntry? SearchName(string path);
 
-    public IProjectEntry? SearchRelativePath(string path, bool recursive = true);
+    public IProjectEntry? SearchRelativePath(string path);
 
-    public IProjectEntry? SearchFullPath(string path, bool recursive = true);
+    public IProjectEntry? SearchFullPath(string path);
 }