Merge branch 'dev' into taooceros-patch-1

taooceros · web-flow · commit b5c264fbb56a · 2024-12-01T21:07:03.000-08:00
diff --git a/.cm/gitstream.cm b/.cm/gitstream.cm
@@ -10,7 +10,7 @@ triggers:
     branch:
       - l10n_dev
       - dev
-      - r/(?i)(Dependabot|Renovate)/
+      - r/([Dd]ependabot|[Rr]enovate)/
 
 
 automations:
diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@@ -54,7 +54,7 @@
   
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.7.0" />
-    <PackageReference Include="FSharp.Core" Version="8.0.401" />
+    <PackageReference Include="FSharp.Core" Version="9.0.100" />
     <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -55,7 +55,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MemoryPack" Version="1.21.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.10.48" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
     <PackageReference Include="NLog" Version="4.7.10" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
@@ -54,7 +54,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -171,6 +171,7 @@
                     IsPaneToggleButtonVisible="False"
                     IsSettingsVisible="False"
                     IsTabStop="False"
+                    Loaded="NavView_Loaded"
                     OpenPaneLength="240"
                     PaneDisplayMode="Left"
                     SelectionChanged="NavigationView_SelectionChanged">
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -29,7 +29,6 @@ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
         _api = api;
         InitializePosition();
         InitializeComponent();
-        NavView.SelectedItem = NavView.MenuItems[0]; /* Set First Page */
     }
 
     private void OnLoaded(object sender, RoutedEventArgs e)
@@ -169,7 +168,11 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
         else
         {
             var selectedItem = (NavigationViewItem)args.SelectedItem;
-            if (selectedItem == null) return;
+            if (selectedItem == null)
+            {
+                NavView_Loaded(sender, null); /* Reset First Page */
+                return;
+            }
 
             var pageType = selectedItem.Name switch
             {
@@ -186,5 +189,22 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
         }
     }
 
+    private void NavView_Loaded(object sender, RoutedEventArgs e)
+    {
+        if (ContentFrame.IsLoaded)
+        {
+            ContentFrame_Loaded(sender, e);
+        }
+        else
+        {
+            ContentFrame.Loaded += ContentFrame_Loaded;
+        }
+    }
+
+    private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
+    {
+        NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
+    }
+
     public record PaneData(Settings Settings, Updater Updater, IPortable Portable);
 }
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
@@ -82,6 +82,7 @@
                 <ui:Frame
                     x:Name="ContentFrame"
                     HorizontalAlignment="Stretch"
+                    Loaded="ContentFrame_Loaded"
                     ScrollViewer.CanContentScroll="True"
                     ScrollViewer.HorizontalScrollBarVisibility="Visible"
                     ScrollViewer.VerticalScrollBarVisibility="Visible">
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -17,7 +17,6 @@ public WelcomeWindow(Settings settings)
             InitializeComponent();
             BackButton.IsEnabled = false;
             this.settings = settings;
-            ContentFrame.Navigate(PageTypeSelector(1), settings);
         }
 
         private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()
@@ -102,9 +101,15 @@ private static Type PageTypeSelector(int pageNumber)
             var tRequest = new TraversalRequest(FocusNavigationDirection.Next);
             textBox.MoveFocus(tRequest);
         }
+
         private void OnActivated(object sender, EventArgs e)
         {
             Keyboard.ClearFocus();
         }
+
+        private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
+        {
+            ContentFrame.Navigate(PageTypeSelector(1), settings); /* Set First Page */
+        }
     }
-}
+}
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -95,7 +95,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj b/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
@@ -60,7 +60,7 @@
   
   <ItemGroup>
     <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -60,15 +60,26 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
             var result = await cache.GetOrCreateAsync(query.Search, async entry =>
             {
                 var resultList = await Task.Run(() =>
-                    _win32s.Cast<IProgram>()
-                        .Concat(_uwps)
-                        .AsParallel()
-                        .WithCancellation(token)
-                        .Where(HideUninstallersFilter)
-                        .Where(p => p.Enabled)
-                        .Select(p => p.Result(query.Search, Context.API))
-                        .Where(r => r?.Score > 0)
-                        .ToList());
+                {
+                    try
+                    {
+                        return _win32s.Cast<IProgram>()
+                            .Concat(_uwps)
+                            .AsParallel()
+                            .WithCancellation(token)
+                            .Where(HideUninstallersFilter)
+                            .Where(p => p.Enabled)
+                            .Select(p => p.Result(query.Search, Context.API))
+                            .Where(r => r?.Score > 0)
+                            .ToList();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        Log.Debug("|Flow.Launcher.Plugin.Program.Main|Query operation cancelled");
+                        return emptyResults;
+                    }
+                   
+                }, token);
 
                 resultList = resultList.Any() ? resultList : emptyResults;
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ public WelcomeWindow(Settings settings)`
`17`	`17`	`InitializeComponent();`
`18`	`18`	`BackButton.IsEnabled = false;`
`19`	`19`	`this.settings = settings;`
`20`		`- ContentFrame.Navigate(PageTypeSelector(1), settings);`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()`
`@@ -102,9 +101,15 @@ private static Type PageTypeSelector(int pageNumber)`
`102`	`101`	`var tRequest = new TraversalRequest(FocusNavigationDirection.Next);`
`103`	`102`	`textBox.MoveFocus(tRequest);`
`104`	`103`	`}`
	`104`	`+`
`105`	`105`	`private void OnActivated(object sender, EventArgs e)`
`106`	`106`	`{`
`107`	`107`	`Keyboard.ClearFocus();`
`108`	`108`	`}`
	`109`	`+`
	`110`	`+ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)`
	`111`	`+ {`
	`112`	`+ ContentFrame.Navigate(PageTypeSelector(1), settings); /* Set First Page */`
	`113`	`+ }`
`109`	`114`	`}`
`110`		`-}`
	`115`	`+}`