Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 03:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

move properties into models

Browse Source
This commit is contained in:
bao-qian
2016-06-23 00:22:41 +01:00
parent 47f396cfce
commit 5102770ad5
4 changed files with 34 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Wox/ViewModel/ResultsViewModel.cs
View File

@@ -58,7 +58,7 @@ namespace Wox.ViewModel
for (; index < list.Count; index++)
{
var result = list[index];
if (newScore > result.RawResult.Score)
if (newScore > result.Result.Score)
{
break;
}
@@ -113,12 +113,12 @@ namespace Wox.ViewModel
public void RemoveResultsExcept(PluginMetadata metadata)
{
Results.RemoveAll(r => r.RawResult.PluginID != metadata.ID);
Results.RemoveAll(r => r.Result.PluginID != metadata.ID);
}
public void RemoveResultsFor(PluginMetadata metadata)
{
Results.RemoveAll(r => r.PluginID == metadata.ID);
Results.RemoveAll(r => r.Result.PluginID == metadata.ID);
}
/// <summary>
@@ -149,7 +149,7 @@ namespace Wox.ViewModel
{
var newResults = newRawResults.Select(r => new ResultViewModel(r)).ToList();
var results = Results.ToList();
var oldResults = results.Where(r => r.PluginID == resultId).ToList();
var oldResults = results.Where(r => r.Result.PluginID == resultId).ToList();
// intersection of A (old results) and B (new newResults)
var intersection = oldResults.Intersect(newResults).ToList();
@@ -164,15 +164,15 @@ namespace Wox.ViewModel
foreach (var commonResult in intersection)
{
int oldIndex = results.IndexOf(commonResult);
int oldScore = results[oldIndex].Score;
int oldScore = results[oldIndex].Result.Score;
var newResult = newResults[newResults.IndexOf(commonResult)];
int newScore = newResult.Score;
int newScore = newResult.Result.Score;
if (newScore != oldScore)
{
var oldResult = results[oldIndex];
oldResult.Score = newScore;
oldResult.OriginQuery = newResult.OriginQuery;
oldResult.Result.Score = newScore;
oldResult.Result.OriginQuery = newResult.Result.OriginQuery;
results.RemoveAt(oldIndex);
int newIndex = InsertIndexOf(newScore, results);
@@ -183,7 +183,7 @@ namespace Wox.ViewModel
// insert result in relative complement of A in B
foreach (var result in newResults.Except(intersection))
{
int newIndex = InsertIndexOf(result.Score, results);
int newIndex = InsertIndexOf(result.Result.Score, results);
results.Insert(newIndex, result);
}
@@ -223,9 +223,9 @@ namespace Wox.ViewModel
{
this[i] = newResult;
}
else if (oldResult.Score != newResult.Score)
else if (oldResult.Result.Score != newResult.Result.Score)
{
this[i].Score = newResult.Score;
this[i].Result.Score = newResult.Result.Score;
}
}