Deduping results for program plugin (#2375)

* Removing description from title * adjusting subtitle * removing accidently paste * removing desc for uwp apps * Getting dups removed from list if LNK exists * adjusting subtitle * removing accidently paste * Getting dups removed from list if LNK exists * changed to normal forloop
microsoft · Apr 24, 2020 · 08a7394 · 08a7394
1 parent 8a2fd5b
commit 08a7394
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/UWP.cs b/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/UWP.cs
@@ -282,7 +282,7 @@ public Result Result(string query, IPublicAPI api)
 
                 var result = new Result
                 {
-                    SubTitle = "UWP Application",
+                    SubTitle = "UWP application",
                     Icon = Logo,
                     Score = score,
                     ContextData = this,

diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs b/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs
@@ -53,7 +53,7 @@ public Result Result(string query, IPublicAPI api)
 
             var result = new Result
             {
-                SubTitle = "Win32 Application",
+                SubTitle = "Win32 application",
                 IcoPath = IcoPath,
                 Score = score,
                 ContextData = this,
@@ -148,8 +148,9 @@ private static Win32 Win32Program(string path)
                 var p = new Win32
                 {
                     Name = Path.GetFileNameWithoutExtension(path),
+                    ExecutableName = Path.GetFileName(path),
                     IcoPath = path,
-                    FullPath = path,
+                    FullPath = path.ToLower(),
                     UniqueIdentifier = path,
                     ParentDirectory = Directory.GetParent(path).FullName,
                     Description = string.Empty,
@@ -191,7 +192,8 @@ private static Win32 LnkProgram(string path)
                     if (extension == ExeExtension && File.Exists(target))
                     {
                         program.LnkResolvedPath = program.FullPath;
-                        program.FullPath = target;
+                        program.FullPath = Path.GetFullPath(target).ToLower();
+                        program.ExecutableName = Path.GetFileName(target);
 
                         buffer = new StringBuilder(MAX_PATH);
                         link.GetDescription(buffer, MAX_PATH);
@@ -239,10 +241,12 @@ private static Win32 ExeProgram(string path)
             {
                 var program = Win32Program(path);
                 var info = FileVersionInfo.GetVersionInfo(path);
+
                 if (!string.IsNullOrEmpty(info.FileDescription))
                 {
                     program.Description = info.FileDescription;
                 }
+
                 return program;
             }
             catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
@@ -257,10 +261,14 @@ private static Win32 ExeProgram(string path)
         private static IEnumerable<string> ProgramPaths(string directory, string[] suffixes)
         {
             if (!Directory.Exists(directory))
+            {
                 return new string[] { };
+            }
+
             var files = new List<string>();
             var folderQueue = new Queue<string>();
             folderQueue.Enqueue(directory);
+
             do
             {
                 var currentDirectory = folderQueue.Dequeue();
@@ -298,12 +306,14 @@ private static IEnumerable<string> ProgramPaths(string directory, string[] suffi
                                                 $"|Permission denied when trying to load programs from {currentDirectory}", e);
                 }
             } while (folderQueue.Any());
+
             return files;
         }
 
         private static string Extension(string path)
         {
             var extension = Path.GetExtension(path)?.ToLower();
+
             if (!string.IsNullOrEmpty(extension))
             {
                 return extension.Substring(1);
@@ -353,11 +363,8 @@ private static ParallelQuery<Win32> StartMenuPrograms(string[] suffixes)
 
             var programs1 = paths.AsParallel().Where(p => Extension(p) == ShortcutExtension).Select(LnkProgram);
             var programs2 = paths.AsParallel().Where(p => Extension(p) == ApplicationReferenceExtension).Select(Win32Program);
-            var allValidPrograms = programs1.Concat(programs2).Where(p => p.Valid);
-            //var programsWithLnk = allValidPrograms.Where(x => !string.IsNullOrEmpty(x.LnkResolvedPath));
-
 
-            return allValidPrograms;
+            return programs1.Concat(programs2).Where(p => p.Valid);
         }
 
         private static ParallelQuery<Win32> AppPathsPrograms(string[] suffixes)
@@ -450,6 +457,7 @@ public static Win32[] All(Settings settings)
 
                 var unregistered = UnregisteredPrograms(settings.ProgramSources, settings.ProgramSuffixes);
                 programs = programs.Concat(unregistered);
+
                 if (settings.EnableRegistrySource)
                 {
                     var appPaths = AppPathsPrograms(settings.ProgramSuffixes);
@@ -462,7 +470,15 @@ public static Win32[] All(Settings settings)
                     programs = programs.Concat(startMenu);
                 }
 
-                return programs.ToArray();
+                var programsWithoutLnk = programs.Where(x => string.IsNullOrEmpty(x.LnkResolvedPath));
+                var programsAsList = programs.ToList();
+
+                foreach(var app in programsWithoutLnk)
+                {
+                    programsAsList.RemoveAll(x => (x.FullPath == app.FullPath) && string.IsNullOrEmpty(x.LnkResolvedPath));
+                }
+
+                return programsAsList.ToArray();
             }
 #if DEBUG //This is to make developer aware of any unhandled exception and add in handling.
             catch (Exception e)