upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(previews): Cleanup Movie provider code and remove deprecated static vars

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-04-08 09:53:02 +02:00
parent 85934d4d79
commit 3ca690a9f3
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
3 changed files with 47 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/private/Preview/Movie.php
View file

@ -5,32 +5,21 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OC\Preview;
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\IConfig;
use OCP\IImage;
use OCP\ITempManager;
use OCP\Server;
use Psr\Log\LoggerInterface;
class Movie extends ProviderV2 {
private IConfig $config;
/**
* @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
* @var string
*/
public static $avconvBinary;
/**
* @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
* @var string
*/
public static $ffmpegBinary;
/** @var string */
private $binary;
private ?string $binary = null;
public function __construct(array $options = []) {
parent::__construct($options);
@ -45,14 +34,9 @@ class Movie extends ProviderV2 {
* {@inheritDoc}
*/
public function isAvailable(FileInfo $file): bool {
// TODO: remove when avconv is dropped
if (is_null($this->binary)) {
if (isset($this->options['movieBinary'])) {
$this->binary = $this->options['movieBinary'];
} elseif (is_string(self::$avconvBinary)) {
$this->binary = self::$avconvBinary;
} elseif (is_string(self::$ffmpegBinary)) {
$this->binary = self::$ffmpegBinary;
}
}
return is_string($this->binary);
@ -89,14 +73,11 @@ class Movie extends ProviderV2 {
return null;
}
$result = null;
if (is_string($absPath)) {
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
if ($result === null) {
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
if ($result === null) {
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
if ($result === null) {
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
}
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
}
}
@ -137,7 +118,15 @@ class Movie extends ProviderV2 {
}
private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $second): ?IImage {
$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
$tmpPath = Server::get(ITempManager::class)->getTemporaryFile();
if ($tmpPath === false) {
Server::get(LoggerInterface::class)->error(
'Failed to get local file to generate thumbnail for: ' . $absPath,
['app' => 'core']
);
return null;
}
$binaryType = substr(strrchr($this->binary, '/'), 1);
@ -190,7 +179,7 @@ class Movie extends ProviderV2 {
}
if ($second === 0) {
$logger = \OC::$server->get(LoggerInterface::class);
$logger = Server::get(LoggerInterface::class);
$logger->info('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]);
}

37
lib/private/Preview/ProviderV2.php
View file

@ -6,27 +6,23 @@ declare(strict_types=1);
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\Preview;
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\IImage;
use OCP\ITempManager;
use OCP\Preview\IProviderV2;
use OCP\Server;
use Psr\Log\LoggerInterface;
abstract class ProviderV2 implements IProviderV2 {
/** @var array */
protected $options;
protected array $tmpFiles = [];
/** @var array */
protected $tmpFiles = [];
/**
* Constructor
*
* @param array $options
*/
public function __construct(array $options = []) {
$this->options = $options;
public function __construct(
protected array $options = [],
) {
}
/**
@ -50,7 +46,7 @@ abstract class ProviderV2 implements IProviderV2 {
* @param File $file
* @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
* @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
* @return null|\OCP\IImage false if no preview was generated
* @return null|\OCP\IImage null if no preview was generated
* @since 17.0.0
*/
abstract public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage;
@ -63,12 +59,19 @@ abstract class ProviderV2 implements IProviderV2 {
* Get a path to either the local file or temporary file
*
* @param File $file
* @param int $maxSize maximum size for temporary files
* @return string|false
* @param ?int $maxSize maximum size for temporary files
*/
protected function getLocalFile(File $file, ?int $maxSize = null) {
protected function getLocalFile(File $file, ?int $maxSize = null): string|false {
if ($this->useTempFile($file)) {
$absPath = \OC::$server->getTempManager()->getTemporaryFile();
$absPath = Server::get(ITempManager::class)->getTemporaryFile();
if ($absPath === false) {
Server::get(LoggerInterface::class)->error(
'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
['app' => 'core']
);
return false;
}
$content = $file->fopen('r');
if ($content === false) {

17
tests/lib/Preview/MovieTest.php
View file

@ -7,6 +7,9 @@
namespace Test\Preview;
use OCP\IBinaryFinder;
use OCP\Server;
/**
* Class MovieTest
*
@ -16,20 +19,20 @@ namespace Test\Preview;
*/
class MovieTest extends Provider {
protected function setUp(): void {
$avconvBinary = \OC_Helper::findBinaryPath('avconv');
$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
$binaryFinder = Server::get(IBinaryFinder::class);
$movieBinary = $binaryFinder->findBinaryPath('avconv');
if (!is_string($movieBinary)) {
$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
}
if ($avconvBinary || $ffmpegBinary) {
if (is_string($movieBinary)) {
parent::setUp();
\OC\Preview\Movie::$avconvBinary = $avconvBinary;
\OC\Preview\Movie::$ffmpegBinary = $ffmpegBinary;
$fileName = 'testimage.mp4';
$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
$this->width = 560;
$this->height = 320;
$this->provider = new \OC\Preview\Movie;
$this->provider = new \OC\Preview\Movie(['movieBinary' => $movieBinary]);
} else {
$this->markTestSkipped('No Movie provider present');
}