From 9d3f0d45d5d1f0ece5a337f0fa3d221bbfa02561 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 6 Sep 2019 08:06:51 +1000
Subject: [PATCH] Add display of all loaded applications

---
 Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs |  2 +-
 Plugins/Wox.Plugin.Program/Main.cs                  | 13 +++++++++++++
 Plugins/Wox.Plugin.Program/ProgramSetting.xaml      |  8 ++++++++
 Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs   |  9 +++++++++
 Plugins/Wox.Plugin.Program/Programs/UWP.cs          |  6 +++---
 Plugins/Wox.Plugin.Program/Programs/Win32.cs        |  8 ++++----
 Plugins/Wox.Plugin.Program/Settings.cs              |  7 +++++--
 7 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
index 063e1166a6..a8b090b86e 100644
--- a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
@@ -54,7 +54,7 @@ namespace Wox.Plugin.Program
                 {
                     Location = Directory.Text,
                 };
-                _settings.ProgramSources.Add(source);
+                _settings.ProgramSources.Insert(0, source);
             }
             else
             {
diff --git a/Plugins/Wox.Plugin.Program/Main.cs b/Plugins/Wox.Plugin.Program/Main.cs
index 880e881c92..bdeb46576a 100644
--- a/Plugins/Wox.Plugin.Program/Main.cs
+++ b/Plugins/Wox.Plugin.Program/Main.cs
@@ -137,6 +137,19 @@ namespace Wox.Plugin.Program
             Task.WaitAll(t1, t2);
         }
 
+        public static void AddLoadedApplicationsToSettings()
+        {
+            _win32s
+                .Where(t1 => !_settings.ProgramSources.Any(x => x.Name == t1.Name))
+                .ToList()
+                .ForEach(t1 => _settings.ProgramSources.Add(new Settings.ProgramSource (){Name = t1.Name, Location = t1.ParentDirectory }));
+
+            _uwps
+                .Where(t1 => !_settings.ProgramSources.Any(x => x.Name == t1.DisplayName))
+                .ToList()
+                .ForEach(t1 => _settings.ProgramSources.Add(new Settings.ProgramSource() { Name = t1.DisplayName, Location = t1.Package.Location }));            
+        }
+
         public Control CreateSettingPanel()
         {
             return new ProgramSetting(_context, _settings);
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
index 2636e349f4..f1aa7ae609 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
@@ -25,6 +25,13 @@
             Drop="programSourceView_Drop" >
             <ListView.View>
                 <GridView>
+                    <GridViewColumn Header="Name" Width="150">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}"/>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
                     <GridViewColumn Header="{DynamicResource wox_plugin_program_location}" Width="550">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
@@ -44,6 +51,7 @@
                 <Button x:Name="btnDeleteProgramSource" Click="btnDeleteProgramSource_OnClick" Width="100" Margin="10" Content="{DynamicResource wox_plugin_program_delete}"/>
                 <Button x:Name="btnEditProgramSource" Click="btnEditProgramSource_OnClick" Width="100" Margin="10" Content="{DynamicResource wox_plugin_program_edit}"/>
                 <Button x:Name="btnAddProgramSource" Click="btnAddProgramSource_OnClick" Width="100" Margin="10" Content="{DynamicResource wox_plugin_program_add}"/>
+                <Button x:Name="btnLoadAllProgramSource" Click="btnLoadAllProgramSource_OnClick" Width="100" Margin="10" Content="Load All"/>
             </StackPanel>
         </DockPanel>
     </Grid>
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
index e6ad4106bf..d8024379c2 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
@@ -47,6 +47,8 @@ namespace Wox.Plugin.Program
             {
                 ReIndexing();
             }
+
+            programSourceView.Items.Refresh();
         }
 
         private void btnDeleteProgramSource_OnClick(object sender, RoutedEventArgs e)
@@ -142,5 +144,12 @@ namespace Wox.Plugin.Program
             _settings.EnableRegistrySource = RegistryEnabled.IsChecked ?? false;
             ReIndexing();
         }
+
+        private void btnLoadAllProgramSource_OnClick(object sender, RoutedEventArgs e)
+        {
+            Main.AddLoadedApplicationsToSettings();
+
+            programSourceView.Items.Refresh();
+        }
     }
 }
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Program/Programs/UWP.cs b/Plugins/Wox.Plugin.Program/Programs/UWP.cs
index 2fce5165d6..d270aef859 100644
--- a/Plugins/Wox.Plugin.Program/Programs/UWP.cs
+++ b/Plugins/Wox.Plugin.Program/Programs/UWP.cs
@@ -207,12 +207,12 @@ namespace Wox.Plugin.Program.Programs
             if(enableProgramSourceOnly)
                 return applications
                         .Where(t1 => applicationsToRetainPaths
-                                        .Any(x => x.LocationFile == t1.Package.Location
-                                                && x.EnableIndexing))
+                                        .Any(x => x.Location == t1.Package.Location
+                                                && x.Enabled))
                         .Select(t1 => t1).ToArray();
 
             // Do not return if the application is disabled for indexing
-            return applications.Where(t1 => !applicationsToRetainPaths.Any(x => x.LocationFile == t1.Package.Location && !x.EnableIndexing))
+            return applications.Where(t1 => !applicationsToRetainPaths.Any(x => x.Location == t1.Package.Location && !x.Enabled))
                              .Select(t1 => t1).ToArray();
         }
 
diff --git a/Plugins/Wox.Plugin.Program/Programs/Win32.cs b/Plugins/Wox.Plugin.Program/Programs/Win32.cs
index 4e2c5b2c7a..855e1f4a43 100644
--- a/Plugins/Wox.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Wox.Plugin.Program/Programs/Win32.cs
@@ -263,15 +263,15 @@ namespace Wox.Plugin.Program.Programs
         private static ParallelQuery<Win32> UnregisteredPrograms(List<Settings.ProgramSource> sources, string[] suffixes)
         {
             var list = new List<string>();
-            sources.Where(s => Directory.Exists(s.Location) && s.EnableIndexing)
+            sources.Where(s => Directory.Exists(s.Location) && s.Enabled)
                 .SelectMany(s => ProgramPaths(s.Location, suffixes))
                 .ToList()
                 .ForEach(x => list.Add(x));            
 
-            sources.Where(x=> File.Exists(x.LocationFile) && x.EnableIndexing)
-                .Select(y => y.LocationFile)
+            sources.Where(s => File.Exists(s.Location) && s.Enabled)
+                .Select(s => s.Location)
                 .ToList()
-                .ForEach(z => list.Add(z));
+                .ForEach(x => list.Add(x));
 
             var paths = list.ToArray();
 
diff --git a/Plugins/Wox.Plugin.Program/Settings.cs b/Plugins/Wox.Plugin.Program/Settings.cs
index 12db7108dc..2fd4505d85 100644
--- a/Plugins/Wox.Plugin.Program/Settings.cs
+++ b/Plugins/Wox.Plugin.Program/Settings.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using Wox.Plugin.Program.Programs;
 
 namespace Wox.Plugin.Program
@@ -18,9 +19,11 @@ namespace Wox.Plugin.Program
 
         public class ProgramSource
         {
+            private string name;
+
             public string Location { get; set; }
-            public string LocationFile { get; set; }
-            public bool EnableIndexing { get; set; } = true;
+            public string Name { get => name ?? new DirectoryInfo(Location).Name; set => name = value; }
+            public bool Enabled { get; set; } = true;
         }
     }
 }