From 2f03fcab4af43de3ee5e0b25aa7aa18ca8f4c4db Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 17 Nov 2016 14:18:47 +0100
Subject: let the share backend get the node cacheentry to save queries

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/Files/Cache/Cache.php | 44 +++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'lib/private/Files')

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 5083b99b862..3a3f51488e6 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -142,25 +142,37 @@ class Cache implements ICache {
 			}
 			return $data;
 		} else {
-			//fix types
-			$data['fileid'] = (int)$data['fileid'];
-			$data['parent'] = (int)$data['parent'];
-			$data['size'] = 0 + $data['size'];
-			$data['mtime'] = (int)$data['mtime'];
-			$data['storage_mtime'] = (int)$data['storage_mtime'];
-			$data['encryptedVersion'] = (int)$data['encrypted'];
-			$data['encrypted'] = (bool)$data['encrypted'];
-			$data['storage'] = $this->storageId;
-			$data['mimetype'] = $this->mimetypeLoader->getMimetypeById($data['mimetype']);
-			$data['mimepart'] = $this->mimetypeLoader->getMimetypeById($data['mimepart']);
-			if ($data['storage_mtime'] == 0) {
-				$data['storage_mtime'] = $data['mtime'];
-			}
-			$data['permissions'] = (int)$data['permissions'];
-			return new CacheEntry($data);
+			return self::cacheEntryFromData($data, $this->storageId, $this->mimetypeLoader);
 		}
 	}
 
+	/**
+	 * Create a CacheEntry from database row
+	 *
+	 * @param array $data
+	 * @param string $storageId
+	 * @param IMimeTypeLoader $mimetypeLoader
+	 * @return CacheEntry
+	 */
+	public static function cacheEntryFromData($data, $storageId, IMimeTypeLoader $mimetypeLoader) {
+		//fix types
+		$data['fileid'] = (int)$data['fileid'];
+		$data['parent'] = (int)$data['parent'];
+		$data['size'] = 0 + $data['size'];
+		$data['mtime'] = (int)$data['mtime'];
+		$data['storage_mtime'] = (int)$data['storage_mtime'];
+		$data['encryptedVersion'] = (int)$data['encrypted'];
+		$data['encrypted'] = (bool)$data['encrypted'];
+		$data['storage'] = $storageId;
+		$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
+		$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
+		if ($data['storage_mtime'] == 0) {
+			$data['storage_mtime'] = $data['mtime'];
+		}
+		$data['permissions'] = (int)$data['permissions'];
+		return new CacheEntry($data);
+	}
+
 	/**
 	 * get the metadata of all files stored in $folder
 	 *
-- 
cgit v1.2.3