Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add PushResults for push results before Query results return

Browse Source
This commit is contained in:
Yeechan Lu
2014-03-27 14:50:42 +08:00
parent 9bc4b74888
commit ac81d38acc
6 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Wox.Plugin.System/CMD/CMD.cs
View File

@@ -31,8 +31,7 @@ namespace Wox.Plugin.System.CMD
results.AddRange(history);
}
if (query.RawQuery.StartsWith(">") && query.RawQuery.Length > 1)
else
{
string cmd = query.RawQuery.Substring(1);
Result result = new Result
@@ -57,7 +56,7 @@ namespace Wox.Plugin.System.CMD
}
catch (Exception) { }
results.Add(result);
context.PushResults(new List<Result>() { result });
IEnumerable<Result> history = CMDStorage.Instance.CMDHistory.Where(o => o.Key.Contains(cmd))
.OrderByDescending(o => o.Value)
@@ -92,7 +91,8 @@ namespace Wox.Plugin.System.CMD
return ret;
}).Where(o => o != null).Take(4);
results.AddRange(history);
context.PushResults(history.ToList());
try
{
string basedir = null;

2
Wox.Plugin/PluginInitContext.cs
View File

@@ -31,5 +31,7 @@ namespace Wox.Plugin
public Action StopLoadingBar { get; set; }
public Func<string, bool> ShellRun { get; set; }
public Action<List<Result>> PushResults { get; set; }
}
}

1
Wox.Plugin/PluginPair.cs
View File

@@ -9,5 +9,6 @@ namespace Wox.Plugin
{
public IPlugin Plugin { get; set; }
public PluginMetadata Metadata { get; set; }
public PluginInitContext InitContext { get; set; }
}
}

16
Wox/Commands/PluginCommand.cs
View File

@@ -27,13 +27,17 @@ namespace Wox.Commands
{
try
{
List<Result> r = thirdPlugin.Plugin.Query(q) ?? new List<Result>();
r.ForEach(o =>
thirdPlugin.InitContext.PushResults = r =>
{
o.PluginDirectory = thirdPlugin.Metadata.PluginDirecotry;
o.OriginQuery = q;
});
UpdateResultView(r);
r.ForEach(o =>
{
o.PluginDirectory = thirdPlugin.Metadata.PluginDirecotry;
o.OriginQuery = q;
});
UpdateResultView(r);
};
List<Result> results = thirdPlugin.Plugin.Query(q) ?? new List<Result>();
thirdPlugin.InitContext.PushResults(results);
}
catch (Exception queryException)
{

20
Wox/Commands/SystemCommand.cs
View File

@@ -17,14 +17,20 @@ namespace Wox.Commands
PluginPair pair1 = pair;
ThreadPool.QueueUserWorkItem(state =>
{
List<Result> results = pair1.Plugin.Query(query);
foreach (Result result in results)
pair1.InitContext.PushResults = r =>
{
result.PluginDirectory = pair1.Metadata.PluginDirecotry;
result.OriginQuery = query;
result.AutoAjustScore = true;
}
if(results.Count > 0) UpdateResultView(results);
if (r == null || r.Count == 0) return;
foreach (Result result in r)
{
result.PluginDirectory = pair1.Metadata.PluginDirecotry;
result.OriginQuery = query;
result.AutoAjustScore = true;
}
UpdateResultView(r);
};
List<Result> results = pair1.Plugin.Query(query);
pair1.InitContext.PushResults(results);
});
}
}

5
Wox/PluginLoader/Plugins.cs
View File

@@ -40,7 +40,7 @@ namespace Wox.PluginLoader
if (pluginPair != null)
{
PluginMetadata metadata = pluginPair.Metadata;
forker.Fork(() => plugin1.Init(new PluginInitContext()
pluginPair.InitContext = new PluginInitContext()
{
Plugins = plugins,
CurrentPluginMetadata = metadata,
@@ -60,7 +60,8 @@ namespace Wox.PluginLoader
StartLoadingBar = () => App.Window.Dispatcher.Invoke(new Action(() => App.Window.StartLoadingBar())),
StopLoadingBar = () => App.Window.Dispatcher.Invoke(new Action(() => App.Window.StopLoadingBar())),
ShellRun = (cmd) => (bool) App.Window.Dispatcher.Invoke(new Func<bool>(() => App.Window.ShellRun(cmd))),
}));
};
forker.Fork(() => plugin1.Init(pluginPair.InitContext));
}
}