Merge pull request #447 from Flow-Launcher/optionHideDescription

jjw24 · web-flow · commit d813a4732db1 · 2021-05-21T06:59:30.000+10:00
Implement Option to disable program description
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -14,6 +14,7 @@
     <system:String x:Key="flowlauncher_plugin_program_indexing">Indexing</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_start">Index Start Menu</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_registry">Index Registry</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_description">Enable Program Description</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_header">Suffixes</system:String>
     <system:String x:Key="flowlauncher_plugin_program_max_depth_header">Max Depth</system:String>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/zh-cn.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/zh-cn.xaml
@@ -14,6 +14,7 @@
     <system:String x:Key="flowlauncher_plugin_program_indexing">索引中</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_start">索引开始菜单</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_registry">索引注册表</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_description">启用程序描述</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_header">后缀</system:String>
     <system:String x:Key="flowlauncher_plugin_program_max_depth_header">最大深度</system:String>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
@@ -63,14 +63,14 @@ private void InitializeAppInfo()
             if (hResult == Hresult.Ok)
             {
                 var apps = new List<Application>();
-             
+
                 List<AppxPackageHelper.IAppxManifestApplication> _apps = _helper.getAppsFromManifest(stream);
-                foreach(var _app in _apps)
+                foreach (var _app in _apps)
                 {
                     var app = new Application(_app, this);
                     apps.Add(app);
                 }
-                
+
                 Apps = apps.Where(a => a.AppListEntry != "none").ToArray();
             }
             else
@@ -275,7 +275,7 @@ public Result Result(string query, IPublicAPI api)
                 MatchResult matchResult;
 
                 // We suppose Name won't be null
-                if (Description == null || Name.StartsWith(Description))
+                if (!Main._settings.EnableDescription || Description == null || Name.StartsWith(Description))
                 {
                     title = Name;
                     matchResult = StringMatcher.FuzzySearch(query, title);
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -54,51 +54,43 @@ public class Win32 : IProgram, IEquatable<Win32>
         public Result Result(string query, IPublicAPI api)
         {
             string title;
-
-            var nameMatchResult = StringMatcher.FuzzySearch(query, Name);
-            var descriptionMatchResult = StringMatcher.FuzzySearch(query, Description);
-
-            var pathMatchResult = new MatchResult(false, 0, new List<int>(), 0);
-            if (ExecutableName != null) // only lnk program will need this one
-                pathMatchResult = StringMatcher.FuzzySearch(query, ExecutableName);
-
-            MatchResult matchResult = nameMatchResult;
-
-            if (nameMatchResult.Score < descriptionMatchResult.Score)
-                matchResult = descriptionMatchResult;
-
-            if (!matchResult.IsSearchPrecisionScoreMet())
-            {
-                if (pathMatchResult.IsSearchPrecisionScoreMet())
-                    matchResult = pathMatchResult;
-                else return null;
-            }
+            MatchResult matchResult;
 
             // We suppose Name won't be null
-            if (Description == null || Name.StartsWith(Description))
+            if (!Main._settings.EnableDescription || Description == null || Name.StartsWith(Description))
             {
                 title = Name;
+                matchResult = StringMatcher.FuzzySearch(query, title);
             }
             else if (Description.StartsWith(Name))
             {
                 title = Description;
+                matchResult = StringMatcher.FuzzySearch(query, Description);
             }
             else
             {
                 title = $"{Name}: {Description}";
-
-                if (matchResult == descriptionMatchResult)
+                var nameMatch = StringMatcher.FuzzySearch(query, Name);
+                var desciptionMatch = StringMatcher.FuzzySearch(query, Description);
+                if (desciptionMatch.Score > nameMatch.Score)
                 {
-                    for (int i = 0; i < descriptionMatchResult.MatchData.Count; i++)
+                    for (int i = 0; i < desciptionMatch.MatchData.Count; i++)
                     {
-                        matchResult.MatchData[i] += Name.Length + 2; // 2 is ": "
+                        desciptionMatch.MatchData[i] += Name.Length + 2; // 2 is ": "
                     }
+                    matchResult = desciptionMatch;
                 }
+                else matchResult = nameMatch;
             }
 
-            if (matchResult == pathMatchResult)
+            if (!matchResult.IsSearchPrecisionScoreMet())
             {
-                // path Match won't have valid highlight data
+                if (ExecutableName != null) // only lnk program will need this one
+                    matchResult = StringMatcher.FuzzySearch(query, ExecutableName);
+
+                if (!matchResult.IsSearchPrecisionScoreMet())
+                    return null;
+
                 matchResult.MatchData = new List<int>();
             }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
@@ -13,6 +13,7 @@ public class Settings
 
         public bool EnableStartMenuSource { get; set; } = true;
 
+        public bool EnableDescription { get; set; } = true;
         public bool EnableRegistrySource { get; set; } = true;
         public string CustomizedExplorer { get; set; } = Explorer;
         public string CustomizedArgs { get; set; } = ExplorerArgs;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -4,19 +4,21 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:program="clr-namespace:Flow.Launcher.Plugin.Program"
+             DataContext="{Binding RelativeSource={RelativeSource Self}}"
              mc:Ignorable="d" 
              d:DesignHeight="404.508" d:DesignWidth="600">
     <Grid Margin="10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="75"/>
+            <RowDefinition Height="120"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="50"/>
             <RowDefinition Height="50"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Stretch">
-            <StackPanel Orientation="Vertical" Width="205">
-                <CheckBox Name="StartMenuEnabled" Click="StartMenuEnabled_Click" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_start}" />
-                <CheckBox Name="RegistryEnabled" Click="RegistryEnabled_Click"  Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_registry}" />
+            <StackPanel Orientation="Vertical" Width="250">
+                <CheckBox Name="StartMenuEnabled" IsChecked="{Binding EnableStartMenuSource}" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_start}" />
+                <CheckBox Name="RegistryEnabled" IsChecked="{Binding EnableRegistrySource}"  Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_registry}" />
+                <CheckBox Name="DescriptionEnabled" IsChecked="{Binding EnableDescription}" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_enable_description}" />
             </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button Height="31" HorizontalAlignment="Right" Margin="10" Width="100" x:Name="btnLoadAllProgramSource" Click="btnLoadAllProgramSource_OnClick" Content="{DynamicResource flowlauncher_plugin_program_all_programs}" />
@@ -79,10 +81,10 @@
             <TextBlock Text="{DynamicResource flowlauncher_plugin_program_customizedexplorer}" VerticalAlignment="Center" FontSize="15"
                    ToolTip= "{DynamicResource flowlauncher_plugin_program_tooltip_customizedexplorer}"/>
             <TextBox Margin="10,0,10,0" TextWrapping="NoWrap" VerticalAlignment="Center" Width="200" Height="30" FontSize="15"
-                 TextChanged="CustomizeExplorer" x:Name="CustomizeExplorerBox"/>
+                 Text="{Binding CustomizedExplorerPath}" x:Name="CustomizeExplorerBox"/>
             <TextBlock Text="{DynamicResource flowlauncher_plugin_program_args}" VerticalAlignment="Center" FontSize="15"
                        ToolTip="{DynamicResource flowlauncher_plugin_program_tooltip_args}" />
-            <TextBox Margin="10,0,0,0" Width="135" Height="30" FontSize="15" x:Name="CustomizeArgsBox" TextChanged="CustomizeExplorerArgs"></TextBox>
+            <TextBox Margin="10,0,0,0" Width="135" Height="30" FontSize="15" x:Name="CustomizeArgsBox" Text="{Binding CustomizedExplorerArg}"></TextBox>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -27,25 +27,57 @@ public partial class ProgramSetting : UserControl
         // this as temporary holder for displaying all loaded programs sources. 
         internal static List<ProgramSource> ProgramSettingDisplayList { get; set; }
 
+        public bool EnableDescription
+        {
+            get => _settings.EnableDescription;
+            set => _settings.EnableDescription = value;
+        }
+
+        public bool EnableRegistrySource
+        {
+            get => _settings.EnableRegistrySource;
+            set
+            {
+                _settings.EnableRegistrySource = value;
+                ReIndexing();
+            }
+        }
+
+        public bool EnableStartMenuSource
+        {
+            get => _settings.EnableStartMenuSource;
+            set
+            {
+                _settings.EnableStartMenuSource = value;
+                ReIndexing();
+            }
+        }
+
+        public string CustomizedExplorerPath
+        {
+            get => _settings.CustomizedExplorer;
+            set => _settings.CustomizedExplorer = value;
+        }
+
+        public string CustomizedExplorerArg
+        {
+            get => _settings.CustomizedArgs;
+            set => _settings.CustomizedArgs = value;
+        }
+
         public ProgramSetting(PluginInitContext context, Settings settings, Win32[] win32s, UWP.Application[] uwps)
         {
             this.context = context;
-            InitializeComponent();
-            Loaded += Setting_Loaded;
             _settings = settings;
+            Loaded += Setting_Loaded;
+            InitializeComponent();
         }
 
         private void Setting_Loaded(object sender, RoutedEventArgs e)
         {
             ProgramSettingDisplayList = _settings.ProgramSources.LoadProgramSources();
             programSourceView.ItemsSource = ProgramSettingDisplayList;
 
-            StartMenuEnabled.IsChecked = _settings.EnableStartMenuSource;
-            RegistryEnabled.IsChecked = _settings.EnableRegistrySource;
-
-            CustomizeExplorerBox.Text = _settings.CustomizedExplorer;
-            CustomizeArgsBox.Text = _settings.CustomizedArgs;
-
             ViewRefresh();
         }
 
@@ -178,18 +210,6 @@ private void programSourceView_Drop(object sender, DragEventArgs e)
             }
         }
 
-        private void StartMenuEnabled_Click(object sender, RoutedEventArgs e)
-        {
-            _settings.EnableStartMenuSource = StartMenuEnabled.IsChecked ?? false;
-            ReIndexing();
-        }
-
-        private void RegistryEnabled_Click(object sender, RoutedEventArgs e)
-        {
-            _settings.EnableRegistrySource = RegistryEnabled.IsChecked ?? false;
-            ReIndexing();
-        }
-
         private void btnLoadAllProgramSource_OnClick(object sender, RoutedEventArgs e)
         {
             ProgramSettingDisplayList.LoadAllApplications();
diff --git a/Plugins/Flow.Launcher.Plugin.Program/plugin.json b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Program",
   "Description": "Search programs in Flow.Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.6",
+  "Version": "1.5.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,14 @@ private void InitializeAppInfo()`
`63`	`63`	`if (hResult == Hresult.Ok)`
`64`	`64`	`{`
`65`	`65`	`var apps = new List<Application>();`
`66`		`-`
	`66`	`+`
`67`	`67`	`List<AppxPackageHelper.IAppxManifestApplication> _apps = _helper.getAppsFromManifest(stream);`
`68`		`- foreach(var _app in _apps)`
	`68`	`+ foreach (var _app in _apps)`
`69`	`69`	`{`
`70`	`70`	`var app = new Application(_app, this);`
`71`	`71`	`apps.Add(app);`
`72`	`72`	`}`
`73`		`-`
	`73`	`+`
`74`	`74`	`Apps = apps.Where(a => a.AppListEntry != "none").ToArray();`
`75`	`75`	`}`
`76`	`76`	`else`
`@@ -275,7 +275,7 @@ public Result Result(string query, IPublicAPI api)`
`275`	`275`	`MatchResult matchResult;`
`276`	`276`
`277`	`277`	`// We suppose Name won't be null`
`278`		`- if (Description == null \|\| Name.StartsWith(Description))`
	`278`	`+ if (!Main._settings.EnableDescription \|\| Description == null \|\| Name.StartsWith(Description))`
`279`	`279`	`{`
`280`	`280`	`title = Name;`
`281`	`281`	`matchResult = StringMatcher.FuzzySearch(query, title);`
Original file line number	Diff line number	Diff line change
`@@ -54,51 +54,43 @@ public class Win32 : IProgram, IEquatable<Win32>`
`54`	`54`	`public Result Result(string query, IPublicAPI api)`
`55`	`55`	`{`
`56`	`56`	`string title;`
`57`		`-`
`58`		`- var nameMatchResult = StringMatcher.FuzzySearch(query, Name);`
`59`		`- var descriptionMatchResult = StringMatcher.FuzzySearch(query, Description);`
`60`		`-`
`61`		`- var pathMatchResult = new MatchResult(false, 0, new List<int>(), 0);`
`62`		`- if (ExecutableName != null) // only lnk program will need this one`
`63`		`- pathMatchResult = StringMatcher.FuzzySearch(query, ExecutableName);`
`64`		`-`
`65`		`- MatchResult matchResult = nameMatchResult;`
`66`		`-`
`67`		`- if (nameMatchResult.Score < descriptionMatchResult.Score)`
`68`		`- matchResult = descriptionMatchResult;`
`69`		`-`
`70`		`- if (!matchResult.IsSearchPrecisionScoreMet())`
`71`		`- {`
`72`		`- if (pathMatchResult.IsSearchPrecisionScoreMet())`
`73`		`- matchResult = pathMatchResult;`
`74`		`- else return null;`
`75`		`- }`
	`57`	`+ MatchResult matchResult;`
`76`	`58`
`77`	`59`	`// We suppose Name won't be null`
`78`		`- if (Description == null \|\| Name.StartsWith(Description))`
	`60`	`+ if (!Main._settings.EnableDescription \|\| Description == null \|\| Name.StartsWith(Description))`
`79`	`61`	`{`
`80`	`62`	`title = Name;`
	`63`	`+ matchResult = StringMatcher.FuzzySearch(query, title);`
`81`	`64`	`}`
`82`	`65`	`else if (Description.StartsWith(Name))`
`83`	`66`	`{`
`84`	`67`	`title = Description;`
	`68`	`+ matchResult = StringMatcher.FuzzySearch(query, Description);`
`85`	`69`	`}`
`86`	`70`	`else`
`87`	`71`	`{`
`88`	`72`	`title = $"{Name}: {Description}";`
`89`		`-`
`90`		`- if (matchResult == descriptionMatchResult)`
	`73`	`+ var nameMatch = StringMatcher.FuzzySearch(query, Name);`
	`74`	`+ var desciptionMatch = StringMatcher.FuzzySearch(query, Description);`
	`75`	`+ if (desciptionMatch.Score > nameMatch.Score)`
`91`	`76`	`{`
`92`		`- for (int i = 0; i < descriptionMatchResult.MatchData.Count; i++)`
	`77`	`+ for (int i = 0; i < desciptionMatch.MatchData.Count; i++)`
`93`	`78`	`{`
`94`		`- matchResult.MatchData[i] += Name.Length + 2; // 2 is ": "`
	`79`	`+ desciptionMatch.MatchData[i] += Name.Length + 2; // 2 is ": "`
`95`	`80`	`}`
	`81`	`+ matchResult = desciptionMatch;`
`96`	`82`	`}`
	`83`	`+ else matchResult = nameMatch;`
`97`	`84`	`}`
`98`	`85`
`99`		`- if (matchResult == pathMatchResult)`
	`86`	`+ if (!matchResult.IsSearchPrecisionScoreMet())`
`100`	`87`	`{`
`101`		`- // path Match won't have valid highlight data`
	`88`	`+ if (ExecutableName != null) // only lnk program will need this one`
	`89`	`+ matchResult = StringMatcher.FuzzySearch(query, ExecutableName);`
	`90`	`+`
	`91`	`+ if (!matchResult.IsSearchPrecisionScoreMet())`
	`92`	`+ return null;`
	`93`	`+`
`102`	`94`	`matchResult.MatchData = new List<int>();`
`103`	`95`	`}`
`104`	`96`