linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved PowerShell scrip host

Browse Source
This commit is contained in:
Frank Skare
2019-09-09 00:46:08 +02:00
parent 7e8a654ada
commit 46b110d93b
2 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@@ -1,7 +1,7 @@
### 5.4.1.1 ### 5.4.1.1
- a issue with the taskbar-progress feature was fixed - a issue with the taskbar-progress feature was fixed
- improved PowerShell scrip host - improved PowerShell scrip host and updated [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting#powershell)
### 5.4.1 ### 5.4.1

85
mpv.net/Scripting/PowerShellScript.cs
View File

@@ -9,7 +9,7 @@ namespace mpvnet
{ {
public class PowerShellScript public class PowerShellScript
{ {
public static object Execute(string code, string[] parameters) public static object Execute(string filepath, params string[] parameters)
{ {
using (Runspace runspace = RunspaceFactory.CreateRunspace()) using (Runspace runspace = RunspaceFactory.CreateRunspace())
{ {
@@ -23,22 +23,27 @@ namespace mpvnet
"Using namespace System\n" + "Using namespace System\n" +
"[System.Reflection.Assembly]::LoadWithPartialName(\"mpvnet\")\n"); "[System.Reflection.Assembly]::LoadWithPartialName(\"mpvnet\")\n");
pipeline.Commands.AddScript(code); pipeline.Commands.AddScript(File.ReadAllText(filepath));
if (parameters != null) if (parameters != null)
foreach (var i in parameters) foreach (string i in parameters)
pipeline.Commands[1].Parameters.Add(null, i); pipeline.Commands[1].Parameters.Add(null, i);
try try
{ {
pipeline.Output.DataReady += Output_DataReady; var output = new PowerShellOutput();
pipeline.Error.DataReady += Error_DataReady; output.ModuleName = Path.GetFileName(filepath);
pipeline.Output.DataReady += output.Output_DataReady;
pipeline.Error.DataReady += output.Error_DataReady;
runspace.SessionStateProxy.SetVariable("Output", output);
var ret = pipeline.Invoke(); var ret = pipeline.Invoke();
if (ret.Count > 0) return ret[0]; if (ret.Count > 0) return ret[0];
pipeline.Output.DataReady -= Output_DataReady; pipeline.Output.DataReady -= output.Output_DataReady;
pipeline.Error.DataReady -= Error_DataReady; pipeline.Error.DataReady -= output.Error_DataReady;
} }
catch (Exception e) catch (Exception e)
{ {
@@ -49,35 +54,21 @@ namespace mpvnet
return null; return null;
} }
private static void Output_DataReady(object sender, EventArgs e) public static void Init(string filepath)
{
var output = sender as PipelineReader<PSObject>;
while (output.Count > 0) Console.WriteLine(output.Read().ToString());
}
private static void Error_DataReady(object sender, EventArgs e)
{
var output = sender as PipelineReader<Object>;
Console.ForegroundColor = ConsoleColor.Red;
while (output.Count > 0) Console.WriteLine(output.Read().ToString());
Console.ResetColor();
}
public static void Init(string filePath)
{ {
foreach (var eventInfo in typeof(mp).GetEvents()) foreach (var eventInfo in typeof(mp).GetEvents())
{ {
if (eventInfo.Name.ToLower() == if (eventInfo.Name.ToLower() ==
Path.GetFileNameWithoutExtension(filePath).ToLower().Replace("-", "")) Path.GetFileNameWithoutExtension(filepath).ToLower().Replace("-", ""))
{ {
PowerShellEventObject eventObject = new PowerShellEventObject(); PowerShellEventObject eventObject = new PowerShellEventObject();
MethodInfo mi; MethodInfo mi;
eventObject.FilePath = filePath; eventObject.Filepath = filepath;
if (eventInfo.EventHandlerType == typeof(Action)) if (eventInfo.EventHandlerType == typeof(Action))
mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.Invoke)); mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.Invoke));
else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>)) else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>))
mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeEndFileEventMode)); mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeEndFile));
else if (eventInfo.EventHandlerType == typeof(Action<string[]>)) else if (eventInfo.EventHandlerType == typeof(Action<string[]>))
mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeStrings)); mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeStrings));
else else
@@ -90,7 +81,33 @@ namespace mpvnet
return; return;
} }
} }
PowerShellScript.Execute(File.ReadAllText(filePath), null); Execute(filepath);
}
class PowerShellOutput
{
public string ModuleName { get; set; }
public bool WriteStandard { get; set; } = true;
public bool WriteError { get; set; } = true;
public void Output_DataReady(object sender, EventArgs e)
{
if (!WriteStandard) return;
var output = sender as PipelineReader<PSObject>;
while (output.Count > 0)
Console.WriteLine("[" + ModuleName + "] " + output.Read().ToString());
}
public void Error_DataReady(object sender, EventArgs e)
{
if (!WriteError) return;
var output = sender as PipelineReader<Object>;
Console.ForegroundColor = ConsoleColor.Red;
while (output.Count > 0)
Console.WriteLine("[" + ModuleName + "] " + output.Read().ToString());
Console.ResetColor();
}
} }
} }
@@ -98,18 +115,10 @@ namespace mpvnet
{ {
public EventInfo EventInfo { get; set; } public EventInfo EventInfo { get; set; }
public Delegate Delegate { get; set; } public Delegate Delegate { get; set; }
public string FilePath { get; set; } public string Filepath { get; set; }
public void Invoke() => PowerShellScript.Execute(File.ReadAllText(FilePath), null); public void Invoke() => PowerShellScript.Execute(Filepath);
public void InvokeEndFile(EndFileEventMode arg) => PowerShellScript.Execute(Filepath, arg.ToString());
public void InvokeEndFileEventMode(EndFileEventMode arg) public void InvokeStrings(string[] args) => PowerShellScript.Execute(Filepath, args);
{
PowerShellScript.Execute(File.ReadAllText(FilePath), new[] { arg.ToString() });
}
public void InvokeStrings(string[] args)
{
PowerShellScript.Execute(File.ReadAllText(FilePath), args);
}
} }
} }