mirror of https://github.com/lidarr/Lidarr
Fixed: Executing powershell and python scripts directly in Connect->Custom Scripts
Fixes #1203 Co-Authored-By: taloth <taloth@users.noreply.github.com>
This commit is contained in:
parent
876db6eb6e
commit
30b82ed1f1
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
|
@ -102,6 +102,55 @@ namespace NzbDrone.Common.Test
|
|||
Subject.Exists(DummyApp.DUMMY_PROCCESS_NAME).Should().BeFalse();
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Explicit]
|
||||
public void Should_be_able_to_start_powershell()
|
||||
{
|
||||
WindowsOnly();
|
||||
|
||||
var tempDir = GetTempFilePath();
|
||||
var tempScript = Path.Combine(tempDir, "myscript.ps1");
|
||||
|
||||
Directory.CreateDirectory(tempDir);
|
||||
|
||||
File.WriteAllText(tempScript, "Write-Output 'Hello There'\r\n");
|
||||
|
||||
try
|
||||
{
|
||||
var result = Subject.StartAndCapture(tempScript);
|
||||
|
||||
result.Standard.First().Content.Should().Be("Hello There");
|
||||
}
|
||||
catch (Win32Exception ex) when (ex.NativeErrorCode == 2)
|
||||
{
|
||||
Assert.Fail("No Powershell available?!?");
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Should_be_able_to_start_python()
|
||||
{
|
||||
WindowsOnly();
|
||||
|
||||
var tempDir = GetTempFilePath();
|
||||
var tempScript = Path.Combine(tempDir, "myscript.py");
|
||||
|
||||
Directory.CreateDirectory(tempDir);
|
||||
|
||||
File.WriteAllText(tempScript, "print(\"Hello There\")\r\n");
|
||||
|
||||
try
|
||||
{
|
||||
var result = Subject.StartAndCapture(tempScript);
|
||||
|
||||
result.Standard.First().Content.Should().Be("Hello There");
|
||||
}
|
||||
catch (Win32Exception ex) when (ex.NativeErrorCode == 2)
|
||||
{
|
||||
Assert.Inconclusive("No Python available");
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Platform(Exclude = "MacOsX")]
|
||||
[Retry(3)]
|
||||
|
|
|
@ -379,6 +379,16 @@ namespace NzbDrone.Common.Processes
|
|||
return ("cmd.exe", $"/c {path} {args}");
|
||||
}
|
||||
|
||||
if (OsInfo.IsWindows && path.EndsWith(".ps1", StringComparison.InvariantCultureIgnoreCase))
|
||||
{
|
||||
return ("powershell.exe", $"-ExecutionPolicy Bypass -NoProfile -File {path} {args}");
|
||||
}
|
||||
|
||||
if (OsInfo.IsWindows && path.EndsWith(".py", StringComparison.InvariantCultureIgnoreCase))
|
||||
{
|
||||
return ("python.exe", $"{path} {args}");
|
||||
}
|
||||
|
||||
return (path, args);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue