Move thumbnail check to the controller

Preview should be a generic class, so moved thumbnail specific code to the controller

1 files changed, 26 insertions, 29 deletions

diff --git a/preview/preview.php b/preview/preview.php
index 91724d15..c335418b 100644
--- a/preview/preview.php
+++ b/preview/preview.php
@@ -128,9 +128,6 @@ class Preview {
 		$previewData = $this->getPreviewFromCore($keepAspect);
 
 		if ($previewData && $previewData->valid()) {
-			if ($maxX === 200) { // Only fixing the square thumbnails
-				$previewData = $this->previewValidator();
-			}
 			$perfectPreview['preview'] = $previewData;
 		} else {
 			$perfectPreview['preview'] = $this->getMimeIcon();
@@ -150,6 +147,32 @@ class Preview {
 	}
 
 	/**
+	 * Makes sure we return previews of the asked dimensions and fix the cache
+	 * if necessary
+	 *
+	 * The Preview class sometimes return previews which are either wider or
+	 * smaller than the asked dimensions. This happens when one of the original
+	 * dimension is smaller than what is asked for
+	 *
+	 * @return resource
+	 */
+	public function previewValidator() {
+		list($maxX, $maxY) = $this->dims;
+		$previewData = $this->preview->getPreview();
+		$previewX = $previewData->width();
+		$previewY = $previewData->height();
+
+		if (($previewX > $maxX
+			 || ($previewX < $maxX || $previewY < $maxY))
+		) {
+			$fixedPreview = $this->fixPreview($previewData, $maxX, $maxY);
+			$previewData = $this->fixPreviewCache($fixedPreview);
+		}
+
+		return $previewData;
+	}
+
+	/**
 	 * Asks core for a preview based on our criteria
 	 *
 	 * @todo Need to read scaling setting from settings
@@ -179,32 +202,6 @@ class Preview {
 	}
 
 	/**
-	 * Makes sure we return previews of the asked dimensions and fix the cache
-	 * if necessary
-	 *
-	 * The Preview class sometimes return previews which are either wider or
-	 * smaller than the asked dimensions. This happens when one of the original
-	 * dimension is smaller than what is asked for
-	 *
-	 * @return resource
-	 */
-	private function previewValidator() {
-		list($maxX, $maxY) = $this->dims;
-		$previewData = $this->preview->getPreview();
-		$previewX = $previewData->width();
-		$previewY = $previewData->height();
-
-		if (($previewX > $maxX
-			 || ($previewX < $maxX || $previewY < $maxY))
-		) {
-			$fixedPreview = $this->fixPreview($previewData, $maxX, $maxY);
-			$previewData = $this->fixPreviewCache($fixedPreview);
-		}
-
-		return $previewData;
-	}
-
-	/**
 	 * Makes a preview fit in the asked dimension and fills the empty space
 	 *
 	 * @param \OC_Image $previewData