mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some code cleanup 

As suggested by the inspector

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-03-19 20:30:46 +01:00
parent 4cd13e7668
commit 0ad4b89d41
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/private/Preview/Generator.php
View File

@ -26,6 +26,7 @@ namespace OC\Preview;
use OCP\Files\File; use OCP\Files\File;
use OCP\Files\IAppData; use OCP\Files\IAppData;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IConfig; use OCP\IConfig;
@ -163,9 +164,13 @@ class Generator {
continue; continue;
} }
$path = strval($preview->width()) . '-' . strval($preview->height()) . '-max.png'; $path = (string)$preview->width() . '-' . (string)$preview->height() . '-max.png';
$file = $previewFolder->newFile($path); try {
$file->putContent($preview->data()); $file = $previewFolder->newFile($path);
$file->putContent($preview->data());
} catch (NotPermittedException $e) {
throw new NotFoundException();
}
return $file; return $file;
} }
@ -190,7 +195,7 @@ class Generator {
* @return string * @return string
*/ */
private function generatePath($width, $height, $crop) { private function generatePath($width, $height, $crop) {
$path = strval($width) . '-' . strval($height); $path = (string)$width . '-' . (string)$height;
if ($crop) { if ($crop) {
$path .= '-crop'; $path .= '-crop';
} }
@ -251,18 +256,18 @@ class Generator {
/* /*
* Scale to the nearest power of two * Scale to the nearest power of two
*/ */
$pow2height = pow(2, ceil(log($height) / log(2))); $pow2height = 2 ** ceil(log($height) / log(2));
$pow2width = pow(2, ceil(log($width) / log(2))); $pow2width = 2 ** ceil(log($width) / log(2));
$ratioH = $height / $pow2height; $ratioH = $height / $pow2height;
$ratioW = $width / $pow2width; $ratioW = $width / $pow2width;
if ($ratioH < $ratioW) { if ($ratioH < $ratioW) {
$width = $pow2width; $width = $pow2width;
$height = $height / $ratioW; $height /= $ratioW;
} else { } else {
$height = $pow2height; $height = $pow2height;
$width = $width / $ratioH; $width /= $ratioH;
} }
} }
@ -273,12 +278,12 @@ class Generator {
if ($height > $maxHeight) { if ($height > $maxHeight) {
$ratio = $height / $maxHeight; $ratio = $height / $maxHeight;
$height = $maxHeight; $height = $maxHeight;
$width = $width / $ratio; $width /= $ratio;
} }
if ($width > $maxWidth) { if ($width > $maxWidth) {
$ratio = $width / $maxWidth; $ratio = $width / $maxWidth;
$width = $maxWidth; $width = $maxWidth;
$height = $height / $ratio; $height /= $ratio;
} }
return [(int)round($width), (int)round($height)]; return [(int)round($width), (int)round($height)];
@ -321,8 +326,12 @@ class Generator {
} }
$path = $this->generatePath($width, $height, $crop); $path = $this->generatePath($width, $height, $crop);
$file = $previewFolder->newFile($path); try {
$file->putContent($preview->data()); $file = $previewFolder->newFile($path);
$file->putContent($preview->data());
} catch (NotPermittedException $e) {
throw new NotFoundException();
}
return $file; return $file;
} }