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

research python plugin: seems ok in multiple thread now.

Browse Source
This commit is contained in:
qianlifeng
2014-01-11 15:02:17 +08:00
parent 76009ca6eb
commit 73867d87d7
7 changed files with 85 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
WinAlfred/Commands/PluginCommand.cs
View File

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Python.Runtime;
using WinAlfred.Helper;
using WinAlfred.Plugin;
using WinAlfred.PluginLoader;
@@ -9,6 +11,9 @@ namespace WinAlfred.Commands
{
public class PluginCommand : BaseCommand
{
private string currentPythonModulePath = string.Empty;
private IntPtr GIL;
public PluginCommand(MainWindow mainWindow)
: base(mainWindow)
{
@@ -17,36 +22,56 @@ namespace WinAlfred.Commands
public override void Dispatch(Query q)
{
foreach (PluginPair pair in Plugins.AllPlugins)
PluginPair thirdPlugin = Plugins.AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == q.ActionName);
if (thirdPlugin != null && !string.IsNullOrEmpty(thirdPlugin.Metadata.ActionKeyword))
{
if (pair.Metadata.ActionKeyword == q.ActionName)
if (thirdPlugin.Metadata.Language == AllowedLanguage.Python)
{
PluginPair pair1 = pair;
ThreadPool.QueueUserWorkItem(state =>
{
try
{
List<Result> r = pair1.Plugin.Query(q);
r.ForEach(o =>
{
o.PluginDirectory = pair1.Metadata.PluginDirecotry;
o.OriginQuery = q;
});
UpdateResultView(r);
}
catch (Exception queryException)
{
Log.Error(string.Format("Plugin {0} query failed: {1}", pair1.Metadata.Name,
queryException.Message));
#if (DEBUG)
{
throw;
}
#endif
}
});
SwitchPythonEnv(thirdPlugin);
}
ThreadPool.QueueUserWorkItem(t =>
{
try
{
List<Result> r = thirdPlugin.Plugin.Query(q);
r.ForEach(o =>
{
o.PluginDirectory = thirdPlugin.Metadata.PluginDirecotry;
o.OriginQuery = q;
});
UpdateResultView(r);
}
catch (Exception queryException)
{
Log.Error(string.Format("Plugin {0} query failed: {1}", thirdPlugin.Metadata.Name,
queryException.Message));
#if (DEBUG)
{
throw;
}
#endif
}
});
}
}
private void SwitchPythonEnv(PluginPair thirdPlugin)
{
if (currentPythonModulePath != thirdPlugin.Metadata.PluginDirecotry)
{
//this must initial in main thread
currentPythonModulePath = thirdPlugin.Metadata.PluginDirecotry;
if (GIL != IntPtr.Zero)
{
Runtime.PyEval_RestoreThread(GIL);
PythonEngine.Shutdown();
}
PythonEngine.Initialize();
IntPtr pyStrPtr = Runtime.PyString_FromString(thirdPlugin.Metadata.PluginDirecotry);
IntPtr SysDotPath = Runtime.PySys_GetObject("path");
Runtime.PyList_Append(SysDotPath, pyStrPtr);
GIL = PythonEngine.BeginAllowThreads();
}
}
}

2
WinAlfred/MainWindow.xaml.cs
View File

@@ -45,7 +45,7 @@ namespace WinAlfred
void MainWindow_Closed(object sender, EventArgs e)
{
PythonEngine.Shutdown();
//PythonEngine.Shutdown();
}
private void InitProgressbarAnimation()

11
WinAlfred/PluginLoader/BasePluginLoader.cs
View File

@@ -117,5 +117,16 @@ namespace WinAlfred.PluginLoader
return null;
}
}
///// <summary>
///// Change python execute file name to unique file name using GUID
///// this is because if two pythong plugin use the same
///// </summary>
///// <param name="metadata"></param>
///// <returns></returns>
//private static PluginMetadata filterPythonMetadata(PluginMetadata metadata)
//{
//}
}
}

6
WinAlfred/PluginLoader/PythonPluginLoader.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Python.Runtime;
@@ -11,8 +12,7 @@ namespace WinAlfred.PluginLoader
static PythonPluginLoader()
{
PythonEngine.Initialize();
PythonEngine.BeginAllowThreads();
}
public override List<PluginPair> LoadPlugin()

23
WinAlfred/PluginLoader/PythonPluginWrapper.cs
View File

@@ -10,6 +10,7 @@ namespace WinAlfred.PluginLoader
{
public class PythonPluginWrapper : IPlugin
{
private PluginMetadata metadata;
public PythonPluginWrapper(PluginMetadata metadata)
@@ -21,13 +22,13 @@ namespace WinAlfred.PluginLoader
{
try
{
string s = InvokeFunc(metadata.PluginDirecotry, metadata.ExecuteFileName.Replace(".py", ""),"query",query.RawQuery);
if (string.IsNullOrEmpty(s))
string jsonResult = InvokeFunc(metadata.PluginDirecotry, metadata.ExecuteFileName.Replace(".py", ""), "query", query.RawQuery);
if (string.IsNullOrEmpty(jsonResult))
{
return new List<Result>();
}
List<PythonResult> o = JsonConvert.DeserializeObject<List<PythonResult>>(s);
List<PythonResult> o = JsonConvert.DeserializeObject<List<PythonResult>>(jsonResult);
List<Result> r = new List<Result>();
foreach (PythonResult pythonResult in o)
{
@@ -42,22 +43,20 @@ namespace WinAlfred.PluginLoader
}
catch (Exception)
{
throw;
#if (DEBUG)
{
throw;
}
#endif
}
}
private string InvokeFunc(string path, string moduleName,string func, string para)
private string InvokeFunc(string path, string moduleName, string func, string para)
{
IntPtr gs = PythonEngine.AcquireLock();
IntPtr pyStrPtr = Runtime.PyString_FromString(path);
IntPtr SysDotPath = Runtime.PySys_GetObject("path");
Runtime.PyList_Append(SysDotPath, pyStrPtr);
PyObject module = PythonEngine.ImportModule(moduleName);
module = PythonEngine.ReloadModule(module);
PyObject res = module.InvokeMethod(func, new PyString(para));
string json = Runtime.GetManagedString(res.Handle);
@@ -68,7 +67,7 @@ namespace WinAlfred.PluginLoader
public void Init(PluginInitContext context)
{
}
}
}