Clean up previous PR

Tyrrrz · Sep 18, 2024 · 0b30001 · 0b30001
1 parent 58718ef
commit 0b30001
Showing 1 changed file with 32 additions and 7 deletions.
diff --git a/YoutubeDownloader.Core/Downloading/FFmpeg.cs b/YoutubeDownloader.Core/Downloading/FFmpeg.cs
@@ -17,22 +17,47 @@ static IEnumerable<string> GetProbeDirectoryPaths()
             yield return AppContext.BaseDirectory;
             yield return Directory.GetCurrentDirectory();
 
-            // User PATH environment variable
-            if (Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User)?.Split(Path.PathSeparator) is { } userPaths)
+            // Process PATH
+            if (
+                Environment.GetEnvironmentVariable("PATH")?.Split(Path.PathSeparator) is
+                { } processPaths
+            )
             {
-                foreach (var path in userPaths)
+                foreach (var path in processPaths)
                     yield return path;
             }
 
-            // System PATH environment variable
-            if (Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine)?.Split(Path.PathSeparator) is { } systemPaths)
+            // Registry-based PATH variables
+            if (OperatingSystem.IsWindows())
             {
-                foreach (var path in systemPaths)
-                    yield return path;
+                // User PATH
+                if (
+                    Environment
+                        .GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User)
+                        ?.Split(Path.PathSeparator) is
+                    { } userPaths
+                )
+                {
+                    foreach (var path in userPaths)
+                        yield return path;
+                }
+
+                // System PATH
+                if (
+                    Environment
+                        .GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine)
+                        ?.Split(Path.PathSeparator) is
+                    { } systemPaths
+                )
+                {
+                    foreach (var path in systemPaths)
+                        yield return path;
+                }
             }
         }
 
         return GetProbeDirectoryPaths()
+            .Distinct(StringComparer.Ordinal)
             .Select(dirPath => Path.Combine(dirPath, CliFileName))
             .FirstOrDefault(File.Exists);
     }