wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only generate previews in powers of 4 and set min

Browse source 
Before we'd round up all preview request to their nearest power of two.
This resulted still in a lot of possible images. Generating a lot of
server load and taking up a lot of space.

This moves it to previews to be powers of 4: 64, 256, 1024 and 4096
Also the first two powers are always skipped (4, 16) as it doesn't make
sense to generate previews for that.

We cache preview pretty agressively and I feel this is a better
tradeoff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-10-31 13:40:41 +01:00
parent 654365581b
commit ce10f8b8c4
No known key found for this signature in database
GPG key ID: F941078878347C0C
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) { 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)); $pow4height = 4 ** ceil(log($height) / log(4));
$pow2width = 2 ** ceil(log($width) / log(2)); $pow4width = 4 ** ceil(log($width) / log(4));
$ratioH = $height / $pow2height; // Minimum size is 64
$ratioW = $width / $pow2width; $pow4height = max($pow4height, 64);
$pow4width = max($pow4width, 64);
$ratioH = $height / $pow4height;
$ratioW = $width / $pow4width;
if ($ratioH < $ratioW) { if ($ratioH < $ratioW) {
$width = $pow2width; $width = $pow4width;
$height /= $ratioW; $height /= $ratioW;
} else { } else {
$height = $pow2height; $height = $pow4height;
$width /= $ratioH; $width /= $ratioH;
} }
} }

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

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