Ver código fonte

Update Blurhash util, add default hash for invalid media

Daniel Supernault 4 anos atrás
pai
commit
38a37c15af
1 arquivos alterados com 13 adições e 4 exclusões
  1. 13 4
      app/Util/Media/Blurhash.php

+ 13 - 4
app/Util/Media/Blurhash.php

@@ -7,19 +7,28 @@ use App\Media;
 
 
 class Blurhash {
 class Blurhash {
 
 
+	const DEFAULT_HASH = 'U4Rfzst8?bt7ogayj[j[~pfQ9Goe%Mj[WBay';
+
 	public static function generate(Media $media)
 	public static function generate(Media $media)
 	{
 	{
-		if(!in_array($media->mime, ['image/png', 'image/jpeg'])) {
-			return;
+		if(!in_array($media->mime, ['image/png', 'image/jpeg', 'video/mp4'])) {
+			return self::DEFAULT_HASH;
+		}
+
+		if($media->thumbnail_path == null) {
+			return self::DEFAULT_HASH;
 		}
 		}
 
 
 		$file  = storage_path('app/' . $media->thumbnail_path);
 		$file  = storage_path('app/' . $media->thumbnail_path);
 
 
 		if(!is_file($file)) {
 		if(!is_file($file)) {
-			return;
+			return self::DEFAULT_HASH;
 		}
 		}
 
 
 		$image = imagecreatefromstring(file_get_contents($file));
 		$image = imagecreatefromstring(file_get_contents($file));
+		if(!$image) {
+			return self::DEFAULT_HASH;
+		}
 		$width = imagesx($image);
 		$width = imagesx($image);
 		$height = imagesy($image);
 		$height = imagesy($image);
 
 
@@ -39,7 +48,7 @@ class Blurhash {
 		$components_y = 4;
 		$components_y = 4;
 		$blurhash = BlurhashEngine::encode($pixels, $components_x, $components_y);
 		$blurhash = BlurhashEngine::encode($pixels, $components_x, $components_y);
 		if(strlen($blurhash) > 191) {
 		if(strlen($blurhash) > 191) {
-			return;
+			return self::DEFAULT_HASH;
 		}
 		}
 		return $blurhash;
 		return $blurhash;
 	}
 	}