Skip to content

perf(carddav): reduce disk usage of photocache #61957

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

Open
kesselb wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

perf(carddav): reduce disk usage of photocache #61957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions apps/dav/lib/CardDAV/PhotoCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@
class PhotoCache {
private ?IAppData $photoCacheAppData = null;

/** Maximum edge length (in pixels) for photos */
private const int MAX_SIZE = 2048;

/** @var array */
public const ALLOWED_CONTENT_TYPES = [
public const array ALLOWED_CONTENT_TYPES = [
'image/png' => 'png',
'image/jpeg' => 'jpg',
'image/gif' => 'gif',
Expand Down Expand Up @@ -98,6 +101,9 @@ private function hasPhoto(ISimpleFolder $folder): bool {
private function getFile(ISimpleFolder $folder, $size): ISimpleFile {
$ext = $this->getExtension($folder);

// cap the size
$size = (int)min($size, self::MAX_SIZE);

if ($size === -1) {
$path = 'photo.' . $ext;
} else {
Expand All @@ -122,9 +128,10 @@ private function getFile(ISimpleFolder $folder, $size): ISimpleFile {
}

$size = (int)($size * $ratio);
if ($size !== -1) {
$photo->resize($size);
}
// cap the size
$size = min($size, self::MAX_SIZE);

$photo->resize($size);

try {
$file = $folder->newFile($path);
Expand Down
Loading