keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the raw data instead of an object

Browse source
This commit is contained in:
Michael 2020-12-26 19:31:39 +00:00
parent 7f56e2e7a9
commit 997319a41f
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Model/Photo.php
View file

@ -178,7 +178,7 @@ class Photo
/** /**
* Get Image object for given row id. null if row id does not exist * Get Image data for given row id. null if row id does not exist
* *
* @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref' * @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
* *
@ -186,7 +186,7 @@ class Photo
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getImageForPhoto(array $photo) public static function getImageDataForPhoto(array $photo)
{ {
$backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? ''); $backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
if ($backendClass === null) { if ($backendClass === null) {
@ -200,7 +200,21 @@ class Photo
$backendRef = $photo['backend-ref'] ?? ''; $backendRef = $photo['backend-ref'] ?? '';
$data = $backendClass->get($backendRef); $data = $backendClass->get($backendRef);
} }
return $data;
}
/**
* Get Image object for given row id. null if row id does not exist
*
* @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
*
* @return \Friendica\Object\Image
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function getImageForPhoto(array $photo)
{
$data = self::getImageDataForPhoto($photo);
if (empty($data)) { if (empty($data)) {
return null; return null;
} }

14
src/Module/Photo.php
View file

@ -102,17 +102,19 @@ class Photo extends BaseModule
$cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true); $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
$stamp = microtime(true); $stamp = microtime(true);
$img = MPhoto::getImageForPhoto($photo); $imgdata = MPhoto::getImageDataForPhoto($photo);
$data = microtime(true) - $stamp; $data = microtime(true) - $stamp;
if (is_null($img) || !$img->isValid()) { if (empty($imgdata)) {
Logger::warning("Invalid photo with id {$photo["id"]}."); Logger::warning("Invalid photo with id {$photo["id"]}.");
throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"])); throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"]));
} }
// if customsize is set and image is not a gif, resize it // if customsize is set and image is not a gif, resize it
if ($img->getType() !== "image/gif" && $customsize > 0 && $customsize < 501) { if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize < 501) {
$img = MPhoto::getImageForPhoto($photo);
$img->scaleToSquare($customsize); $img->scaleToSquare($customsize);
$imgdata = $img->asString();
} }
if (function_exists("header_remove")) { if (function_exists("header_remove")) {
@ -120,7 +122,7 @@ class Photo extends BaseModule
header_remove("pragma"); header_remove("pragma");
} }
header("Content-type: " . $img->getType()); header("Content-type: " . $photo['type']);
$stamp = microtime(true); $stamp = microtime(true);
if (!$cacheable) { if (!$cacheable) {
@ -129,7 +131,7 @@ class Photo extends BaseModule
// and subsequently have permission to see it // and subsequently have permission to see it
header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: no-store, no-cache, must-revalidate");
} else { } else {
$md5 = $photo['hash'] ?: md5($img->asString()); $md5 = $photo['hash'] ?: md5($imgdata);
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
header("Etag: \"{$md5}\""); header("Etag: \"{$md5}\"");
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
@ -138,7 +140,7 @@ class Photo extends BaseModule
$checksum = microtime(true) - $stamp; $checksum = microtime(true) - $stamp;
$stamp = microtime(true); $stamp = microtime(true);
echo $img->asString(); echo $imgdata;
$output = microtime(true) - $stamp; $output = microtime(true) - $stamp;
$total = microtime(true) - $totalstamp; $total = microtime(true) - $totalstamp;