From 9925ff33f10bbece12816c0638756eb0e6ddbe92 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Jul 2015 13:25:09 +0200
Subject: use cache data we already have to check if a thumbnail of specific
 size is cached

---
 lib/private/preview.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'lib/private/preview.php')

diff --git a/lib/private/preview.php b/lib/private/preview.php
index e445f5356a4..dabb274323f 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -479,7 +479,7 @@ class Preview {
 			$preview = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
 
 			// This checks if we have a preview of those exact dimensions in the cache
-			if ($this->userView->file_exists($preview)) {
+			if ($this->thumbnailSizeExists($allThumbnails, $previewWidth, $previewHeight)) {
 				return $preview;
 			}
 
@@ -524,6 +524,29 @@ class Preview {
 		return [$maxPreviewX, $maxPreviewY];
 	}
 
+	/**
+	 * Check if a specific thumbnail size is cached
+	 *
+	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
+	 * @param int $width
+	 * @param int $height
+	 * @return bool
+	 */
+	private function thumbnailSizeExists($allThumbnails, $width, $height) {
+
+		foreach ($allThumbnails as $thumbnail) {
+			$name = $thumbnail['name'];
+			if (strpos($name, 'max')) {
+				list($cachedWidth, $cachedHeight) = $this->getDimensionsFromFilename($name);
+				if ($cachedWidth === $width && $cachedHeight === $height) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Determines the size of the preview we should be looking for in the cache
 	 *
-- 
cgit v1.2.3