mirror of https://github.com/nextcloud/server.git
Send images to imaginary docker to generate previews
Signed-off-by: Carl Schwan <carl@carlschwan.eu> Co-Authored-by: Vincent Petry <vincent@nextcloud.com>pull/24166/head
Vincent Petry
4 years ago
committed by
Julius Härtl
parent
4cdc8900f7
commit
9b6a1cc8ae
@ -0,0 +1,136 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2020, Nextcloud, GmbH.
|
||||
*
|
||||
* @author Vincent Petry <vincent@nextcloud.com>
|
||||
* @author Carl Schwan <carl@carlschwan.eu>
|
||||
*
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Preview;
|
||||
|
||||
use OCP\Files\File;
|
||||
use OCP\Http\Client\IClientService;
|
||||
use OCP\IConfig;
|
||||
use OCP\IImage;
|
||||
|
||||
use OC\StreamImage;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class Imaginary extends ProviderV2 {
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
/** @var IClientService */
|
||||
private $service;
|
||||
|
||||
/** @var LoggerInterface */
|
||||
private $logger;
|
||||
|
||||
public function __construct(array $config) {
|
||||
parent::__construct($config);
|
||||
$this->config = \OC::$server->get(IConfig::class);
|
||||
$this->service = \OC::$server->get(IClientService::class);
|
||||
$this->logger = \OC::$server->get(LoggerInterface::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function getMimeType(): string {
|
||||
return self::supportedMimeTypes();
|
||||
}
|
||||
|
||||
public static function supportedMimeTypes(): string {
|
||||
return '/image\/(bmp|x-bitmap|png|jpeg|gif|heic|svg|webp)/';
|
||||
}
|
||||
|
||||
public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop): ?IImage {
|
||||
$maxSizeForImages = $this->config->getSystemValue('preview_max_filesize_image', 50);
|
||||
|
||||
$size = $file->getSize();
|
||||
|
||||
if ($maxSizeForImages !== -1 && $size > ($maxSizeForImages * 1024 * 1024)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$imaginaryUrl = $this->config->getSystemValueString('preview_imaginary_url', 'invalid');
|
||||
if ($imaginaryUrl === 'invalid') {
|
||||
$this->logger->error('Imaginary preview provider is enabled, but no url is configured. Please provide the url of your imaginary server to the \'preview_imaginary_url\' config variable.');
|
||||
return null;
|
||||
}
|
||||
$imaginaryUrl = rtrim($imaginaryUrl, '/');
|
||||
|
||||
// Object store
|
||||
$stream = $file->fopen('r');
|
||||
|
||||
$httpClient = $this->service->newClient();
|
||||
|
||||
switch ($file->getMimeType()) {
|
||||
case 'image/gif':
|
||||
case 'image/png':
|
||||
$mimeType = 'png';
|
||||
break;
|
||||
default:
|
||||
$mimeType = 'jpeg';
|
||||
}
|
||||
|
||||
$parameters = [
|
||||
'width' => $maxX,
|
||||
'height' => $maxY,
|
||||
'stripmeta' => 'true',
|
||||
'type' => $mimeType,
|
||||
];
|
||||
|
||||
|
||||
try {
|
||||
$response = $httpClient->post(
|
||||
$imaginaryUrl . ($crop ? '/smartcrop' : '/fit'), [
|
||||
'query' => $parameters,
|
||||
'stream' => true,
|
||||
'content-type' => $file->getMimeType(),
|
||||
'body' => $stream,
|
||||
'nextcloud' => ['allow_local_address' => true],
|
||||
]);
|
||||
} catch (\Exception $e) {
|
||||
$this->logger->error('Imaginary preview generation failed: ' . $e->getMessage(), [
|
||||
'exception' => $e,
|
||||
]);
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($response->getStatusCode() !== 200) {
|
||||
$this->logger->error('Imaginary preview generation failed: ' . json_decode($response->getBody())['message']);
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($response->getHeader('X-Image-Width') && $response->getHeader('X-Image-Height')) {
|
||||
$maxX = (int)$response->getHeader('X-Image-Width');
|
||||
$maxY = (int)$response->getHeader('X-Image-Height');
|
||||
}
|
||||
|
||||
$image = new StreamImage($response->getBody(), $response->getHeader('Content-Type'), $maxX, $maxY);
|
||||
return $image->valid() ? $image : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
|
||||
return $this->getCroppedThumbnail($file, $maxX, $maxY, false);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,152 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 Carl Schwan <carl@carlschwan.eu>
|
||||
*
|
||||
* @author Carl Schwan <carl@carlschwan.eu>
|
||||
*
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC;
|
||||
|
||||
use OCP\IStreamImage;
|
||||
use OCP\IImage;
|
||||
|
||||
/**
|
||||
* Only useful when dealing with transferring streamed previews from an external
|
||||
* service to an object store.
|
||||
*
|
||||
* Only width/height/resource and mimeType are implemented and will give you a
|
||||
* valid result.
|
||||
*/
|
||||
class StreamImage implements IStreamImage {
|
||||
/** @var resource The internal stream */
|
||||
private $stream;
|
||||
|
||||
/** @var string */
|
||||
private $mimeType;
|
||||
|
||||
/** @var int */
|
||||
private $width;
|
||||
|
||||
/** @var int */
|
||||
private $height;
|
||||
|
||||
/** @param resource $stream */
|
||||
public function __construct($stream, string $mimeType, int $width, int $height) {
|
||||
$this->stream = $stream;
|
||||
$this->mimeType = $mimeType;
|
||||
$this->width = $width;
|
||||
$this->height = $height;
|
||||
}
|
||||
|
||||
/** @inheritDoc */
|
||||
public function valid() {
|
||||
return is_resource($this->stream);
|
||||
}
|
||||
|
||||
/** @inheritDoc */
|
||||
public function mimeType() {
|
||||
return $this->mimeType;
|
||||
}
|
||||
|
||||
/** @inheritDoc */
|
||||
public function width() {
|
||||
return $this->width;
|
||||
}
|
||||
|
||||
/** @inheritDoc */
|
||||
public function height() {
|
||||
return $this->height;
|
||||
}
|
||||
|
||||
public function widthTopLeft() {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function heightTopLeft() {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function show($mimeType = null) {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function save($filePath = null, $mimeType = null) {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function resource() {
|
||||
return $this->stream;
|
||||
}
|
||||
|
||||
public function dataMimeType() {
|
||||
return $this->mimeType;
|
||||
}
|
||||
|
||||
public function data() {
|
||||
return '';
|
||||
}
|
||||
|
||||
public function getOrientation() {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function fixOrientation() {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function resize($maxSize) {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function preciseResize(int $width, int $height): bool {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function centerCrop($size = 0) {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function crop(int $x, int $y, int $w, int $h): bool {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function fitIn($maxWidth, $maxHeight) {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function scaleDownToFit($maxWidth, $maxHeight) {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function copy(): IImage {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function cropCopy(int $x, int $y, int $w, int $h): IImage {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function preciseResizeCopy(int $width, int $height): IImage {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
|
||||
public function resizeCopy(int $maxSize): IImage {
|
||||
throw new \BadMethodCallException('Not implemented');
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 Carl Schwan <carl@carlschwan.eu>
|
||||
*
|
||||
* @author Carl Schwan <carl@carlschwan.eu>
|
||||
*
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCP;
|
||||
|
||||
/**
|
||||
* @since 24.0.0
|
||||
*/
|
||||
interface IStreamImage extends IImage {
|
||||
}
|
||||
Loading…
Reference in New Issue