Move IsSubPathOf to SharedCommands

Author: VictoriousRaptor

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -241,5 +241,22 @@ public static string ReturnPreviousDirectoryIfIncompleteString(string path)
 
             return path;
         }
+
+        /// <summary>
+        /// Returns if <paramref name="subPath"/> is a sub path of <paramref name="basePath"/>.
+        /// From https://stackoverflow.com/a/66877016
+        /// </summary>
+        /// <param name="subPath"></param>
+        /// <param name="basePath"></param>
+        /// <returns></returns>
+        public static bool IsSubPathOf(string subPath, string basePath)
+        {
+            var rel = Path.GetRelativePath(basePath, subPath);
+            return rel != "."
+                   && rel != ".."
+                   && !rel.StartsWith("../")
+                   && !rel.StartsWith(@"..\")
+                   && !Path.IsPathRooted(rel);
+        }
     }
 }

Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs

@@ -121,7 +121,7 @@ when ActionKeywordMatch(query, Settings.ActionKeyword.IndexSearchActionKeyword)
             }
 
             results.RemoveWhere(r => Settings.IndexSearchExcludedSubdirectoryPaths.Any(
-                excludedPath => IsSubPathOf(r.SubTitle, excludedPath.Path)));
+                excludedPath => FilesFolders.IsSubPathOf(r.SubTitle, excludedPath.Path)));
 
             return results.ToList();
         }
@@ -256,16 +256,5 @@ internal static bool IsEnvironmentVariableSearch(string search)
                    && search != "%%"
                    && !search.Contains('\\');
         }
-
-        // https://stackoverflow.com/a/66877016
-        internal static bool IsSubPathOf(string subPath, string basePath)
-        {
-            var rel = Path.GetRelativePath(basePath, subPath);
-            return rel != "."
-                   && rel != ".."
-                   && !rel.StartsWith("../")
-                   && !rel.StartsWith(@"..\")
-                   && !Path.IsPathRooted(rel);
-        }
     }
 }

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -471,7 +471,7 @@ private static IEnumerable<Win32> PATHPrograms(string[] suffixes, string[] proto
 
             var paths = pathEnv.Split(";", StringSplitOptions.RemoveEmptyEntries).DistinctBy(p => p.ToLowerInvariant());
 
-            var toFilter = paths.Where(x => commonParents.All(parent => !IsSubPathOf(x, parent)))
+            var toFilter = paths.Where(x => commonParents.All(parent => !FilesFolders.IsSubPathOf(x, parent)))
                 .AsParallel()
                 .SelectMany(p => EnumerateProgramsInDir(p, suffixes, recursive: false));
 
@@ -763,17 +763,6 @@ public static void Dispose()
             }
         }
 
-        // https://stackoverflow.com/a/66877016
-        private static bool IsSubPathOf(string subPath, string basePath)
-        {
-            var rel = Path.GetRelativePath(basePath, subPath);
-            return rel != "."
-                   && rel != ".."
-                   && !rel.StartsWith("../")
-                   && !rel.StartsWith(@"..\")
-                   && !Path.IsPathRooted(rel);
-        }
-
         private static List<string> GetCommonParents(IEnumerable<ProgramSource> programSources)
         {
             // To avoid unnecessary io
@@ -785,7 +774,7 @@ private static List<string> GetCommonParents(IEnumerable<ProgramSource> programS
                 HashSet<ProgramSource> parents = group.ToHashSet();
                 foreach (var source in group)
                 {
-                    if (parents.Any(p => IsSubPathOf(source.Location, p.Location) &&
+                    if (parents.Any(p => FilesFolders.IsSubPathOf(source.Location, p.Location) &&
                                          source != p))
                     {
                         parents.Remove(source);