pisto/ncdownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Controller/YoutubeController.php
View File

@@ -81,7 +81,7 @@ class YoutubeController extends Controller
$yt = $this->youtube; $yt = $this->youtube;
$yt->audioOnly = (bool) $this->request->getParam('audio-only'); $yt->audioOnly = (bool) $this->request->getParam('audio-only');
if (!$yt->isInstalled()) { 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)) { if (Helper::isGetUrlSite($url)) {
return new JSONResponse($this->downloadUrlSite($url)); return new JSONResponse($this->downloadUrlSite($url));

2
lib/Tools/Helper.php
View File

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

2
lib/Tools/Youtube.php
View File

@@ -60,7 +60,7 @@ class Youtube
if (Helper::ffmpegInstalled()) { if (Helper::ffmpegInstalled()) {
$this->addOption('--prefer-ffmpeg'); $this->addOption('--prefer-ffmpeg');
$this->addOption('--add-metadata'); $this->addOption('--add-metadata');
$this->setOption('--metadata-from-title',"%(artist)s-%(title)s"); $this->setOption('--metadata-from-title', "%(artist)s-%(title)s");
$this->addOption('--extract-audio'); $this->addOption('--extract-audio');
} }
$this->outTpl = "/%(id)s-%(title)s.m4a"; $this->outTpl = "/%(id)s-%(title)s.m4a";