adjusting how programs are displayed. (#2369)

* Removing description from title * adjusting subtitle * removing accidently paste * removing desc for uwp apps
microsoft · Apr 24, 2020 · 845c6be · 845c6be
1 parent 92daf15
commit 845c6be
Show file tree

Hide file tree

Showing 4 changed files with 361 additions and 391 deletions.
diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Main.cs b/src/modules/launcher/Plugins/Wox.Plugin.Program/Main.cs
@@ -72,7 +72,8 @@ public List<Result> Query(Query query)
             UWP.Application[] uwps;
 
             lock (IndexLock)
-            { // just take the reference inside the lock to eliminate query time issues.
+            { 
+                // just take the reference inside the lock to eliminate query time issues.
                 win32 = _win32s;
                 uwps = _uwps;
             }
@@ -118,7 +119,6 @@ public static void IndexUWPPrograms()
         public static void IndexPrograms()
         {
             var t1 = Task.Run(() => IndexWin32Programs());
-
             var t2 = Task.Run(() => IndexUWPPrograms());
 
             Task.WaitAll(t1, t2);
@@ -153,32 +153,8 @@ public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
             return menuOptions;
         }
 
-        private void DisableProgram(IProgram programToDelete)
-        {
-            if (_settings.DisabledProgramSources.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
-                return;
-
-            if (_uwps.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
-                _uwps.Where(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier).FirstOrDefault().Enabled = false;
-
-            if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
-                _win32s.Where(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier).FirstOrDefault().Enabled = false;
-
-            _settings.DisabledProgramSources
-                     .Add(
-                             new Settings.DisabledProgramSource
-                             {
-                                 Name = programToDelete.Name,
-                                 Location = programToDelete.Location,
-                                 UniqueIdentifier = programToDelete.UniqueIdentifier,
-                                 Enabled = false
-                             }
-                         );
-        }
-
         public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, ProcessStartInfo info)
         {
-            bool hide;
             try
             {
                 runProcess(info);

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 = Package.Location,
+                    SubTitle = "UWP Application",
                     Icon = Logo,
                     Score = score,
                     ContextData = this,
@@ -299,12 +299,6 @@ public Result Result(string query, IPublicAPI api)
                     result.Title = Description;
                     result.TitleHighlightData = StringMatcher.FuzzySearch(query, Description).MatchData;
                 }
-                else if (!string.IsNullOrEmpty(Description))
-                {
-                    var title = $"{DisplayName}: {Description}";
-                    result.Title = title;
-                    result.TitleHighlightData = StringMatcher.FuzzySearch(query, title).MatchData;
-                }
                 else
                 {
                     result.Title = DisplayName;

diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs b/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs
@@ -11,7 +11,6 @@
 using Shell;
 using Wox.Infrastructure;
 using Wox.Plugin.Program.Logger;
-using Wox.Plugin.SharedCommands;
 
 namespace Wox.Plugin.Program.Programs
 {
@@ -22,6 +21,7 @@ public class Win32 : IProgram
         public string UniqueIdentifier { get; set; }
         public string IcoPath { get; set; }
         public string FullPath { get; set; }
+        public string LnkResolvedPath { get; set; }
         public string ParentDirectory { get; set; }
         public string ExecutableName { get; set; }
         public string Description { get; set; }
@@ -53,7 +53,7 @@ public Result Result(string query, IPublicAPI api)
 
             var result = new Result
             {
-                SubTitle = FullPath,
+                SubTitle = "Win32 Application",
                 IcoPath = IcoPath,
                 Score = score,
                 ContextData = this,
@@ -78,12 +78,6 @@ public Result Result(string query, IPublicAPI api)
                 result.Title = Description;
                 result.TitleHighlightData = StringMatcher.FuzzySearch(query, Description).MatchData;
             }
-            else if (!string.IsNullOrEmpty(Description))
-            {
-                var title = $"{Name}: {Description}";
-                result.Title = title;
-                result.TitleHighlightData = StringMatcher.FuzzySearch(query, title).MatchData;
-            }
             else
             {
                 result.Title = Name;
@@ -196,6 +190,9 @@ private static Win32 LnkProgram(string path)
                     var extension = Extension(target);
                     if (extension == ExeExtension && File.Exists(target))
                     {
+                        program.LnkResolvedPath = program.FullPath;
+                        program.FullPath = target;
+
                         buffer = new StringBuilder(MAX_PATH);
                         link.GetDescription(buffer, MAX_PATH);
                         var description = buffer.ToString();
@@ -356,8 +353,11 @@ 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 programs = programs1.Concat(programs2).Where(p => p.Valid);
-            return programs;
+            var allValidPrograms = programs1.Concat(programs2).Where(p => p.Valid);
+            //var programsWithLnk = allValidPrograms.Where(x => !string.IsNullOrEmpty(x.LnkResolvedPath));
+
+
+            return allValidPrograms;
         }
 
         private static ParallelQuery<Win32> AppPathsPrograms(string[] suffixes)