From 695405dfeb4da3733df1b1be239a97100f2ce66f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 27 Oct 2012 10:01:20 +0200
Subject: [PATCH] add permissions data to the results of the cache api

---
 lib/files/cache/cache.php         | 15 +++++++++++++++
 lib/files/cache/scanner.php       |  3 ++-
 lib/files/view.php                | 12 +++++++++++-
 tests/lib/files/cache/scanner.php |  2 ++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 7e0c5cb21f..5efc7d67c4 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -286,4 +286,19 @@ class Cache {
 		}
 		return $files;
 	}
+
+	/**
+	 * get all file ids on the files on the storage
+	 *
+	 * @return int[]
+	 */
+	public function getAll() {
+		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?');
+		$result = $query->execute(array($this->storageId));
+		$ids = array();
+		while ($row = $result->fetchRow()) {
+			$ids[] = $row['fileid'];
+		}
+		return $ids;
+	}
 }
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index e8f54c34be..0adde1d354 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -66,7 +66,8 @@ class Scanner {
 				$this->scanFile($parent);
 			}
 		}
-		$this->cache->put($file, $data);
+		$id = $this->cache->put($file, $data);
+		Permissions::set($id, \OC_User::getUser(), $data['permissions']);
 		return $data;
 	}
 
diff --git a/lib/files/view.php b/lib/files/view.php
index 04b7dca8af..82455d582e 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -686,6 +686,8 @@ class View {
 			}
 		}
 
+		$data['permissions'] = Cache\Permissions::get($data['fileid'], \OC_User::getUser());
+
 		return $data;
 	}
 
@@ -733,8 +735,16 @@ class View {
 			}
 		}
 
-		foreach($files as $i => $file){
+		$ids = array();
+
+		foreach ($files as $i => $file) {
 			$files[$i]['type'] = $file['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
+			$ids[] = $file['fileid'];
+		}
+
+		$permissions = Cache\Permissions::getMultiple($ids, \OC_User::getUser());
+		foreach ($files as $i => $file) {
+			$files[$i]['permissions'] = $permissions[$file['fileid']];
 		}
 
 		usort($files, "fileCmp"); //TODO: remove this once ajax is merged
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index e3f47047f5..34fefc784d 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -106,6 +106,8 @@ class Scanner extends \UnitTestCase {
 	}
 
 	function tearDown() {
+		$ids = $this->cache->getAll();
+		\OC\Files\Cache\Permissions::removeMultiple($ids, \OC_User::getUser());
 		$this->cache->clear();
 	}
 }