Add ForceReQuery method to Main.cs

Odotocodot · Odotocodot · commit dc170cad9357 · 2024-06-14T13:46:03.000+01:00
Also, an assortment of tweaks
diff --git a/Flow.Launcher.Plugin.OneNote/Main.cs b/Flow.Launcher.Plugin.OneNote/Main.cs
@@ -18,6 +18,9 @@ public class Main : IAsyncPlugin, IContextMenu, ISettingProvider, IDisposable
         private IconProvider iconProvider;
 
         private static SemaphoreSlim semaphore;
+        private static Main instance;
+        
+        private Query currentQuery;
         public Task InitAsync(PluginInitContext context)
         {
             this.context = context;
@@ -27,6 +30,7 @@ public Task InitAsync(PluginInitContext context)
             searchManager = new SearchManager(context, settings, resultCreator);
             semaphore = new SemaphoreSlim(1,1);
             context.API.VisibilityChanged += OnVisibilityChanged;
+            instance = this;
             return Task.CompletedTask;
         }
 
@@ -49,6 +53,7 @@ private static async Task OneNoteInitAsync(CancellationToken token = default)
         }
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {
+            currentQuery = query;
             var init = OneNoteInitAsync(token);
 
             if (string.IsNullOrEmpty(query.Search))
@@ -59,6 +64,11 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
             return searchManager.Query(query);
         }
 
+        public static void ForceReQuery()
+        {
+            instance.context.API.ChangeQuery(instance.currentQuery.RawQuery, true);
+        }
+
         public List<Result> LoadContextMenus(Result selectedResult)
         {
             return resultCreator.ContextMenu(selectedResult);
diff --git a/Flow.Launcher.Plugin.OneNote/ResultCreator.cs b/Flow.Launcher.Plugin.OneNote/ResultCreator.cs
@@ -208,10 +208,8 @@ public Result CreateOneNoteItemResult(IOneNoteItem item, bool actionIsAutoComple
         }
         
         
-        public Result CreatePageResult(OneNotePage page, string query)
-        {
-            return CreateOneNoteItemResult(page, false, string.IsNullOrWhiteSpace(query) ? null : context.API.FuzzySearch(query, page.Name).MatchData);
-        }
+        public Result CreatePageResult(OneNotePage page, string query) 
+            => CreateOneNoteItemResult(page, false, string.IsNullOrWhiteSpace(query) ? null : context.API.FuzzySearch(query, page.Name).MatchData);
 
         public Result CreateRecentPageResult(OneNotePage page)
         {
@@ -233,6 +231,7 @@ public Result CreateNewPageResult(string newPageName, OneNoteSection section)
                 Action = c =>
                 {
                     OneNoteApplication.CreatePage(section, newPageName, true);
+                    Main.ForceReQuery();
                     return true;
                 },
             };
@@ -268,7 +267,7 @@ public Result CreateNewSectionResult(string newSectionName, IOneNoteItem parent)
                             break;
                     }
 
-                    context.API.ChangeQuery(ActionKeyword, true);
+                    Main.ForceReQuery();
                     return true;
                 },
             };
@@ -304,7 +303,7 @@ public Result CreateNewSectionGroupResult(string newSectionGroupName, IOneNoteIt
                             break;
                     }
 
-                    context.API.ChangeQuery(ActionKeyword, true);
+                    Main.ForceReQuery();
                     return true;
                 },
             };
@@ -331,7 +330,7 @@ public Result CreateNewNotebookResult(string newNotebookName)
                     }
 
                     OneNoteApplication.CreateNotebook(newNotebookName, true);
-                    context.API.ChangeQuery(ActionKeyword, true);
+                    Main.ForceReQuery();
                     return true;
                 },
             };
@@ -368,6 +367,7 @@ public List<Result> ContextMenu(Result selectedResult)
         }
         public List<Result> NoItemsInCollection(List<Result> results, IOneNoteItem parent)
         {
+            // parent can be null if the collection only contains notebooks.
             switch (parent)
             {
                 case OneNoteNotebook:
diff --git a/Flow.Launcher.Plugin.OneNote/SearchManager.cs b/Flow.Launcher.Plugin.OneNote/SearchManager.cs
@@ -189,7 +189,6 @@ private List<Result> EmptySearch(IOneNoteItem parent, IEnumerable<IOneNoteItem>
                                                  .ToList();
                 if (results.Any()) 
                     return results;
-                // parent can be null if the collection only contains notebooks.
                 return resultCreator.NoItemsInCollection(results, parent);
             }
 
diff --git a/Flow.Launcher.Plugin.OneNote/UI/ViewModels/SettingsViewModel.cs b/Flow.Launcher.Plugin.OneNote/UI/ViewModels/SettingsViewModel.cs
@@ -38,6 +38,13 @@ public SettingsViewModel(PluginInitContext context, Settings settings, IconProvi
 		            CommandManager.InvalidateRequerySuggested();
 	            }
             };
+            settings.PropertyChanged += (_, args) =>
+			{
+	            if (args.PropertyName == nameof(Settings.IconTheme))
+	            {
+		            Main.ForceReQuery();
+	            }
+			};
             SelectedKeyword = Keywords[0];
         }
         public ICommand EditCommand { get; }
diff --git a/Flow.Launcher.Plugin.OneNote/UI/Views/ChangeKeywordWindow.xaml b/Flow.Launcher.Plugin.OneNote/UI/Views/ChangeKeywordWindow.xaml
@@ -10,7 +10,7 @@
     d:DataContext="{d:DesignInstance Type=vm:ChangeKeywordViewModel}"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
-    Loaded="WindowLoaded"
+    FocusManager.FocusedElement="{Binding ElementName=TextBox_NewKeyword}"
     ResizeMode="NoResize"
     SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
diff --git a/Flow.Launcher.Plugin.OneNote/UI/Views/ChangeKeywordWindow.xaml.cs b/Flow.Launcher.Plugin.OneNote/UI/Views/ChangeKeywordWindow.xaml.cs
@@ -10,10 +10,5 @@ public ChangeKeywordWindow(SettingsViewModel viewModel, PluginInitContext contex
             InitializeComponent();
             DataContext = new ChangeKeywordViewModel(viewModel, context, Close);
         }
-
-        private void WindowLoaded(object sender, RoutedEventArgs e)
-        {
-            TextBox_NewKeyword.Focus();
-        }
     }
 }
diff --git a/Flow.Launcher.Plugin.OneNote/UI/Views/SettingsView.xaml b/Flow.Launcher.Plugin.OneNote/UI/Views/SettingsView.xaml
@@ -126,18 +126,18 @@
                                 <Grid x:Name="GridImages">
                                     <Image
                                         Width="32"
-                                        UseLayoutRounding="True" 
-                                        SnapsToDevicePixels="True"
                                         Height="32"
-                                        Source="{Binding ImageUri}" />
+                                        SnapsToDevicePixels="True"
+                                        Source="{Binding ImageUri}"
+                                        UseLayoutRounding="True" />
                                     <Image
                                         Width="32"
-                                        UseLayoutRounding="True"
-                                        SnapsToDevicePixels="True"
                                         Height="32"
-                                        Source="{Binding ImageUri2}">
+                                        SnapsToDevicePixels="True"
+                                        Source="{Binding ImageUri2}"
+                                        UseLayoutRounding="True">
                                         <Image.Clip>
-                                            <RectangleGeometry Rect="14,0,18,32"></RectangleGeometry>
+                                            <RectangleGeometry Rect="14,0,18,32" />
                                         </Image.Clip>
                                     </Image>
                                 </Grid>

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ public class Main : IAsyncPlugin, IContextMenu, ISettingProvider, IDisposable`
`18`	`18`	`private IconProvider iconProvider;`
`19`	`19`
`20`	`20`	`private static SemaphoreSlim semaphore;`
	`21`	`+ private static Main instance;`
	`22`	`+`
	`23`	`+ private Query currentQuery;`
`21`	`24`	`public Task InitAsync(PluginInitContext context)`
`22`	`25`	`{`
`23`	`26`	`this.context = context;`
`@@ -27,6 +30,7 @@ public Task InitAsync(PluginInitContext context)`
`27`	`30`	`searchManager = new SearchManager(context, settings, resultCreator);`
`28`	`31`	`semaphore = new SemaphoreSlim(1,1);`
`29`	`32`	`context.API.VisibilityChanged += OnVisibilityChanged;`
	`33`	`+ instance = this;`
`30`	`34`	`return Task.CompletedTask;`
`31`	`35`	`}`
`32`	`36`
`@@ -49,6 +53,7 @@ private static async Task OneNoteInitAsync(CancellationToken token = default)`
`49`	`53`	`}`
`50`	`54`	`public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)`
`51`	`55`	`{`
	`56`	`+ currentQuery = query;`
`52`	`57`	`var init = OneNoteInitAsync(token);`
`53`	`58`
`54`	`59`	`if (string.IsNullOrEmpty(query.Search))`
`@@ -59,6 +64,11 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)`
`59`	`64`	`return searchManager.Query(query);`
`60`	`65`	`}`
`61`	`66`
	`67`	`+ public static void ForceReQuery()`
	`68`	`+ {`
	`69`	`+ instance.context.API.ChangeQuery(instance.currentQuery.RawQuery, true);`
	`70`	`+ }`
	`71`	`+`
`62`	`72`	`public List<Result> LoadContextMenus(Result selectedResult)`
`63`	`73`	`{`
`64`	`74`	`return resultCreator.ContextMenu(selectedResult);`
Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,8 @@ public Result CreateOneNoteItemResult(IOneNoteItem item, bool actionIsAutoComple`
`208`	`208`	`}`
`209`	`209`
`210`	`210`
`211`		`- public Result CreatePageResult(OneNotePage page, string query)`
`212`		`- {`
`213`		`- return CreateOneNoteItemResult(page, false, string.IsNullOrWhiteSpace(query) ? null : context.API.FuzzySearch(query, page.Name).MatchData);`
`214`		`- }`
	`211`	`+ public Result CreatePageResult(OneNotePage page, string query)`
	`212`	`+ => CreateOneNoteItemResult(page, false, string.IsNullOrWhiteSpace(query) ? null : context.API.FuzzySearch(query, page.Name).MatchData);`
`215`	`213`
`216`	`214`	`public Result CreateRecentPageResult(OneNotePage page)`
`217`	`215`	`{`
`@@ -233,6 +231,7 @@ public Result CreateNewPageResult(string newPageName, OneNoteSection section)`
`233`	`231`	`Action = c =>`
`234`	`232`	`{`
`235`	`233`	`OneNoteApplication.CreatePage(section, newPageName, true);`
	`234`	`+ Main.ForceReQuery();`
`236`	`235`	`return true;`
`237`	`236`	`},`
`238`	`237`	`};`
`@@ -268,7 +267,7 @@ public Result CreateNewSectionResult(string newSectionName, IOneNoteItem parent)`
`268`	`267`	`break;`
`269`	`268`	`}`
`270`	`269`
`271`		`- context.API.ChangeQuery(ActionKeyword, true);`
	`270`	`+ Main.ForceReQuery();`
`272`	`271`	`return true;`
`273`	`272`	`},`
`274`	`273`	`};`
`@@ -304,7 +303,7 @@ public Result CreateNewSectionGroupResult(string newSectionGroupName, IOneNoteIt`
`304`	`303`	`break;`
`305`	`304`	`}`
`306`	`305`
`307`		`- context.API.ChangeQuery(ActionKeyword, true);`
	`306`	`+ Main.ForceReQuery();`
`308`	`307`	`return true;`
`309`	`308`	`},`
`310`	`309`	`};`
`@@ -331,7 +330,7 @@ public Result CreateNewNotebookResult(string newNotebookName)`
`331`	`330`	`}`
`332`	`331`
`333`	`332`	`OneNoteApplication.CreateNotebook(newNotebookName, true);`
`334`		`- context.API.ChangeQuery(ActionKeyword, true);`
	`333`	`+ Main.ForceReQuery();`
`335`	`334`	`return true;`
`336`	`335`	`},`
`337`	`336`	`};`
`@@ -368,6 +367,7 @@ public List<Result> ContextMenu(Result selectedResult)`
`368`	`367`	`}`
`369`	`368`	`public List<Result> NoItemsInCollection(List<Result> results, IOneNoteItem parent)`
`370`	`369`	`{`
	`370`	`+ // parent can be null if the collection only contains notebooks.`
`371`	`371`	`switch (parent)`
`372`	`372`	`{`
`373`	`373`	`case OneNoteNotebook:`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@ private List<Result> EmptySearch(IOneNoteItem parent, IEnumerable<IOneNoteItem>`
`189`	`189`	`.ToList();`
`190`	`190`	`if (results.Any())`
`191`	`191`	`return results;`
`192`		`- // parent can be null if the collection only contains notebooks.`
`193`	`192`	`return resultCreator.NoItemsInCollection(results, parent);`
`194`	`193`	`}`
`195`	`194`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,13 @@ public SettingsViewModel(PluginInitContext context, Settings settings, IconProvi`
`38`	`38`	`CommandManager.InvalidateRequerySuggested();`
`39`	`39`	`}`
`40`	`40`	`};`
	`41`	`+ settings.PropertyChanged += (_, args) =>`
	`42`	`+ {`
	`43`	`+ if (args.PropertyName == nameof(Settings.IconTheme))`
	`44`	`+ {`
	`45`	`+ Main.ForceReQuery();`
	`46`	`+ }`
	`47`	`+ };`
`41`	`48`	`SelectedKeyword = Keywords[0];`
`42`	`49`	`}`
`43`	`50`	`public ICommand EditCommand { get; }`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,5 @@ public ChangeKeywordWindow(SettingsViewModel viewModel, PluginInitContext contex`
`10`	`10`	`InitializeComponent();`
`11`	`11`	`DataContext = new ChangeKeywordViewModel(viewModel, context, Close);`
`12`	`12`	`}`
`13`		`-`
`14`		`- private void WindowLoaded(object sender, RoutedEventArgs e)`
`15`		`- {`
`16`		`- TextBox_NewKeyword.Focus();`
`17`		`- }`
`18`	`13`	`}`
`19`	`14`	`}`