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

use built-in yt-dlp by default

Browse Source
This commit is contained in:
huangjx
2022-05-20 16:14:27 +08:00
parent ac4aaa0c07
commit dacb8af7ae
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Tools/Youtube.php
View File

@@ -1,4 +1,5 @@
<?php <?php
namespace OCA\NCDownloader\Tools; namespace OCA\NCDownloader\Tools;
use OCA\NCDownloader\Tools\Helper; use OCA\NCDownloader\Tools\Helper;
@@ -31,7 +32,7 @@ class Youtube
if (isset($binary) && $this->isExecutable($binary)) { if (isset($binary) && $this->isExecutable($binary)) {
$this->bin = $binary; $this->bin = $binary;
} else { } else {
$this->bin = Helper::findBinaryPath('youtube-dl', __DIR__ . "/../../bin/yt-dlp"); $this->bin = __DIR__ . "/../../bin/yt-dlp"; //Helper::findBinaryPath('youtube-dl', __DIR__ . "/../../bin/yt-dlp");
} }
if ($this->isInstalled() && !$this->isExecutable()) { if ($this->isInstalled() && !$this->isExecutable()) {
chmod($this->bin, 0744); chmod($this->bin, 0744);
@@ -144,7 +145,7 @@ class Youtube
$this->prependOption($this->bin); $this->prependOption($this->bin);
$process = new Process($this->options, null, $this->env); $process = new Process($this->options, null, $this->env);
$process->setTimeout($this->timeout); $process->setTimeout($this->timeout);
$data = ['link' => $url,'path' => $this->dbDlPath]; $data = ['link' => $url, 'path' => $this->dbDlPath];
if ($this->audioOnly) { if ($this->audioOnly) {
$data['ext'] = $this->audioFormat; $data['ext'] = $this->audioFormat;
} else { } else {
@@ -226,7 +227,6 @@ class Youtube
foreach ($this->options as $option) { foreach ($this->options as $option) {
$this->cmd .= " " . $option; $this->cmd .= " " . $option;
} }
} }
public function isInstalled() public function isInstalled()
{ {
@@ -263,5 +263,4 @@ class Youtube
{ {
return "https://github.com/shiningw/ncdownloader-bin/raw/master/yt-dlp"; return "https://github.com/shiningw/ncdownloader-bin/raw/master/yt-dlp";
} }
} }