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

Remove unneeded returns from private cropping methods

This commit is contained in:
Olivier Paroz 2015-06-19 15:07:49 +02:00
parent 64f0fd0889
commit ba3b6f9be4
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/private/preview.php
View File

@ -701,9 +701,9 @@ class Preview {
$this->generatePreview($fileId); $this->generatePreview($fileId);
} }
// We still don't have a preview, so we send back the mime icon // We still don't have a preview, so we send back an empty object
if (is_null($this->preview)) { if (is_null($this->preview)) {
$this->getMimeIcon(); $this->preview = new \OC_Image();
} }
return $this->preview; return $this->preview;
@ -712,22 +712,26 @@ class Preview {
/** /**
* Sends the preview, including the headers to client which requested it * Sends the preview, including the headers to client which requested it
* *
* @param null|string $mimeType * @param null|string $mimeTypeForHeaders the media type to use when sending back the reply
* *
* @throws NotFoundException * @throws NotFoundException
*/ */
public function showPreview($mimeType = null) { public function showPreview($mimeTypeForHeaders = null) {
// Check if file is valid // Check if file is valid
if ($this->isFileValid() === false) { if ($this->isFileValid() === false) {
throw new NotFoundException('File not found.'); throw new NotFoundException('File not found.');
} }
\OCP\Response::enableCaching(3600 * 24); // 24 hours
if (is_null($this->preview)) { if (is_null($this->preview)) {
$this->getPreview(); $this->getPreview();
} }
if ($this->preview instanceof \OCP\IImage) { if ($this->preview instanceof \OCP\IImage) {
$this->preview->show($mimeType); if ($this->preview->valid()) {
\OCP\Response::enableCaching(3600 * 24); // 24 hours
} else {
$this->getMimeIcon();
}
$this->preview->show($mimeTypeForHeaders);
} }
} }
@ -1082,9 +1086,7 @@ class Preview {
} }
/** /**
* Creates a mime icon preview of the asked dimensions * Defines the media icon, for the media type of the original file, as the preview
*
* This will paste the mime icon in the middle of an empty preview of the asked dimension
*/ */
private function getMimeIcon() { private function getMimeIcon() {
$image = new \OC_Image(); $image = new \OC_Image();
@ -1096,13 +1098,7 @@ class Preview {
} }
$image->loadFromFile($mimeIconServerPath); $image->loadFromFile($mimeIconServerPath);
$previewWidth = (int)$image->width(); $this->preview = $image;
$previewHeight = (int)$image->height();
$askedWidth = $this->getMaxX();
$askedHeight = $this->getMaxY();
$this->cropAndFill(
$image, $askedWidth, $askedHeight, $previewWidth, $previewHeight
);
} }
/** /**

7
tests/lib/preview.php
View File

@ -210,9 +210,9 @@ class Preview extends TestCase {
} }
/** /**
* Tests if the media type icon fits into the asked dimensions * Tests if unsupported previews return an empty object
*/ */
public function testIsMimePreviewTheRightSize() { public function testUnsupportedPreviewsReturnEmptyObject() {
$width = 400; $width = 400;
$height = 200; $height = 200;
@ -226,8 +226,7 @@ class Preview extends TestCase {
$preview->getPreview(); $preview->getPreview();
$image = $preview->getPreview(); $image = $preview->getPreview();
$this->assertSame($width, $image->width()); $this->assertSame(false, $image->valid());
$this->assertSame($height, $image->height());
} }
/** /**