prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: helper

Browse source
This commit is contained in:
01Dri 2025-10-11 03:08:23 -03:00
parent 95122e91f5
commit e6cae1a79b
3 changed files with 60 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Flow.Launcher/Storage/History.cs
View file

@ -2,13 +2,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Threading; using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Plugin; using Flow.Launcher.Plugin;
namespace Flow.Launcher.Storage namespace Flow.Launcher.Storage
{ {
public class History public class History
{ {
//Legacy //Legacy
@ -30,11 +28,15 @@ namespace Flow.Launcher.Storage
} }
public List<HistoryItem> GetHistoryItems(Settings settings)
public List<HistoryItem> GetHistoryItems(bool isQuery)
{ {
if (isQuery) return PopulateActions(QueryHistoryItems, isQuery); if (settings.ShowHistoryOnHomePage)
return PopulateActions(LastOpenedHistoryItems, isQuery); {
if (settings.ShowHistoryQueryResultsForHomePage) return QueryHistoryItems.PopulateActions(true);
return LastOpenedHistoryItems.PopulateActions(false);
}
return new List<HistoryItem>();
} }
public void PopulateHistoryWithLegacyHistory() public void PopulateHistoryWithLegacyHistory()
@ -45,46 +47,13 @@ namespace Flow.Launcher.Storage
{ {
RawQuery = item.Query, RawQuery = item.Query,
ExecutedDateTime = item.ExecutedDateTime ?? DateTime.Now, ExecutedDateTime = item.ExecutedDateTime ?? DateTime.Now,
QueryAction = GetQueryAction(item.Query) QueryAction = HistoryHelper.GetQueryAction(item.Query)
}); });
} }
if (Items.Any()) Items.Clear(); if (Items.Any()) Items.Clear();
} }
private List<HistoryItem> PopulateActions(List<HistoryItem> items,bool isQuery)
{
foreach (var item in items)
{
if (item.QueryAction != null && item.ExecuteAction != null) continue;
if (isQuery && item.QueryAction == null) item.QueryAction = GetQueryAction(item.RawQuery);
if (!isQuery && item.ExecuteAction == null) item.ExecuteAction = GetExecuteAction(item.PluginID, item.RawQuery, item.Title, item.SubTitle);
}
return items;
}
private Func<ActionContext, bool> GetExecuteAction(string pluginId, string rawQuery, string title, string subTitle)
{
var plugin = PluginManager.GetPluginForId(pluginId);
var query = QueryBuilder.Build(rawQuery, PluginManager.NonGlobalPlugins);
var freshResults = plugin.Plugin
.QueryAsync(query, CancellationToken.None)
.GetAwaiter()
.GetResult();
return freshResults?.FirstOrDefault(r => r.Title == title
&& r.SubTitle == subTitle)?.Action;
}
private Func<ActionContext, bool> GetQueryAction(string query)
{
return _=>
{
App.API.BackToQueryResults();
App.API.ChangeQuery(query);
return false;
};
}
private void AddLastQuery(Result result) private void AddLastQuery(Result result)
{ {
@ -104,7 +73,7 @@ namespace Flow.Launcher.Storage
{ {
RawQuery = result.OriginQuery.RawQuery, RawQuery = result.OriginQuery.RawQuery,
ExecutedDateTime = DateTime.Now, ExecutedDateTime = DateTime.Now,
QueryAction = GetQueryAction(result.OriginQuery.RawQuery) QueryAction = HistoryHelper.GetQueryAction(result.OriginQuery.RawQuery)
}); });
} }
} }

45
Flow.Launcher/Storage/HistoryHelper.cs Normal file
View file

@ -0,0 +1,45 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Plugin;
namespace Flow.Launcher.Storage;
public static class HistoryHelper
{
internal static List<HistoryItem> PopulateActions(this List<HistoryItem> items, bool isQuery)
{
foreach (var item in items)
{
if (item.QueryAction != null && item.ExecuteAction != null) continue;
if (isQuery && item.QueryAction == null) item.QueryAction = GetQueryAction(item.RawQuery);
if (!isQuery && item.ExecuteAction == null) item.ExecuteAction = GetExecuteAction(item.PluginID, item.RawQuery, item.Title, item.SubTitle);
}
return items;
}
private static Func<ActionContext, bool> GetExecuteAction(string pluginId, string rawQuery, string title, string subTitle)
{
var plugin = PluginManager.GetPluginForId(pluginId);
var query = QueryBuilder.Build(rawQuery, PluginManager.NonGlobalPlugins);
var freshResults = plugin.Plugin
.QueryAsync(query, CancellationToken.None)
.GetAwaiter()
.GetResult();
return freshResults?.FirstOrDefault(r => r.Title == title
&& r.SubTitle == subTitle)?.Action;
}
public static Func<ActionContext, bool> GetQueryAction(string query)
{
return _ =>
{
App.API.BackToQueryResults();
App.API.ChangeQuery(query);
return false;
};
}
}

3
Flow.Launcher/Storage/HistoryItem.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Flow.Launcher.Plugin; using Flow.Launcher.Plugin;
@ -16,4 +17,6 @@ public class HistoryItem
[JsonIgnore] [JsonIgnore]
public Func<ActionContext, bool> QueryAction { get; set; } public Func<ActionContext, bool> QueryAction { get; set; }
} }