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

improved message displaying

Browse Source
This commit is contained in:
huangjx
2022-02-23 20:56:30 +08:00
parent 5429581f95
commit cf8b07932b
6 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Controller/MainController.php
View File

@@ -74,13 +74,18 @@ class MainController extends Controller
$params['ffmpeg_installed'] = Helper::ffmpegInstalled();
$errors = [];
if ($aria2_installed && !$aria2_executable) {
array_push($errors, sprintf("aria2 is installed but don't have the right permissions.Please execute command sudo chmod 755 %s", $aria2_bin));
if ($aria2_installed) {
if (!$aria2_executable) {
array_push($errors, sprintf("aria2 is installed but don't have the right permissions.Please execute command sudo chmod 755 %s", $aria2_bin));
}
if (!$params['aria2_running']) {
array_push($errors, $this->l10n->t("Aria2c is not running!"));
}
}
if ($youtube_installed && (!$youtube_executable || !@is_readable($youtube_bin))) {
array_push($errors, sprintf("youtube-dl is installed but don't have the right permissions.Please execute command sudo chmod 755 %s", $youtube_bin));
}
foreach ($params as $key => $value) {
if (strpos($key, "_") === false) {
continue;
@@ -90,7 +95,7 @@ class MainController extends Controller
continue;
}
if (!$value) {
array_push($errors, sprintf("%s is not installed", $name));
array_push($errors, $this->l10n->t(sprintf("%s is not installed", $name)));
}
}
$params['errors'] = $errors;

2
lib/Tools/Youtube.php
View File

@@ -161,7 +161,7 @@ class Youtube
$data = ['link' => $url];
$process->run(function ($type, $buffer) use ($data, $process) {
if (Process::ERR === $type) {
// $this->onError($buffer);
$this->onError($buffer);
} else {
$data['pid'] = $process->getPid();
$this->onOutput($buffer, $data);