code optimization

lib/preview/images.php

@@ -26,10 +26,7 @@ class Image extends Provider {
 			$image->loadFromFile($fileview->getLocalFile($path));
 		}
 
-		//check if image object is valid
+		return $image->valid() ? $image : false;
-		if (!$image->valid()) return false;
-
-		return $image;
 	}
 }
 

lib/preview/movies.php

@@ -27,14 +27,13 @@ if(!is_null(shell_exec('ffmpeg -version'))) {
 			$cmd = 'ffmpeg -y  -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmppath);
 			shell_exec($cmd);
 
-			unlink($abspath);
 
 			$image = new \OC_Image($tmppath);
-			if (!$image->valid()) return false;
 
+			unlink($abspath);
 			unlink($tmppath);
 
-			return $image;
+			return $image->valid() ? $image : false;
 		}
 	}
 

lib/preview/mp3.php

@@ -28,9 +28,7 @@ class MP3 extends Provider {
 		unlink($tmppath);
 
 		$image = new \OC_Image($picture);
-		if (!$image->valid()) return $this->getNoCoverThumbnail($maxX, $maxY);
+		return $image->valid() ? $image : $this->getNoCoverThumbnail($maxX, $maxY);
-
-		return $image;
 	}
 
 	public function getNoCoverThumbnail($maxX, $maxY) {

lib/preview/pdf.php

@@ -32,9 +32,7 @@ if (extension_loaded('imagick')) {
 			//new image object
 			$image = new \OC_Image($pdf);
 			//check if image object is valid
-			if (!$image->valid()) return false;
+			return $image->valid() ? $image : false;
-
-			return $image;
 		}
 	}
 

lib/preview/svg.php

@@ -35,9 +35,7 @@ if (extension_loaded('imagick')) {
 			//new image object
 			$image = new \OC_Image($svg);
 			//check if image object is valid
-			if (!$image->valid()) return false;
+			return $image->valid() ? $image : false;
-
-			return $image;
 		}
 	}
 

lib/preview/txt.php

@@ -42,9 +42,7 @@ class TXT extends Provider {
 
 		$image = new \OC_Image($image);
 
-		if (!$image->valid()) return false;
+		return $image->valid() ? $image : false;
-
-		return $image;
 	}
 }