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

Merge pull request #12166 from nextcloud/feature/limit_preview_sizes 

Only generate previews in powers of 4 and set min
This commit is contained in:
Roeland Jago Douma 2018-10-31 20:25:53 +01:00 committed by GitHub
parent ed35bc7f40 ce10f8b8c4
commit 3ee7597be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,19 +298,23 @@ class Generator {
if ($height !== $maxHeight && $width !== $maxWidth) {
/*
* Scale to the nearest power of two
* Scale to the nearest power of four
*/
$pow2height = 2 ** ceil(log($height) / log(2));
$pow2width = 2 ** ceil(log($width) / log(2));
$pow4height = 4 ** ceil(log($height) / log(4));
$pow4width = 4 ** ceil(log($width) / log(4));
$ratioH = $height / $pow2height;
$ratioW = $width / $pow2width;
// Minimum size is 64
$pow4height = max($pow4height, 64);
$pow4width = max($pow4width, 64);
$ratioH = $height / $pow4height;
$ratioW = $width / $pow4width;
if ($ratioH < $ratioW) {
$width = $pow2width;
$width = $pow4width;
$height /= $ratioW;
} else {
$height = $pow2height;
$height = $pow4height;
$width /= $ratioH;
}
}

22
tests/lib/Preview/GeneratorTest.php
View File

@ -104,7 +104,7 @@ class GeneratorTest extends \Test\TestCase {
$previewFile = $this->createMock(ISimpleFile::class);
$previewFolder->method('getFile')
->with($this->equalTo('128-128.png'))
->with($this->equalTo('256-256.png'))
->willReturn($previewFile);
$this->eventDispatcher->expects($this->once())
@ -212,7 +212,7 @@ class GeneratorTest extends \Test\TestCase {
->will($this->returnCallback(function($filename) use ($maxPreview, $previewFile) {
if ($filename === '2048-2048-max.png') {
return $maxPreview;
} else if ($filename === '128-128.png') {
} else if ($filename === '256-256.png') {
return $previewFile;
}
$this->fail('Unexpected file');
@ -223,7 +223,7 @@ class GeneratorTest extends \Test\TestCase {
->with($this->equalTo('my data'));
$previewFolder->method('getFile')
->with($this->equalTo('128-128.png'))
->with($this->equalTo('256-256.png'))
->willThrowException(new NotFoundException());
$image = $this->createMock(IImage::class);
@ -233,7 +233,7 @@ class GeneratorTest extends \Test\TestCase {
$image->expects($this->once())
->method('resize')
->with(128);
->with(256);
$image->method('data')
->willReturn('my resized data');
$image->method('valid')->willReturn(true);
@ -328,8 +328,8 @@ class GeneratorTest extends \Test\TestCase {
return [
[1024, 2048, 512, 512, false, IPreview::MODE_FILL, 256, 512],
[1024, 2048, 512, 512, false, IPreview::MODE_COVER, 512, 1024],
[1024, 2048, 512, 512, true, IPreview::MODE_FILL, 512, 512],
[1024, 2048, 512, 512, true, IPreview::MODE_COVER, 512, 512],
[1024, 2048, 512, 512, true, IPreview::MODE_FILL, 1024, 1024],
[1024, 2048, 512, 512, true, IPreview::MODE_COVER, 1024, 1024],
[1024, 2048, -1, 512, false, IPreview::MODE_COVER, 256, 512],
[1024, 2048, 512, -1, false, IPreview::MODE_FILL, 512, 1024],
@ -343,14 +343,20 @@ class GeneratorTest extends \Test\TestCase {
[2048, 1024, 512, 512, false, IPreview::MODE_FILL, 512, 256],
[2048, 1024, 512, 512, false, IPreview::MODE_COVER, 1024, 512],
[2048, 1024, 512, 512, true, IPreview::MODE_FILL, 512, 512],
[2048, 1024, 512, 512, true, IPreview::MODE_COVER, 512, 512],
[2048, 1024, 512, 512, true, IPreview::MODE_FILL, 1024, 1024],
[2048, 1024, 512, 512, true, IPreview::MODE_COVER, 1024, 1024],
[2048, 1024, -1, 512, false, IPreview::MODE_FILL, 1024, 512],
[2048, 1024, 512, -1, false, IPreview::MODE_COVER, 512, 256],
[2048, 1024, 4096, 1024, true, IPreview::MODE_FILL, 2048, 512],
[2048, 1024, 4096, 1024, true, IPreview::MODE_COVER, 2048, 512],
//Test minimum size
[2048, 1024, 32, 32, false, IPreview::MODE_FILL, 64, 32],
[2048, 1024, 32, 32, false, IPreview::MODE_COVER, 64, 32],
[2048, 1024, 32, 32, true, IPreview::MODE_FILL, 64, 64],
[2048, 1024, 32, 32, true, IPreview::MODE_COVER, 64, 64],
];
}