fix performance issues

2 files changed, 152 insertions, 0 deletions

diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 4426beec636..2671f5738b7 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -21,6 +21,53 @@
 
 class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share_Backend_Collection {
 
+	/**
+	 * get shared parents
+	 *
+	 * @param int $itemSource item source ID
+	 * @param string $shareWith with whom should the item be shared
+	 * @return array with shares
+	 */
+	public function getParents($itemSource, $shareWith = null) {
+		$result = array();
+		$parent = $this->getParentId($itemSource);
+		while ($parent) {
+			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith);
+			if ($shares) {
+				foreach ($shares as $share) {
+					$name = substr($share['path'], strrpos($share['path'], '/') + 1);
+					$share['collection']['path'] = $name;
+					$share['collection']['item_type'] = 'folder';
+					$share['file_path'] = $name;
+					$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
+					$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
+					$share['displayname_owner'] = ($displayNameOwner) ? $displayNameOwner : $share['uid_owner'];
+					$share['share_with_displayname'] = ($displayNameShareWith) ? $displayNameShareWith : $share['uid_owner'];
+
+					$result[] = $share;
+				}
+			}
+			$parent = $this->getParentId($parent);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * get file cache ID of parent
+	 *
+	 * @param int $child file cache ID of child
+	 * @return mixed parent ID or null
+	 */
+	private function getParentId($child) {
+		$query = \OC_DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+		$result = $query->execute(array($child));
+		$row = $result->fetchRow();
+		$parent = ($row) ? $row['parent'] : null;
+
+		return $parent;
+	}
+
 	public function getChildren($itemSource) {
 		$children = array();
 		$parents = array($itemSource);
diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php
new file mode 100644
index 00000000000..9653713a9f9
--- /dev/null
+++ b/apps/files_sharing/tests/backend.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once __DIR__ . '/base.php';
+
+use OCA\Files\Share;
+
+/**
+ * Class Test_Files_Sharing
+ */
+class Test_Files_Sharing_Backend extends Test_Files_Sharing_Base {
+
+	const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+	public $folder;
+	public $subfolder;
+	public $subsubfolder;
+
+	function setUp() {
+		parent::setUp();
+
+		$this->folder = self::TEST_FOLDER_NAME;
+		$this->subfolder  = '/subfolder_share_backend_test';
+		$this->subsubfolder = '/subsubfolder_share_backend_test';
+
+		$this->filename = '/share-backend-test.txt';
+
+		// save file with content
+		$this->view->file_put_contents($this->filename, $this->data);
+		$this->view->mkdir($this->folder);
+		$this->view->mkdir($this->folder . $this->subfolder);
+		$this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
+		$this->view->file_put_contents($this->folder.$this->filename, $this->data);
+		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
+		$this->view->file_put_contents($this->folder . $this->subfolder . $this->subsubfolder . $this->filename, $this->data);
+	}
+
+	function tearDown() {
+		$this->view->unlink($this->filename);
+		$this->view->deleteAll($this->folder);
+
+		parent::tearDown();
+	}
+
+	function testGetParents() {
+
+		$fileinfo1 = $this->view->getFileInfo($this->folder);
+		$fileinfo2 = $this->view->getFileInfo($this->folder . $this->subfolder . $this->subsubfolder);
+		$fileinfo3 = $this->view->getFileInfo($this->folder . $this->subfolder . $this->subsubfolder . $this->filename);
+
+		$this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				self::TEST_FILES_SHARING_API_USER2, 31));
+		$this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				self::TEST_FILES_SHARING_API_USER3, 31));
+
+		$backend = new \OC_Share_Backend_Folder();
+
+		$result = $backend->getParents($fileinfo3['fileid']);
+		$this->assertSame(2, count($result));
+
+		$count1 = 0;
+		$count2 = 0;
+		foreach($result as $r) {
+			if ($r['path'] === 'files' . $this->folder) {
+				$this->assertSame(ltrim($this->folder, '/'), $r['collection']['path']);
+				$count1++;
+			} elseif ($r['path'] === 'files' . $this->folder . $this->subfolder . $this->subsubfolder) {
+				$this->assertSame(ltrim($this->subsubfolder, '/'), $r['collection']['path']);
+				$count2++;
+			} else {
+				$this->assertTrue(false, 'unexpected result');
+			}
+		}
+
+		$this->assertSame(1, $count1);
+		$this->assertSame(1, $count2);
+
+		$result1 = $backend->getParents($fileinfo3['fileid'], self::TEST_FILES_SHARING_API_USER3);
+		$this->assertSame(1, count($result1));
+		$elemet = reset($result1);
+		$this->assertSame('files' . $this->folder . $this->subfolder . $this->subsubfolder ,$elemet['path']);
+		$this->assertSame(ltrim($this->subsubfolder, '/') ,$elemet['collection']['path']);
+
+	}
+
+}