From 87e67564fae10b86cfa92d5dfb06d0e9d722bf72 Mon Sep 17 00:00:00 2001 From: Netkas Date: Wed, 7 Dec 2022 23:11:27 -0500 Subject: [PATCH] Fully implemented all the runners https://git.n64.cc/nosial/ncc/-/issues/32 --- src/ncc/Abstracts/Runners.php | 3 --- src/ncc/Managers/ExecutionPointerManager.php | 12 ++++++++++++ src/ncc/Utilities/Functions.php | 8 ++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/ncc/Abstracts/Runners.php b/src/ncc/Abstracts/Runners.php index 85dc5fe..f6576c5 100644 --- a/src/ncc/Abstracts/Runners.php +++ b/src/ncc/Abstracts/Runners.php @@ -8,8 +8,6 @@ const bash = 'bash'; - const sh = 'sh'; - const python = 'python'; const python3 = 'python3'; @@ -24,7 +22,6 @@ const All = [ self::php, self::bash, - self::sh, self::python, self::python3, self::python2, diff --git a/src/ncc/Managers/ExecutionPointerManager.php b/src/ncc/Managers/ExecutionPointerManager.php index 34192e6..765b5dc 100644 --- a/src/ncc/Managers/ExecutionPointerManager.php +++ b/src/ncc/Managers/ExecutionPointerManager.php @@ -8,8 +8,12 @@ use ncc\Abstracts\Runners; use ncc\Abstracts\Scopes; use ncc\Classes\BashExtension\BashRunner; + use ncc\Classes\LuaExtension\LuaRunner; use ncc\Classes\PerlExtension\PerlRunner; use ncc\Classes\PhpExtension\PhpRunner; + use ncc\Classes\PythonExtension\Python2Runner; + use ncc\Classes\PythonExtension\Python3Runner; + use ncc\Classes\PythonExtension\PythonRunner; use ncc\Exceptions\AccessDeniedException; use ncc\Exceptions\ExecutionUnitNotFoundException; use ncc\Exceptions\FileNotFoundException; @@ -145,6 +149,10 @@ Runners::bash => BashRunner::getFileExtension(), Runners::php => PhpRunner::getFileExtension(), Runners::perl => PerlRunner::getFileExtension(), + Runners::python => PythonRunner::getFileExtension(), + Runners::python2 => Python2Runner::getFileExtension(), + Runners::python3 => Python3Runner::getFileExtension(), + Runners::lua => LuaRunner::getFileExtension(), default => throw new UnsupportedRunnerException('The runner \'' . $unit->ExecutionPolicy->Runner . '\' is not supported'), }; @@ -279,6 +287,10 @@ Runners::bash => BashRunner::prepareProcess($unit), Runners::php => PhpRunner::prepareProcess($unit), Runners::perl => PerlRunner::prepareProcess($unit), + Runners::python => PythonRunner::prepareProcess($unit), + Runners::python2 => Python2Runner::prepareProcess($unit), + Runners::python3 => Python3Runner::prepareProcess($unt), + Runners::lua => LuaRunner::prepareProcess($unit), default => throw new UnsupportedRunnerException('The runner \'' . $unit->ExecutionPolicy->Runner . '\' is not supported'), }; diff --git a/src/ncc/Utilities/Functions.php b/src/ncc/Utilities/Functions.php index 294ac7a..13e6413 100644 --- a/src/ncc/Utilities/Functions.php +++ b/src/ncc/Utilities/Functions.php @@ -6,8 +6,12 @@ use ncc\Abstracts\Runners; use ncc\Abstracts\Scopes; use ncc\Classes\BashExtension\BashRunner; + use ncc\Classes\LuaExtension\LuaRunner; use ncc\Classes\PerlExtension\PerlRunner; use ncc\Classes\PhpExtension\PhpRunner; + use ncc\Classes\PythonExtension\Python2Runner; + use ncc\Classes\PythonExtension\Python3Runner; + use ncc\Classes\PythonExtension\PythonRunner; use ncc\Exceptions\AccessDeniedException; use ncc\Exceptions\FileNotFoundException; use ncc\Exceptions\InvalidScopeException; @@ -262,6 +266,10 @@ Runners::bash => BashRunner::processUnit($path, $policy), Runners::php => PhpRunner::processUnit($path, $policy), Runners::perl => PerlRunner::processUnit($path, $policy), + Runners::python => PythonRunner::processUnit($path, $policy), + Runners::python2 => Python2Runner::processUnit($path, $policy), + Runners::python3 => Python3Runner::processUnit($path, $policy), + Runners::lua => LuaRunner::processUnit($path, $policy), default => throw new UnsupportedRunnerException('The runner \'' . $policy->Runner . '\' is not supported'), }; }