Add "Last opened" history mode & Fix non-result history item save issue

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-    <!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
+    <!-- Workaround https://github.com/dotnet/runtime/issues/109682 -->
     <CETCompat>false</CETCompat>
   </PropertyGroup>
 </Project>

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -7,6 +7,7 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.Storage;
+using Flow.Launcher.Localization.Attributes;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 
@@ -513,6 +514,21 @@ public bool ShowAtTopmost
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public LastQueryMode LastQueryMode { get; set; } = LastQueryMode.Selected;
 
+        private HistoryStyle _historyStyle = HistoryStyle.Query;
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public HistoryStyle HistoryStyle
+        {
+            get => _historyStyle;
+            set
+            {
+                if (_historyStyle != value)
+                {
+                    _historyStyle = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public AnimationSpeeds AnimationSpeed { get; set; } = AnimationSpeeds.Medium;
         public int CustomAnimationLength { get; set; } = 360;
@@ -695,4 +711,14 @@ public enum DialogJumpFileResultBehaviours
         FullPathOpen,
         Directory
     }
+
+    [EnumLocalize]
+    public enum HistoryStyle
+    {
+        [EnumLocalizeKey(nameof(Localize.queryHistory))]
+        Query,
+
+        [EnumLocalizeKey(nameof(Localize.executedHistory))]
+        LastOpened
+    }
 }

Flow.Launcher/Flow.Launcher.csproj

@@ -185,7 +185,7 @@
   </Target>
 
   <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
-    <!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
+    <!-- Workaround https://github.com/dotnet/wpf/issues/6792 -->
     <ItemGroup>
       <FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
       <Analyzer Remove="@(Analyzer)" />

Flow.Launcher/Helper/ResultHelper.cs

@@ -0,0 +1,44 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Plugin;
+using Flow.Launcher.Storage;
+
+namespace Flow.Launcher.Helper;
+
+#nullable enable
+
+public static class ResultHelper
+{
+    public static async Task<Result?> PopulateResultsAsync(LastOpenedHistoryItem item)
+    {
+        return await PopulateResultsAsync(item.PluginID, item.Query, item.Title, item.SubTitle, item.RecordKey);
+    }
+
+    public static async Task<Result?> PopulateResultsAsync(string pluginId, string rawQuery, string title, string subTitle, string recordKey)
+    {
+        var plugin = PluginManager.GetPluginForId(pluginId);
+        if (plugin == null) return null;
+        var query = QueryBuilder.Build(rawQuery, PluginManager.NonGlobalPlugins);
+        if (query == null) return null;
+        try
+        {
+            var freshResults = await plugin.Plugin.QueryAsync(query, CancellationToken.None);
+            // Try to match by record key first if it is valid, otherwise fall back to title + subtitle match
+            if (string.IsNullOrEmpty(recordKey))
+            {
+                return freshResults?.FirstOrDefault(r => r.Title == title && r.SubTitle == subTitle);
+            }
+            else
+            {
+                return freshResults?.FirstOrDefault(r => r.RecordKey == recordKey) ??
+                    freshResults?.FirstOrDefault(r => r.Title == title && r.SubTitle == subTitle);
+            }
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}

Flow.Launcher/Languages/en.xaml

@@ -166,6 +166,10 @@
     <system:String x:Key="homePageToolTip">Show home page results when query text is empty.</system:String>
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
+    <system:String x:Key="historyStyle">History Style</system:String>
+    <system:String x:Key="historyStyleTooltip">Choose the type of history to show in the History and Home Page</system:String>
+    <system:String x:Key="queryHistory">Query history</system:String>
+    <system:String x:Key="executedHistory">Last opened history</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
     <system:String x:Key="showAtTopmost">Show Search Window at Foremost</system:String>
     <system:String x:Key="showAtTopmostToolTip">Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position.</system:String>

Flow.Launcher/MainWindow.xaml.cs

@@ -26,7 +26,7 @@
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
 using iNKORE.UI.WPF.Modern;
 using iNKORE.UI.WPF.Modern.Controls;
 using DataObject = System.Windows.DataObject;
 using Key = System.Windows.Input.Key;
 using MouseButtons = System.Windows.Forms.MouseButtons;
@@ -116,7 +116,7 @@
         {
             var handle = Win32Helper.GetWindowHandle(this, true);
             _hwndSource = HwndSource.FromHwnd(handle);
             _hwndSource.AddHook(WndProc);
             Win32Helper.HideFromAltTab(this);
             Win32Helper.DisableControlBox(this);
         }
@@ -322,6 +322,7 @@
                         break;
                     case nameof(Settings.ShowHomePage):
                     case nameof(Settings.ShowHistoryResultsForHomePage):
+                    case nameof(Settings.HistoryStyle):
                         if (_viewModel.QueryResultsSelected() && string.IsNullOrEmpty(_viewModel.QueryText))
                         {
                             _viewModel.QueryResults();
@@ -373,7 +374,7 @@
         {
             try
             {
                 _hwndSource.RemoveHook(WndProc);
             }
             catch (Exception)
             {
@@ -586,9 +587,9 @@
 
         #endregion
 
         #region Window WndProc
 
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) 
         {
             switch (msg)
             {
@@ -812,14 +813,14 @@
                 Header = Localize.iconTrayOpen() + " (" + _settings.Hotkey + ")",
                 Icon = openIcon
             };
             var gamemodeIcon = new FontIcon { Glyph = "\ue7fc" };
             var gamemode = new MenuItem
             {
                 Header = Localize.GameMode(),
                 Icon = gamemodeIcon
             };
             var positionresetIcon = new FontIcon { Glyph = "\ue73f" };
             var positionreset = new MenuItem
             {
                 Header = Localize.PositionReset(),
                 Icon = positionresetIcon
@@ -859,7 +860,7 @@
 
         public void UpdatePosition()
         {
-            // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
+            // Initialize call twice to workaround multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             if (_viewModel.IsDialogJumpWindowUnderDialog())
             {
                 InitializeDialogJumpPosition();
@@ -883,7 +884,7 @@
 
         private void InitializePosition()
         {
-            // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
+            // Initialize call twice to workaround multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             InitializePositionInner();
             InitializePositionInner();
             return;

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

@@ -147,6 +147,8 @@ public bool PortableMode
     public List<LastQueryModeData> LastQueryModes { get; } =
         DropdownDataGeneric<LastQueryMode>.GetValues<LastQueryModeData>("LastQuery");
 
+    public List<HistoryStyleLocalized> HistoryStyles { get; } = HistoryStyleLocalized.GetValues();
+
     public bool EnableDialogJump
     {
         get => Settings.EnableDialogJump;
@@ -213,6 +215,7 @@ private void UpdateEnumDropdownLocalizations()
         DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
         DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
         DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
+        HistoryStyleLocalized.UpdateLabels(HistoryStyles);
         DropdownDataGeneric<DoublePinyinSchemas>.UpdateLabels(DoublePinyinSchemas);
         DropdownDataGeneric<DialogJumpWindowPositions>.UpdateLabels(DialogJumpWindowPositions);
         DropdownDataGeneric<DialogJumpResultBehaviours>.UpdateLabels(DialogJumpResultBehaviours);

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

@@ -245,6 +245,22 @@
                     SelectedValuePath="Value" />
             </ui:SettingsCard>
 
+            <ui:SettingsCard
+                Margin="0 14 0 0"
+                Description="{DynamicResource historyStyleTooltip}"
+                Header="{DynamicResource historyStyle}">
+                <ui:SettingsCard.HeaderIcon>
+                    <ui:FontIcon Glyph="&#xE81C;" />
+                </ui:SettingsCard.HeaderIcon>
+
+                <ComboBox
+                    MaxWidth="200"
+                    DisplayMemberPath="Display"
+                    ItemsSource="{Binding HistoryStyles}"
+                    SelectedValue="{Binding Settings.HistoryStyle}"
+                    SelectedValuePath="Value" />
+            </ui:SettingsCard>
+
             <ui:SettingsCard
                 Margin="0 14 0 0"
                 Description="{DynamicResource autoRestartAfterChangingToolTip}"

Flow.Launcher/Storage/HistoryItem.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 
 namespace Flow.Launcher.Storage
 {
+    [Obsolete("Use LastOpenedHistoryItem instead. This class will be removed in future versions.")]
     public class HistoryItem
     {
         public string Query { get; set; }
@@ -42,4 +43,4 @@ private string DateTimeAgo(DateTime dt)
             return string.Empty;
         }
     }
-}
+}

Flow.Launcher/Storage/LastOpenedHistoryItem.cs

@@ -0,0 +1,31 @@
+using System;
+using Flow.Launcher.Plugin;
+
+namespace Flow.Launcher.Storage;
+
+public class LastOpenedHistoryItem
+{
+    public string Title { get; set; } = string.Empty;
+    public string SubTitle { get; set; } = string.Empty;
+    public string PluginID { get; set; } = string.Empty;
+    public string Query { get; set; } = string.Empty;
+    public string RecordKey { get; set; } = string.Empty;
+    public DateTime ExecutedDateTime { get; set; }
+
+    public bool Equals(Result r)
+    {
+        if (string.IsNullOrEmpty(RecordKey) || string.IsNullOrEmpty(r.RecordKey))
+        {
+            return Title == r.Title
+                && SubTitle == r.SubTitle
+                && PluginID == r.PluginID
+                && Query == r.OriginQuery.RawQuery;
+        }
+        else
+        {
+            return RecordKey == r.RecordKey
+                && PluginID == r.PluginID
+                && Query == r.OriginQuery.RawQuery;
+        }
+    }
+}

Flow.Launcher/Storage/QueryHistory.cs

@@ -2,33 +2,63 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Storage
 {
     public class History
     {
         [JsonInclude]
-        public List<HistoryItem> Items { get; private set; } = new List<HistoryItem>();
+#pragma warning disable CS0618 // Type or member is obsolete
+        public List<HistoryItem> Items { get; private set; } = [];
+#pragma warning restore CS0618 // Type or member is obsolete
 
-        private int _maxHistory = 300;
+        [JsonInclude]
+        public List<LastOpenedHistoryItem> LastOpenedHistoryItems { get; private set; } = [];
+
+        private readonly int _maxHistory = 300;
+
+        public void PopulateHistoryFromLegacyHistory()
+        {
+            if (Items.Count == 0) return;
+            // Migrate old history items to new LastOpenedHistoryItems
+            foreach (var item in Items)
+            {
+                LastOpenedHistoryItems.Add(new LastOpenedHistoryItem
+                {
+                    Query = item.Query,
+                    ExecutedDateTime = item.ExecutedDateTime
+                });
+            }
+            Items.Clear();
+        }
 
-        public void Add(string query)
+        public void Add(Result result)
         {
-            if (string.IsNullOrEmpty(query)) return;
-            if (Items.Count > _maxHistory)
+            if (string.IsNullOrEmpty(result.OriginQuery.RawQuery)) return;
+            if (string.IsNullOrEmpty(result.PluginID)) return;
+
+            // Maintain the max history limit
+            if (LastOpenedHistoryItems.Count > _maxHistory)
             {
-                Items.RemoveAt(0);
+                LastOpenedHistoryItems.RemoveAt(0);
             }
 
-            if (Items.Count > 0 && Items.Last().Query == query)
+            // If the last item is the same as the current result, just update the timestamp
+            if (LastOpenedHistoryItems.Count > 0 && 
+                LastOpenedHistoryItems.Last().Equals(result))
             {
-                Items.Last().ExecutedDateTime = DateTime.Now;
+                LastOpenedHistoryItems.Last().ExecutedDateTime = DateTime.Now;
             }
             else
             {
-                Items.Add(new HistoryItem
+                LastOpenedHistoryItems.Add(new LastOpenedHistoryItem
                 {
-                    Query = query,
+                    Title = result.Title,
+                    SubTitle = result.SubTitle,
+                    PluginID = result.PluginID,
+                    Query = result.OriginQuery.RawQuery,
+                    RecordKey = result.RecordKey,
                     ExecutedDateTime = DateTime.Now
                 });
             }