Update search classes with keyword

Odotocodot · Odotocodot · commit 41ad0a4dc0d1 · 2025-08-02T17:25:44.000+01:00
diff --git a/Flow.Launcher.Plugin.OneNote/Main.cs b/Flow.Launcher.Plugin.OneNote/Main.cs
@@ -23,7 +23,6 @@ public class Main : IAsyncPlugin, IContextMenu, ISettingProvider, IDisposable
         private static Main instance;
         
         private Query currentQuery;
-        private Search.SearchManager sm2;
 
         public Task InitAsync(PluginInitContext context)
         {
diff --git a/Flow.Launcher.Plugin.OneNote/Search/DefaultSearch.cs b/Flow.Launcher.Plugin.OneNote/Search/DefaultSearch.cs
@@ -6,7 +6,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search
 {
 	public class DefaultSearch : SearchBase
 	{
-		public DefaultSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator) : base(context, settings, resultCreator, null) { }
+		public DefaultSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator) 
+			: base(context, settings, resultCreator, null) { }
 
 		public override List<Result> GetResults(string query)
 		{
diff --git a/Flow.Launcher.Plugin.OneNote/Search/NotebookExplorer.cs b/Flow.Launcher.Plugin.OneNote/Search/NotebookExplorer.cs
@@ -9,8 +9,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search
 	public class NotebookExplorer : SearchBase
 	{
 		private readonly TitleSearch titleSearch;
-		public NotebookExplorer(PluginInitContext context, Settings settings, ResultCreator resultCreator, TitleSearch titleSearch) : base(context,
-			settings, resultCreator, () => settings.Keywords.NotebookExplorer)
+		public NotebookExplorer(PluginInitContext context, Settings settings, ResultCreator resultCreator, TitleSearch titleSearch) 
+			: base(context, settings, resultCreator, settings.Keywords.NotebookExplorer)
 		{
 			this.titleSearch = titleSearch;
 		}
@@ -22,8 +22,8 @@ public override List<Result> GetResults(string query)
 
 			List<Result> results = search switch
 			{
-				{ } when search.StartsWith(Keywords.TitleSearch) && parent is not OneNotePage => titleSearch.Filter(search, parent, collection),
-				{ } when search.StartsWith(Keywords.ScopedSearch) && parent is INotebookOrSectionGroup => ScopedSearch(search, parent),
+				{ } when search.StartsWithOrd(Keywords.TitleSearch) && parent is not OneNotePage => titleSearch.Filter(search, parent, collection),
+				{ } when search.StartsWithOrd(Keywords.ScopedSearch) && parent is INotebookOrSectionGroup => ScopedSearch(search, parent),
 				{ } when !string.IsNullOrWhiteSpace(search) => Explorer(search, parent, collection),
 				_  => ShowAll(parent, collection),
 			};
@@ -35,8 +35,8 @@ public override List<Result> GetResults(string query)
 			result.Title = $"Open \"{parent.Name}\" in OneNote";
 			result.SubTitle = search switch
 			{
-				{ } when search.StartsWith(Keywords.TitleSearch) => $"Now searching by title in \"{parent.Name}\"",
-				{ } when search.StartsWith(Keywords.ScopedSearch) => $"Now searching all pages in \"{parent.Name}\"",
+				{ } when search.StartsWithOrd(Keywords.TitleSearch) => $"Now searching by title in \"{parent.Name}\"",
+				{ } when search.StartsWithOrd(Keywords.ScopedSearch) => $"Now searching all pages in \"{parent.Name}\"",
 				_ => $"Use \'{Keywords.ScopedSearch}\' to search this item. Use \'{Keywords.TitleSearch}\' to search by title in this item",
 			};
 
diff --git a/Flow.Launcher.Plugin.OneNote/Search/RecentPages.cs b/Flow.Launcher.Plugin.OneNote/Search/RecentPages.cs
@@ -6,7 +6,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search
 {
 	public class RecentPages : SearchBase
 	{
-		public RecentPages(PluginInitContext context, Settings settings, ResultCreator resultCreator) : base(context, settings, resultCreator, () => settings.Keywords.RecentPages) { }
+		public RecentPages(PluginInitContext context, Settings settings, ResultCreator resultCreator) 
+			: base(context, settings, resultCreator, settings.Keywords.RecentPages) { }
 
 		public override List<Result> GetResults(string query)
 		{
diff --git a/Flow.Launcher.Plugin.OneNote/Search/SearchBase.cs b/Flow.Launcher.Plugin.OneNote/Search/SearchBase.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Flow.Launcher.Plugin.OneNote.Search
@@ -8,15 +7,14 @@ public abstract class SearchBase
 		protected readonly PluginInitContext context;
 		protected readonly Settings settings;
 		protected readonly ResultCreator resultCreator;
-		private readonly Func<string> keywordGetter;
-		protected SearchBase(PluginInitContext context, Settings settings, ResultCreator resultCreator, Func<string> keywordGetter)
+		public readonly Keyword Keyword;
+		protected SearchBase(PluginInitContext context, Settings settings, ResultCreator resultCreator, Keyword keyword)
 		{
 			this.context = context;
 			this.settings = settings;
 			this.resultCreator = resultCreator;
-			this.keywordGetter = keywordGetter;
+			Keyword = keyword;
 		}
-		public string Keyword => keywordGetter();
 		protected Keywords Keywords => settings.Keywords;
 		public abstract List<Result> GetResults(string query);
 	}
diff --git a/Flow.Launcher.Plugin.OneNote/Search/SearchExtensions.cs b/Flow.Launcher.Plugin.OneNote/Search/SearchExtensions.cs
@@ -41,7 +41,6 @@ public static IEnumerable<T> FilterBySettings<T>(this IEnumerable<T> source, Set
 			}
 		}
 
-		//TODO: implement
 		public static bool StartsWithOrd(this string str, string value)
 		{
 			return str.StartsWith(value, StringComparison.Ordinal);
diff --git a/Flow.Launcher.Plugin.OneNote/Search/SearchManager.cs b/Flow.Launcher.Plugin.OneNote/Search/SearchManager.cs
@@ -4,16 +4,13 @@ namespace Flow.Launcher.Plugin.OneNote.Search
 {
 	public class SearchManager
 	{
-		private readonly Settings settings;
-		
 		private readonly TitleSearch titleSearch;
 		private readonly NotebookExplorer notebookExplorer;
 		private readonly DefaultSearch defaultSearch;
 		private readonly RecentPages recentPages;
 
 		public SearchManager(PluginInitContext context, Settings settings, ResultCreator resultCreator)
 		{
-			this.settings = settings;
 			titleSearch = new TitleSearch(context, settings, resultCreator);
 			notebookExplorer = new NotebookExplorer(context, settings, resultCreator, titleSearch);
 			recentPages = new RecentPages(context, settings, resultCreator);
@@ -25,16 +22,11 @@ public List<Result> Query(string search)
 		{
 			return search switch
 			{
-				{ } when search.StartsWith(titleSearch.Keyword) => titleSearch.GetResults(search),
-				{ } when search.StartsWith(notebookExplorer.Keyword) => notebookExplorer.GetResults(search),
-				{ } when search.StartsWith(recentPages.Keyword) => recentPages.GetResults(search),
+				{ } when search.StartsWithOrd(titleSearch.Keyword) => titleSearch.GetResults(search),
+				{ } when search.StartsWithOrd(notebookExplorer.Keyword) => notebookExplorer.GetResults(search),
+				{ } when search.StartsWithOrd(recentPages.Keyword) => recentPages.GetResults(search),
 				_ => defaultSearch.GetResults(search!),
 			};
 		}
 	}
-	
-	// public record PluginState(PluginInitContext Context, Settings Settings, ResultCreator ResultCreator)
-	// {
-	// 	public Keywords Keywords => Settings.Keywords;
-	// }
 }
diff --git a/Flow.Launcher.Plugin.OneNote/Search/TitleSearch.cs b/Flow.Launcher.Plugin.OneNote/Search/TitleSearch.cs
@@ -7,8 +7,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search
 {
 	public class TitleSearch : SearchBase
 	{
-		public TitleSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator) : base(context, settings, resultCreator,
-			() => settings.Keywords.TitleSearch) { }
+		public TitleSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator) 
+			: base(context, settings, resultCreator, settings.Keywords.TitleSearch) { }
 
 		public override List<Result> GetResults(string query) => Filter(query, null, OneNoteApplication.GetNotebooks());
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public class Main : IAsyncPlugin, IContextMenu, ISettingProvider, IDisposable`
`23`	`23`	`private static Main instance;`
`24`	`24`
`25`	`25`	`private Query currentQuery;`
`26`		`- private Search.SearchManager sm2;`
`27`	`26`
`28`	`27`	`public Task InitAsync(PluginInitContext context)`
`29`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search`
`6`	`6`	`{`
`7`	`7`	`public class DefaultSearch : SearchBase`
`8`	`8`	`{`
`9`		`- public DefaultSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator) : base(context, settings, resultCreator, null) { }`
	`9`	`+ public DefaultSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator)`
	`10`	`+ : base(context, settings, resultCreator, null) { }`
`10`	`11`
`11`	`12`	`public override List<Result> GetResults(string query)`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search`
`9`	`9`	`public class NotebookExplorer : SearchBase`
`10`	`10`	`{`
`11`	`11`	`private readonly TitleSearch titleSearch;`
`12`		`- public NotebookExplorer(PluginInitContext context, Settings settings, ResultCreator resultCreator, TitleSearch titleSearch) : base(context,`
`13`		`- settings, resultCreator, () => settings.Keywords.NotebookExplorer)`
	`12`	`+ public NotebookExplorer(PluginInitContext context, Settings settings, ResultCreator resultCreator, TitleSearch titleSearch)`
	`13`	`+ : base(context, settings, resultCreator, settings.Keywords.NotebookExplorer)`
`14`	`14`	`{`
`15`	`15`	`this.titleSearch = titleSearch;`
`16`	`16`	`}`
`@@ -22,8 +22,8 @@ public override List<Result> GetResults(string query)`
`22`	`22`
`23`	`23`	`List<Result> results = search switch`
`24`	`24`	`{`
`25`		`- { } when search.StartsWith(Keywords.TitleSearch) && parent is not OneNotePage => titleSearch.Filter(search, parent, collection),`
`26`		`- { } when search.StartsWith(Keywords.ScopedSearch) && parent is INotebookOrSectionGroup => ScopedSearch(search, parent),`
	`25`	`+ { } when search.StartsWithOrd(Keywords.TitleSearch) && parent is not OneNotePage => titleSearch.Filter(search, parent, collection),`
	`26`	`+ { } when search.StartsWithOrd(Keywords.ScopedSearch) && parent is INotebookOrSectionGroup => ScopedSearch(search, parent),`
`27`	`27`	`{ } when !string.IsNullOrWhiteSpace(search) => Explorer(search, parent, collection),`
`28`	`28`	`_ => ShowAll(parent, collection),`
`29`	`29`	`};`
`@@ -35,8 +35,8 @@ public override List<Result> GetResults(string query)`
`35`	`35`	`result.Title = $"Open \"{parent.Name}\" in OneNote";`
`36`	`36`	`result.SubTitle = search switch`
`37`	`37`	`{`
`38`		`- { } when search.StartsWith(Keywords.TitleSearch) => $"Now searching by title in \"{parent.Name}\"",`
`39`		`- { } when search.StartsWith(Keywords.ScopedSearch) => $"Now searching all pages in \"{parent.Name}\"",`
	`38`	`+ { } when search.StartsWithOrd(Keywords.TitleSearch) => $"Now searching by title in \"{parent.Name}\"",`
	`39`	`+ { } when search.StartsWithOrd(Keywords.ScopedSearch) => $"Now searching all pages in \"{parent.Name}\"",`
`40`	`40`	`_ => $"Use \'{Keywords.ScopedSearch}\' to search this item. Use \'{Keywords.TitleSearch}\' to search by title in this item",`
`41`	`41`	`};`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search`
`6`	`6`	`{`
`7`	`7`	`public class RecentPages : SearchBase`
`8`	`8`	`{`
`9`		`- public RecentPages(PluginInitContext context, Settings settings, ResultCreator resultCreator) : base(context, settings, resultCreator, () => settings.Keywords.RecentPages) { }`
	`9`	`+ public RecentPages(PluginInitContext context, Settings settings, ResultCreator resultCreator)`
	`10`	`+ : base(context, settings, resultCreator, settings.Keywords.RecentPages) { }`
`10`	`11`
`11`	`12`	`public override List<Result> GetResults(string query)`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public static IEnumerable<T> FilterBySettings<T>(this IEnumerable<T> source, Set`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- //TODO: implement`
`45`	`44`	`public static bool StartsWithOrd(this string str, string value)`
`46`	`45`	`{`
`47`	`46`	`return str.StartsWith(value, StringComparison.Ordinal);`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,13 @@ namespace Flow.Launcher.Plugin.OneNote.Search`
`4`	`4`	`{`
`5`	`5`	`public class SearchManager`
`6`	`6`	`{`
`7`		`- private readonly Settings settings;`
`8`		`-`
`9`	`7`	`private readonly TitleSearch titleSearch;`
`10`	`8`	`private readonly NotebookExplorer notebookExplorer;`
`11`	`9`	`private readonly DefaultSearch defaultSearch;`
`12`	`10`	`private readonly RecentPages recentPages;`
`13`	`11`
`14`	`12`	`public SearchManager(PluginInitContext context, Settings settings, ResultCreator resultCreator)`
`15`	`13`	`{`
`16`		`- this.settings = settings;`
`17`	`14`	`titleSearch = new TitleSearch(context, settings, resultCreator);`
`18`	`15`	`notebookExplorer = new NotebookExplorer(context, settings, resultCreator, titleSearch);`
`19`	`16`	`recentPages = new RecentPages(context, settings, resultCreator);`
`@@ -25,16 +22,11 @@ public List<Result> Query(string search)`
`25`	`22`	`{`
`26`	`23`	`return search switch`
`27`	`24`	`{`
`28`		`- { } when search.StartsWith(titleSearch.Keyword) => titleSearch.GetResults(search),`
`29`		`- { } when search.StartsWith(notebookExplorer.Keyword) => notebookExplorer.GetResults(search),`
`30`		`- { } when search.StartsWith(recentPages.Keyword) => recentPages.GetResults(search),`
	`25`	`+ { } when search.StartsWithOrd(titleSearch.Keyword) => titleSearch.GetResults(search),`
	`26`	`+ { } when search.StartsWithOrd(notebookExplorer.Keyword) => notebookExplorer.GetResults(search),`
	`27`	`+ { } when search.StartsWithOrd(recentPages.Keyword) => recentPages.GetResults(search),`
`31`	`28`	`_ => defaultSearch.GetResults(search!),`
`32`	`29`	`};`
`33`	`30`	`}`
`34`	`31`	`}`
`35`		`-`
`36`		`- // public record PluginState(PluginInitContext Context, Settings Settings, ResultCreator ResultCreator)`
`37`		`- // {`
`38`		`- // public Keywords Keywords => Settings.Keywords;`
`39`		`- // }`
`40`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ namespace Flow.Launcher.Plugin.OneNote.Search`
`7`	`7`	`{`
`8`	`8`	`public class TitleSearch : SearchBase`
`9`	`9`	`{`
`10`		`- public TitleSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator) : base(context, settings, resultCreator,`
`11`		`- () => settings.Keywords.TitleSearch) { }`
	`10`	`+ public TitleSearch(PluginInitContext context, Settings settings, ResultCreator resultCreator)`
	`11`	`+ : base(context, settings, resultCreator, settings.Keywords.TitleSearch) { }`
`12`	`12`
`13`	`13`	`public override List<Result> GetResults(string query) => Filter(query, null, OneNoteApplication.GetNotebooks());`
`14`	`14`