fixed the issue of not returning the default provided value when finding binary path

This commit is contained in:
huangjx
2021-12-13 17:46:28 +08:00
parent 19b2b5739b
commit a1c6be039e
3 changed files with 3 additions and 3 deletions

View File

@@ -81,7 +81,7 @@ class YoutubeController extends Controller
$yt = $this->youtube;
$yt->audioOnly = (bool) $this->request->getParam('audio-only');
if (!$yt->isInstalled()) {
return new JSONResponse(["error" => "Youtube-dl is not installed!"]);
return new JSONResponse(["error" => "Please install the latest youtube-dl or make the bundled binary file executable in ncdownloader/bin"]);
}
if (Helper::isGetUrlSite($url)) {
return new JSONResponse($this->downloadUrlSite($url));

View File

@@ -201,7 +201,7 @@ class Helper
}
$dataPath = \OC::$server->getSystemConfig()->getValue('datadirectory');
$paths = ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin', '/opt/bin', $dataPath . "/bin"];
$result = null;
$result = $default;
$exeSniffer = new ExecutableFinder();
// Returns null if nothing is found
$result = $exeSniffer->find($program, $default, $paths);