clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unifiy storing of photos with previews

This commit is contained in:
Michael 2023-05-09 05:29:05 +00:00
parent 1789266859
commit d83073f2a2
3 changed files with 82 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/Model/Photo.php
View File

@ -1148,7 +1148,7 @@ class Photo
return []; return [];
} }
return ['image' => $image, 'filename' => $filename]; return ['image' => $image, 'filename' => $filename, 'size' => $filesize];
} }
/** /**
@ -1182,8 +1182,7 @@ class Photo
$image = $data['image']; $image = $data['image'];
$filename = $data['filename']; $filename = $data['filename'];
$width = $image->getWidth(); $filesize = $data['size'];
$height = $image->getHeight();
$resource_id = $resource_id ?: self::newResource(); $resource_id = $resource_id ?: self::newResource();
$album = $album ?: DI::l10n()->t('Wall Photos'); $album = $album ?: DI::l10n()->t('Wall Photos');
@ -1193,30 +1192,12 @@ class Photo
$allow_gid = ''; $allow_gid = '';
} }
$smallest = 0; $smallest = self::storeWithPreview($image, $user['uid'], $resource_id, $filename, $filesize, $album, $desc, $allow_cid, $allow_gid, $deny_cid, $deny_gid);
if ($smallest < 0) {
$result = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); Logger::notice('Photo not stored', ['resource-id' => $resource_id]);
if (!$result) {
Logger::warning('Photo could not be stored', ['uid' => $user['uid'], 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]);
return []; return [];
} }
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
}
if ($width > 320 || $height > 320) {
$r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 1, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if ($r) {
$smallest = 1;
}
$image->scaleDown(320);
$r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 2, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if ($r && ($smallest == 0)) {
$smallest = 2;
}
}
$condition = ['resource-id' => $resource_id]; $condition = ['resource-id' => $resource_id];
$photo = self::selectFirst(['id', 'datasize', 'width', 'height', 'type'], $condition, ['order' => ['width' => true]]); $photo = self::selectFirst(['id', 'datasize', 'width', 'height', 'type'], $condition, ['order' => ['width' => true]]);
if (empty($photo)) { if (empty($photo)) {
@ -1240,6 +1221,77 @@ class Photo
return $picture; return $picture;
} }
/**
* store photo metadata in db and binary with preview photos in default backend
*
* @param Image $image Image object with data
* @param integer $uid User ID
* @param string $resource_id Resource ID
* @param string $filename Filename
* @param integer $filesize Filesize
* @param string $album Album name
* @param string $description Photo caption
* @param string $allow_cid Permissions, allowed contacts
* @param string $allow_gid Permissions, allowed groups
* @param string $deny_cid Permissions, denied contacts
* @param string $deny_gid Permissions, denied group
*
* @return boolean True on success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function storeWithPreview(Image $image, int $uid, string $resource_id, string $filename, int $filesize, string $album, string $description, string $allow_cid, string $allow_gid, string $deny_cid, string $deny_gid): int
{
$width = $image->getWidth();
$height = $image->getHeight();
$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if ($maximagesize && $filesize > $maximagesize) {
// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
foreach ([5120, 2560, 1280, 640, 320] as $pixels) {
if ($filesize > $maximagesize && max($width, $height) > $pixels) {
DI::logger()->info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]);
$image->scaleDown($pixels);
$filesize = strlen($image->asString());
$width = $image->getWidth();
$height = $image->getHeight();
}
}
if ($filesize > $maximagesize) {
DI::logger()->notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
return -1;
}
}
$width = $image->getWidth();
$height = $image->getHeight();
$smallest = 0;
$result = self::store($image, $uid, 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $description);
if (!$result) {
Logger::warning('Photo could not be stored', ['uid' => $uid, 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]);
return -1;
}
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
}
if ($width > 320 || $height > 320) {
$result = self::store($image, $uid, 0, $resource_id, $filename, $album, 1, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $description);
if ($result) {
$smallest = 1;
}
$image->scaleDown(320);
$result = self::store($image, $uid, 0, $resource_id, $filename, $album, 2, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $description);
if ($result && ($smallest == 0)) {
$smallest = 2;
}
}
return $smallest;
}
/** /**
* Upload a user avatar * Upload a user avatar
* *

50
src/Module/Media/Photo/Upload.php
View File

@ -164,34 +164,8 @@ class Upload extends \Friendica\BaseModule
$this->logger->info('File upload: Scaling picture to new size', ['max_length' => $max_length]); $this->logger->info('File upload: Scaling picture to new size', ['max_length' => $max_length]);
} }
$width = $image->getWidth();
$height = $image->getHeight();
$maximagesize = Strings::getBytesFromShorthand($this->config->get('system', 'maximagesize'));
if ($maximagesize && $filesize > $maximagesize) {
// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
foreach ([5120, 2560, 1280, 640] as $pixels) {
if ($filesize > $maximagesize && max($width, $height) > $pixels) {
$this->logger->info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]);
$image->scaleDown($pixels);
$filesize = strlen($image->asString());
$width = $image->getWidth();
$height = $image->getHeight();
}
}
if ($filesize > $maximagesize) {
@unlink($src);
$this->logger->notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
$this->return(401, $this->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
}
}
$resource_id = Photo::newResource(); $resource_id = Photo::newResource();
$smallest = 0;
// If we don't have an album name use the Wall Photos album // If we don't have an album name use the Wall Photos album
if (!strlen($album)) { if (!strlen($album)) {
$album = $this->t('Wall Photos'); $album = $this->t('Wall Photos');
@ -199,26 +173,10 @@ class Upload extends \Friendica\BaseModule
$allow_cid = '<' . $owner['id'] . '>'; $allow_cid = '<' . $owner['id'] . '>';
$result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 0, Photo::DEFAULT, $allow_cid); $smallest = Photo::storeWithPreview($image, $owner['uid'], $resource_id, $filename, $filesize, $album, '', $allow_cid, '', '', '');
if (!$result) { if ($smallest < 0) {
$this->logger->warning('Photo::store() failed', ['result' => $result]); $this->return(401, $this->t('Image could not be uploaded'));
$this->return(401, $this->t('Image upload failed.')); @unlink($src);
}
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
}
if ($width > 320 || $height > 320) {
$result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $allow_cid);
if ($result) {
$smallest = 1;
}
$image->scaleDown(320);
$result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $allow_cid);
if ($result && ($smallest == 0)) {
$smallest = 2;
}
} }
$this->logger->info('upload done'); $this->logger->info('upload done');

27
src/Module/Profile/Photos.php
View File

@ -229,38 +229,15 @@ class Photos extends \Friendica\Module\BaseProfile
$image->scaleDown($max_length); $image->scaleDown($max_length);
} }
$width = $image->getWidth();
$height = $image->getHeight();
$smallest = 0;
$resource_id = Photo::newResource(); $resource_id = Photo::newResource();
$r = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $smallest = Photo::storeWithPreview($image, $this->owner['uid'], $resource_id, $filename, $filesize, $album, '', $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if ($smallest < 0) {
if (!$r) {
$this->logger->warning('image store failed'); $this->logger->warning('image store failed');
$this->systemMessages->addNotice($this->t('Image upload failed.')); $this->systemMessages->addNotice($this->t('Image upload failed.'));
return; return;
} }
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
}
if ($width > 320 || $height > 320) {
$result = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if ($result) {
$smallest = 1;
}
$image->scaleDown(320);
$result = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if ($result && ($smallest == 0)) {
$smallest = 2;
}
}
$uri = Item::newURI(); $uri = Item::newURI();
// Create item container // Create item container