X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPhoto.php;h=64d9e3542ae0f29836745dd0e9c389646a167892;hb=9a4128a5c8af7c9791d9196266cbec43c11adb16;hp=a10eeefd5225bc5f8c8413fbe3cee216949f8544;hpb=7e3196776bbc92a181bcc160f68b623fe8868ea1;p=friendica.git

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index a10eeefd52..64d9e3542a 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -28,6 +28,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Util\Proxy;
+use Friendica\Object\Image;
 
 /**
  * Photo Module
@@ -40,8 +41,9 @@ class Photo extends BaseModule
 	 * Fetch a photo or an avatar, in optional size, check for permissions and
 	 * return the image
 	 */
-	public static function init(array $parameters = [])
+	public static function rawContent(array $parameters = [])
 	{
+		$totalstamp = microtime(true);
 		$a = DI::app();
 		// @TODO: Replace with parameter from router
 		if ($a->argc <= 1 || $a->argc > 4) {
@@ -66,7 +68,9 @@ class Photo extends BaseModule
 
 		$customsize = 0;
 		$photo = false;
+		$scale = null;
 		// @TODO: Replace with parameter from router
+		$stamp = microtime(true);
 		switch($a->argc) {
 			case 4:
 				$customsize = intval($a->argv[2]);
@@ -90,6 +94,7 @@ class Photo extends BaseModule
 				}
 				break;
 		}
+		$fetch = microtime(true) - $stamp;
 
 		if ($photo === false) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
@@ -97,16 +102,20 @@ class Photo extends BaseModule
 
 		$cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
 
-		$img = MPhoto::getImageForPhoto($photo);
+		$stamp = microtime(true);
+		$imgdata = MPhoto::getImageDataForPhoto($photo);
+		$data = microtime(true) - $stamp;
 
-		if (is_null($img) || !$img->isValid()) {
-			Logger::log("Invalid photo with id {$photo["id"]}.");
+		if (empty($imgdata)) {
+			Logger::warning("Invalid photo with id {$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 ($img->getType() !== "image/gif" && $customsize > 0 && $customsize < 501) {
+		if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize < 501) {
+			$img = new Image($imgdata, $photo['type']);
 			$img->scaleToSquare($customsize);
+			$imgdata = $img->asString();
 		}
 
 		if (function_exists("header_remove")) {
@@ -114,22 +123,36 @@ class Photo extends BaseModule
 			header_remove("pragma");
 		}
 
-		header("Content-type: " . $img->getType());
+		header("Content-type: " . $photo['type']);
 
+		$stamp = microtime(true);
 		if (!$cacheable) {
 			// it is a private photo that they have no permission to view.
 			// tell the browser not to cache it, in case they authenticate
 			// and subsequently have permission to see it
 			header("Cache-Control: no-store, no-cache, must-revalidate");
 		} else {
-			$md5 = md5($img->asString());
+			$md5 = $photo['hash'] ?: md5($imgdata);
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
 			header("Etag: \"{$md5}\"");
 			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
 			header("Cache-Control: max-age=31536000");
 		}
+		$checksum = microtime(true) - $stamp;
 
-		echo $img->asString();
+		$stamp = microtime(true);
+		echo $imgdata;
+		$output = microtime(true) - $stamp;
+
+		$total = microtime(true) - $totalstamp;
+		$rest = $total - ($fetch + $data + $checksum + $output);
+
+		if (!is_null($scale) && ($scale < 4)) {
+			Logger::info('Performance:', ['scale' => $scale, 'resource' => $photo['resource-id'],
+				'total' => number_format($total, 3), 'fetch' => number_format($fetch, 3),
+				'data' => number_format($data, 3), 'checksum' => number_format($checksum, 3),
+				'output' => number_format($output, 3), 'rest' => number_format($rest, 3)]);
+		}
 
 		exit();
 	}
@@ -151,7 +174,7 @@ class Photo extends BaseModule
 
 		$photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);
 		if (empty($photo)) {
-			$contact = DBA::selectFirst('contact', ['uid' => $uid, 'self' => true]) ?: [];
+			$contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]) ?: [];
 
 			switch($type) {
 				case "profile":