Bläddra i källkod

Update ImageOptimizePipeline, improve support for disabling image optimizations

Daniel Supernault 2 år sedan
förälder
incheckning
e76289e4e2

+ 7 - 5
app/Jobs/ImageOptimizePipeline/ImageOptimize.php

@@ -39,16 +39,18 @@ class ImageOptimize implements ShouldQueue
      */
     public function handle()
     {
-    	if(config('pixelfed.optimize_image') == false) {
-    		return;
-    	}
-
         $media = $this->media;
         $path = storage_path('app/'.$media->media_path);
         if (!is_file($path) || $media->skip_optimize) {
             return;
         }
 
-        ImageResize::dispatch($media)->onQueue('mmo');
+        if(config('pixelfed.optimize_image') == false) {
+        	ImageThumbnail::dispatch($media)->onQueue('mmo');
+    		return;
+    	} else {
+        	ImageResize::dispatch($media)->onQueue('mmo');
+    		return;
+    	}
     }
 }

+ 4 - 0
app/Jobs/ImageOptimizePipeline/ImageResize.php

@@ -49,6 +49,10 @@ class ImageResize implements ShouldQueue
             return;
         }
 
+        if(!config('pixelfed.optimize_image')) {
+        	ImageThumbnail::dispatch($media)->onQueue('mmo');
+        	return;
+        }
         try {
             $img = new Image();
             $img->resizeImage($media);

+ 6 - 4
app/Jobs/ImageOptimizePipeline/ImageUpdate.php

@@ -61,10 +61,12 @@ class ImageUpdate implements ShouldQueue
 			return;
 		}
 
-		if (in_array($media->mime, $this->protectedMimes) == true) {
-			ImageOptimizer::optimize($thumb);
-			if(!$media->skip_optimize) {
-				ImageOptimizer::optimize($path);
+		if(config('pixelfed.optimize_image')) {
+			if (in_array($media->mime, $this->protectedMimes) == true) {
+				ImageOptimizer::optimize($thumb);
+				if(!$media->skip_optimize) {
+					ImageOptimizer::optimize($path);
+				}
 			}
 		}