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

used a faster version of youtube-dl(#36);fixed yt binary download issuse;cleaning up

Browse Source
This commit is contained in:
huangjx
2022-03-05 09:58:05 +08:00
parent c8df2b9821
commit c7fd0f32af
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Tools/Helper.php
View File

@@ -174,8 +174,17 @@ class Helper
curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1); curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
$result = curl_exec($ch); $result = curl_exec($ch);
if (curl_errno($ch)) {
$error = 'Error:' . curl_error($ch);
}
curl_close($ch); curl_close($ch);
file_put_contents($file, $result); if (isset($error)) {
throw new \Exception($error);
} else {
if (!file_put_contents($file, $result)) {
throw new \Exception("failed to save " . $file);
}
}
} }
public static function is_function_enabled($function_name) public static function is_function_enabled($function_name)

41
lib/Tools/Youtube.php
View File

@@ -3,7 +3,6 @@ namespace OCA\NCDownloader\Tools;
use OCA\NCDownloader\Tools\Helper; use OCA\NCDownloader\Tools\Helper;
use OCA\NCDownloader\Tools\YoutubeHelper; use OCA\NCDownloader\Tools\YoutubeHelper;
use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
class Youtube class Youtube
@@ -31,7 +30,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/youtube-dl"); $this->bin = 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);
@@ -90,7 +89,7 @@ class Youtube
$this->setOption('--audio-format', $format); $this->setOption('--audio-format', $format);
} }
public function setvideoFormat($format) public function setVideoFormat($format)
{ {
$this->videoFormat = $format; $this->videoFormat = $format;
} }
@@ -122,29 +121,9 @@ class Youtube
array_unshift($this->options, $option); array_unshift($this->options, $option);
} }
public function downloadSync($url)
{
$this->downloadDir = $this->downloadDir ?? $this->defaultDir;
$this->prependOption($this->downloadDir . $this->outTpl);
$this->prependOption("--output");
$this->setUrl($url);
$this->prependOption($this->bin);
// $this->buildCMD();
$process = new Process($this->options, null, $this->env);
//the maximum time required to download the file
$process->setTimeout($this->timeout);
try {
$process->mustRun();
$output = $process->getOutput();
} catch (ProcessFailedException $exception) {
$output = $exception->getMessage();
}
return $output;
}
public function download($url) public function download($url)
{ {
$this->install();
if ($this->audioOnly) { if ($this->audioOnly) {
$this->audioMode(); $this->audioMode();
} else { } else {
@@ -255,16 +234,22 @@ class Youtube
{ {
return $this->bin; return $this->bin;
} }
public static function install() public function install()
{ {
$url = $this->installUrl(); $url = $this->installUrl();
$path = \OC::$server->getSystemConfig()->getValue('datadirectory'); $file = __DIR__ . "/../../bin/yt-dlp2";
Helper::Download($url, $path . "/youtube-dl"); try {
Helper::Download($url, $file);
chmod($file, 0744);
} catch (\Exception $e) {
return $e->getMessage();
}
return false;
} }
public function installUrl() public function installUrl()
{ {
return "https://yt-dl.org/downloads/latest/youtube-dl"; return "https://github.com/shiningw/ncdownloader-bin/raw/master/yt-dlp";
} }
} }