Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
fix(files_versions): Cache previews
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
provokateurin committed Mar 28, 2025
commit 4a2b0122304aab29daff63f3b53129cf538e7d97
4 changes: 3 additions & 1 deletion apps/files_versions/lib/Controller/PreviewController.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ public function getPreview(
$file = $userFolder->get($file);
$versionFile = $this->versionManager->getVersionFile($user, $file, $version);
$preview = $this->previewManager->getPreview($versionFile, $x, $y, true, IPreview::MODE_FILL, $versionFile->getMimetype());
return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
$response = new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
$response->cacheFor(3600 * 24, false, true);
return $response;
} catch (NotFoundException $e) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
} catch (\InvalidArgumentException $e) {
Expand Down
15 changes: 11 additions & 4 deletions apps/files_versions/tests/Controller/PreviewControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\Files_Versions\Tests\Controller;

use OCA\Files_Versions\Controller\PreviewController;
use OCA\Files_Versions\Versions\IVersionManager;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IMimeTypeDetector;
Expand All @@ -39,6 +39,8 @@
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Preview\IMimeIconProvider;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;

class PreviewControllerTest extends TestCase {
Expand All @@ -64,6 +66,8 @@ class PreviewControllerTest extends TestCase {
/** @var IVersionManager|\PHPUnit\Framework\MockObject\MockObject */
private $versionManager;

private IMimeIconProvider|MockObject $mimeIconProvider;

protected function setUp(): void {
parent::setUp();

Expand All @@ -79,14 +83,16 @@ protected function setUp(): void {
->method('getUser')
->willReturn($user);
$this->versionManager = $this->createMock(IVersionManager::class);
$this->mimeIconProvider = $this->createMock(IMimeIconProvider::class);

$this->controller = new PreviewController(
'files_versions',
$this->createMock(IRequest::class),
$this->rootFolder,
$this->userSession,
$this->versionManager,
$this->previewManager
$this->previewManager,
$this->mimeIconProvider,
);
}

Expand Down Expand Up @@ -150,9 +156,10 @@ public function testValidPreview() {
->willReturn('previewMime');

$res = $this->controller->getPreview('file', 10, 10, '42');
$expected = new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => 'previewMime']);

$this->assertEquals($expected, $res);
$this->assertEquals('previewMime', $res->getHeaders()['Content-Type']);
$this->assertEquals(Http::STATUS_OK, $res->getStatus());
$this->assertEquals($preview, $this->invokePrivate($res, 'file'));
}

public function testVersionNotFound() {
Expand Down