Skip to content

Remove Result Equal used for WPF caching #3112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 18, 2025
Merged

Remove Result Equal used for WPF caching #3112

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41a345a
Remove Result comparison and Change signature from IEnumerable to ICo…
taooceros Dec 7, 2024
51a16cc
Remove Result comparison and Change signature from IEnumerable to ICo…
taooceros Dec 7, 2024
5f6ac6a
Update Flow.Launcher/ViewModel/ResultsViewModel.cs
taooceros Dec 7, 2024
e7ff369
Merge remote-tracking branch 'origin/remove-result-caching' into remo…
taooceros Jan 10, 2025
2de63f7
change equality related testing
taooceros Jan 10, 2025
8e5d778
remove equality test
jjw24 Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions Flow.Launcher.Plugin/Result.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,27 +157,6 @@ public string PluginDirectory
}
}

/// <inheritdoc />
public override bool Equals(object obj)
{
var r = obj as Result;

var equality = string.Equals(r?.Title, Title) &&
string.Equals(r?.SubTitle, SubTitle) &&
string.Equals(r?.AutoCompleteText, AutoCompleteText) &&
string.Equals(r?.CopyText, CopyText) &&
string.Equals(r?.IcoPath, IcoPath) &&
TitleHighlightData == r.TitleHighlightData;

return equality;
}

/// <inheritdoc />
public override int GetHashCode()
{
return HashCode.Combine(Title, SubTitle, AutoCompleteText, CopyText, IcoPath);
}

/// <inheritdoc />
public override string ToString()
{
Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher.Test/Plugins/JsonRPCPluginTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public async Task GivenModel_WhenSerializeWithDifferentNamingPolicy_ThenExpectSa

foreach (var ((result1, result2), referenceResult) in results1.Zip(results2).Zip(reference.Result))
{
Assert.AreEqual(result1, result2);
Assert.AreEqual(result1, referenceResult);
Assert.AreEqual(result1.Title, result2.Title);
Assert.AreEqual(result1.Title, referenceResult.Title);

Assert.IsNotNull(result1);
Assert.IsNotNull(result1.AsyncAction);
Expand Down
6 changes: 3 additions & 3 deletions Flow.Launcher/ViewModel/ResultsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void AddResults(List<Result> newRawResults, string resultId)
/// <summary>
/// To avoid deadlock, this method should not called from main thread
/// </summary>
public void AddResults(IEnumerable<ResultsForUpdate> resultsForUpdates, CancellationToken token, bool reselect = true)
public void AddResults(ICollection<ResultsForUpdate> resultsForUpdates, CancellationToken token, bool reselect = true)
{
var newResults = NewResults(resultsForUpdates);

Expand Down Expand Up @@ -228,12 +228,12 @@ private List<ResultViewModel> NewResults(List<Result> newRawResults, string resu
.ToList();
}

private List<ResultViewModel> NewResults(IEnumerable<ResultsForUpdate> resultsForUpdates)
private List<ResultViewModel> NewResults(ICollection<ResultsForUpdate> resultsForUpdates)
{
if (!resultsForUpdates.Any())
return Results;

return Results.Where(r => r != null && !resultsForUpdates.Any(u => u.ID == r.Result.PluginID))
return Results.Where(r => r?.Result != null && resultsForUpdates.All(u => u.ID != r.Result.PluginID))
.Concat(resultsForUpdates.SelectMany(u => u.Results, (u, r) => new ResultViewModel(r, _settings)))
.OrderByDescending(rv => rv.Result.Score)
.ToList();
Expand Down
Loading