refactor usage of getprotocols

Author: VictoriousRaptor

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

@@ -293,7 +293,7 @@ private static Win32 LnkProgram(string path)
 #endif
         }
 
-        private static Win32 UrlProgram(string path)
+        private static Win32 UrlProgram(string path, string[] protocols)
         {
             var program = Win32Program(path);
             program.Valid = false;
@@ -308,7 +308,7 @@ private static Win32 UrlProgram(string path)
                 {
                     return program;
                 }
-                foreach(var protocol in Main._settings.GetProtocols())
+                foreach(var protocol in protocols)
                 {
                     if(url.StartsWith(protocol))
                     {
@@ -370,35 +370,26 @@ private static string Extension(string path)
             var extension = Path.GetExtension(path)?.ToLowerInvariant();
             if (!string.IsNullOrEmpty(extension))
             {
-                return extension.Substring(1);
+                return extension.Substring(1);  // remove dot
             }
             else
             {
                 return string.Empty;
             }
         }
 
-        private static IEnumerable<Win32> UnregisteredPrograms(List<ProgramSource> sources, string[] suffixes)
+        private static IEnumerable<Win32> UnregisteredPrograms(List<ProgramSource> sources, string[] suffixes, string[] protocols)
         {
             var paths = ExceptDisabledSource(sources.Where(s => Directory.Exists(s.Location) && s.Enabled)
                     .SelectMany(s => ProgramPaths(s.Location, suffixes)))
                     .Distinct();
 
-            var programs = paths.Select(x => Extension(x) switch
-            {
-                ExeExtension => ExeProgram(x),
-                ShortcutExtension => LnkProgram(x),
-                UrlExtension => UrlProgram(x),
-                _ => Win32Program(x)
-            }).Where(x => x.Valid);
-
+            var programs = paths.Select(x => GetProgramFromPath(x, protocols)).Where(x => x.Valid);
             return programs;
         }
 
-        private static IEnumerable<Win32> StartMenuPrograms(string[] suffixes)
+        private static IEnumerable<Win32> StartMenuPrograms(string[] suffixes, string[] protocols)
         {
-            var disabledProgramsList = Main._settings.DisabledProgramSources;
-
             var directory1 = Environment.GetFolderPath(Environment.SpecialFolder.Programs);
             var directory2 = Environment.GetFolderPath(Environment.SpecialFolder.CommonPrograms);
             var paths1 = ProgramPaths(directory1, suffixes);
@@ -407,16 +398,11 @@ private static IEnumerable<Win32> StartMenuPrograms(string[] suffixes)
             var toFilter = paths1.Concat(paths2);
 
             var programs = ExceptDisabledSource(toFilter.Distinct())
-                .Select(x => Extension(x) switch
-                {
-                    ShortcutExtension => LnkProgram(x),
-                    UrlExtension => UrlProgram(x),
-                    _ => Win32Program(x)
-                }).Where(x => x.Valid);
+                .Select(x => GetProgramFromPath(x, protocols)).Where(x => x.Valid);
             return programs;
         }
 
-        private static IEnumerable<Win32> AppPathsPrograms(string[] suffixes)
+        private static IEnumerable<Win32> AppPathsPrograms(string[] suffixes, string[] protocols)
         {
             // https://msdn.microsoft.com/en-us/library/windows/desktop/ee872121
             const string appPaths = @"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths";
@@ -436,12 +422,11 @@ private static IEnumerable<Win32> AppPathsPrograms(string[] suffixes)
                 toFilter = toFilter.Concat(GetPathFromRegistry(rootUser));
             }
 
-
             toFilter = toFilter.Distinct().Where(p => suffixes.Contains(Extension(p)));
 
-            var filtered = ExceptDisabledSource(toFilter);
-
-            return filtered.Select(GetProgramFromPath).Where(x => x.Valid).ToList(); // ToList due to disposing issue
+            var programs = ExceptDisabledSource(toFilter)
+                    .Select(x => GetProgramFromPath(x, protocols)).Where(x => x.Valid).ToList(); // ToList due to disposing issue
+            return programs;
         }
 
         private static IEnumerable<string> GetPathFromRegistry(RegistryKey root)
@@ -481,7 +466,7 @@ private static string GetProgramPathFromRegistrySubKeys(RegistryKey root, string
             }
         }
 
-        private static Win32 GetProgramFromPath(string path)
+        private static Win32 GetProgramFromPath(string path, string[] protocols)
         {
             if (string.IsNullOrEmpty(path))
                 return Default;
@@ -491,9 +476,13 @@ private static Win32 GetProgramFromPath(string path)
             if (!File.Exists(path))
                 return Default;
 
-            var entry = Win32Program(path);
-
-            return entry;
+            return Extension(path) switch
+            {
+                ShortcutExtension => LnkProgram(path),
+                ExeExtension => ExeProgram(path),
+                UrlExtension => UrlProgram(path, protocols),
+                _ => Win32Program(path)
+            }; ;
         }
 
         public static IEnumerable<string> ExceptDisabledSource(IEnumerable<string> paths)
@@ -550,22 +539,23 @@ public static Win32[] All(Settings settings)
             try
             {
                 var programs = Enumerable.Empty<Win32>();
-
-                var unregistered = UnregisteredPrograms(settings.ProgramSources, settings.GetSuffixes());
+                var suffixes = settings.GetSuffixes();
+                var protocols = settings.GetProtocols();
+                var unregistered = UnregisteredPrograms(settings.ProgramSources, suffixes, protocols);
 
                 programs = programs.Concat(unregistered);
 
                 var autoIndexPrograms = Enumerable.Empty<Win32>();
 
                 if (settings.EnableRegistrySource)
                 {
-                    var appPaths = AppPathsPrograms(settings.GetSuffixes());
+                    var appPaths = AppPathsPrograms(suffixes, protocols);
                     autoIndexPrograms = autoIndexPrograms.Concat(appPaths);
                 }
 
                 if (settings.EnableStartMenuSource)
                 {
-                    var startMenu = StartMenuPrograms(settings.GetSuffixes());
+                    var startMenu = StartMenuPrograms(suffixes, protocols);
                     autoIndexPrograms = autoIndexPrograms.Concat(startMenu);
                 }