Skip to content

[Performance] Reuse preview directory listing #35129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 8 commits into from
Apr 17, 2023
Merged

[Performance] Reuse preview directory listing #35129

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b4d514
List preview directory only once
Glandos Nov 1, 2022
b6c65fe
php-cs-fix
Glandos Nov 1, 2022
4954bea
Ensure max preview image is not null
Glandos Nov 1, 2022
06a7e90
improve parameter doc
Glandos Nov 2, 2022
24c1213
Revert 0e49b40
Glandos Nov 2, 2022
384a1d3
adapt test to new workflow
Glandos Nov 3, 2022
3440387
gather code from small and max preview
Glandos Nov 5, 2022
e542e60
try to make linters happy
Glandos Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adapt test to new workflow 
getDirectoryListing should return all files
getFile is not called anymore

Signed-off-by: Glandos <[email protected]>
  • Loading branch information
@Glandos @szaimen
Glandos authored and szaimen committed Apr 17, 2023
commit 384a1d34a8d9daf0b03e0a43e033f3389f5fe28d
19 changes: 7 additions & 12 deletions tests/lib/Preview/GeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,12 @@ public function testGetCachedPreview() {
$maxPreview->method('getMimeType')
->willReturn('image/png');

$previewFolder->method('getDirectoryListing')
->willReturn([$maxPreview]);

$previewFile = $this->createMock(ISimpleFile::class);
$previewFile->method('getSize')->willReturn(1000);
$previewFile->method('getName')->willReturn('256-256.png');

$previewFolder->method('getFile')
->with($this->equalTo('256-256.png'))
->willReturn($previewFile);
$previewFolder->method('getDirectoryListing')
->willReturn([$maxPreview, $previewFile]);

$this->legacyEventDispatcher->expects($this->once())
->method('dispatch')
Expand Down Expand Up @@ -344,14 +341,12 @@ public function testReturnCachedPreviewsWithoutCheckingSupportedMimetype() {
$maxPreview->method('getMimeType')
->willReturn('image/png');

$previewFolder->method('getDirectoryListing')
->willReturn([$maxPreview]);

$preview = $this->createMock(ISimpleFile::class);
$preview->method('getSize')->willReturn(1000);
$previewFolder->method('getFile')
->with($this->equalTo('1024-512-crop.png'))
->willReturn($preview);
$preview->method('getName')->willReturn('1024-512-crop.png');

$previewFolder->method('getDirectoryListing')
->willReturn([$maxPreview, $preview]);

$this->previewManager->expects($this->never())
->method('isMimeSupported');
Expand Down