Allow getting the filepath when getting cached mounts by fileid

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index a8aadc3b36cb806c930ed6525423911a4b636931..61df49cd5100031a9dfab0e0d38b7c29ddf7f4b7 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -115,6 +115,7 @@ return array(
     'OCP\\Files\\Cache\\IScanner' => $baseDir . '/lib/public/Files/Cache/IScanner.php',
     'OCP\\Files\\Cache\\IUpdater' => $baseDir . '/lib/public/Files/Cache/IUpdater.php',
     'OCP\\Files\\Cache\\IWatcher' => $baseDir . '/lib/public/Files/Cache/IWatcher.php',
+    'OCP\\Files\\Config\\ICachedMountFileInfo' => $baseDir . '/lib/public/Files/Config/ICachedMountFileInfo.php',
     'OCP\\Files\\Config\\ICachedMountInfo' => $baseDir . '/lib/public/Files/Config/ICachedMountInfo.php',
     'OCP\\Files\\Config\\IHomeMountProvider' => $baseDir . '/lib/public/Files/Config/IHomeMountProvider.php',
     'OCP\\Files\\Config\\IMountProvider' => $baseDir . '/lib/public/Files/Config/IMountProvider.php',
@@ -562,6 +563,7 @@ return array(
     'OC\\Files\\Cache\\Wrapper\\CachePermissionsMask' => $baseDir . '/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php',
     'OC\\Files\\Cache\\Wrapper\\CacheWrapper' => $baseDir . '/lib/private/Files/Cache/Wrapper/CacheWrapper.php',
     'OC\\Files\\Cache\\Wrapper\\JailPropagator' => $baseDir . '/lib/private/Files/Cache/Wrapper/JailPropagator.php',
+    'OC\\Files\\Config\\CachedMountFileInfo' => $baseDir . '/lib/private/Files/Config/CachedMountFileInfo.php',
     'OC\\Files\\Config\\CachedMountInfo' => $baseDir . '/lib/private/Files/Config/CachedMountInfo.php',
     'OC\\Files\\Config\\LazyStorageMountInfo' => $baseDir . '/lib/private/Files/Config/LazyStorageMountInfo.php',
     'OC\\Files\\Config\\MountProviderCollection' => $baseDir . '/lib/private/Files/Config/MountProviderCollection.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 2c7f26e654ab151fec129eb590f4fc0d716c3d6d..aa5990466fc06da058b844df4ca8d111b2f4811e 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -145,6 +145,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OCP\\Files\\Cache\\IScanner' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/IScanner.php',
         'OCP\\Files\\Cache\\IUpdater' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/IUpdater.php',
         'OCP\\Files\\Cache\\IWatcher' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/IWatcher.php',
+        'OCP\\Files\\Config\\ICachedMountFileInfo' => __DIR__ . '/../../..' . '/lib/public/Files/Config/ICachedMountFileInfo.php',
         'OCP\\Files\\Config\\ICachedMountInfo' => __DIR__ . '/../../..' . '/lib/public/Files/Config/ICachedMountInfo.php',
         'OCP\\Files\\Config\\IHomeMountProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IHomeMountProvider.php',
         'OCP\\Files\\Config\\IMountProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IMountProvider.php',
@@ -592,6 +593,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Files\\Cache\\Wrapper\\CachePermissionsMask' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php',
         'OC\\Files\\Cache\\Wrapper\\CacheWrapper' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/Wrapper/CacheWrapper.php',
         'OC\\Files\\Cache\\Wrapper\\JailPropagator' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/Wrapper/JailPropagator.php',
+        'OC\\Files\\Config\\CachedMountFileInfo' => __DIR__ . '/../../..' . '/lib/private/Files/Config/CachedMountFileInfo.php',
         'OC\\Files\\Config\\CachedMountInfo' => __DIR__ . '/../../..' . '/lib/private/Files/Config/CachedMountInfo.php',
         'OC\\Files\\Config\\LazyStorageMountInfo' => __DIR__ . '/../../..' . '/lib/private/Files/Config/LazyStorageMountInfo.php',
         'OC\\Files\\Config\\MountProviderCollection' => __DIR__ . '/../../..' . '/lib/private/Files/Config/MountProviderCollection.php',

diff --git a/lib/private/Files/Config/CachedMountFileInfo.php b/lib/private/Files/Config/CachedMountFileInfo.php
new file mode 100644 (file)
index 0000000..e315493
--- /dev/null
+++ b/lib/private/Files/Config/CachedMountFileInfo.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Files\Config;
+
+
+use OCP\Files\Config\ICachedMountFileInfo;
+use OCP\IUser;
+
+class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInfo {
+       /** @var string */
+       private $internalPath;
+
+       public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '', $internalPath) {
+               parent::__construct($user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath);
+               $this->internalPath = $internalPath;
+       }
+
+       public function getInternalPath() {
+               if ($this->getRootInternalPath()) {
+                       return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
+               } else {
+                       return $this->internalPath;
+               }
+       }
+
+       public function getPath() {
+               return $this->getMountPoint() . $this->getInternalPath();
+       }
+}
\ No newline at end of file

diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index 5829fdf512c66f7b1ff1c7994a1bc427f44b2d22..f33176b1e7bc97a1b998d84cb89e99ac4c3b9a29 100644 (file)
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -26,6 +26,7 @@ namespace OC\Files\Config;
 
 use OCA\Files_Sharing\SharedMount;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\Files\Config\ICachedMountFileInfo;
 use OCP\Files\Config\ICachedMountInfo;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\Mount\IMountPoint;
@@ -285,7 +286,7 @@ class UserMountCache implements IUserMountCache {
        /**
         * @param int $fileId
         * @param string|null $user optionally restrict the results to a single user
-        * @return ICachedMountInfo[]
+        * @return ICachedMountFileInfo[]
         * @since 9.0.0
         */
        public function getMountsForFileId($fileId, $user = null) {
@@ -297,7 +298,7 @@ class UserMountCache implements IUserMountCache {
                $mountsForStorage = $this->getMountsForStorageId($storageId, $user);
 
                // filter mounts that are from the same storage but a different directory
-               return array_filter($mountsForStorage, function (ICachedMountInfo $mount) use ($internalPath, $fileId) {
+               $filteredMounts = array_filter($mountsForStorage, function (ICachedMountInfo $mount) use ($internalPath, $fileId) {
                        if ($fileId === $mount->getRootId()) {
                                return true;
                        }
@@ -305,6 +306,18 @@ class UserMountCache implements IUserMountCache {
 
                        return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
                });
+
+               return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
+                       return new CachedMountFileInfo(
+                               $mount->getUser(),
+                               $mount->getStorageId(),
+                               $mount->getRootId(),
+                               $mount->getMountPoint(),
+                               $mount->getMountId(),
+                               $mount->getRootInternalPath(),
+                               $internalPath
+                       );
+               }, $filteredMounts);
        }
 
        /**

diff --git a/lib/public/Files/Config/ICachedMountFileInfo.php b/lib/public/Files/Config/ICachedMountFileInfo.php
new file mode 100644 (file)
index 0000000..48cfc5a
--- /dev/null
+++ b/lib/public/Files/Config/ICachedMountFileInfo.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Files\Config;
+
+/**
+ * Holds information about a mount for a user
+ *
+ * @since 12.0.5
+ */
+interface ICachedMountFileInfo extends ICachedMountInfo {
+       /**
+        * Return the path for the file within the cached mount
+        *
+        * @return string
+        * @since 12.0.5
+        */
+       public function getInternalPath();
+
+       /**
+        * @return string
+        * @since 12.0.5
+        */
+       public function getPath();
+}

diff --git a/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php
index cf30d8fb431509db299770a3e004de9c5988492a..0071581611f4d951f74ed54bd7ee8b2d75f81c5d 100644 (file)
--- a/lib/public/Files/Config/IUserMountCache.php
+++ b/lib/public/Files/Config/IUserMountCache.php
@@ -73,7 +73,7 @@ interface IUserMountCache {
         *
         * @param int $fileId
         * @param string|null $user optionally restrict the results to a single user @since 12.0.0
-        * @return ICachedMountInfo[]
+        * @return ICachedMountFileInfo[]
         * @since 9.0.0
         */
        public function getMountsForFileId($fileId, $user = null);

diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php
index 7df2598106a2f1207b1c2edcb11041d048b516d9..6bc83386037154ecf630f264504a20e8a1deeeb0 100644 (file)
--- a/tests/lib/Files/Config/UserMountCacheTest.php
+++ b/tests/lib/Files/Config/UserMountCacheTest.php
@@ -379,6 +379,8 @@ class UserMountCacheTest extends TestCase {
                $this->assertEquals($user1, $cachedMounts[0]->getUser());
                $this->assertEquals($rootId, $cachedMounts[0]->getRootId());
                $this->assertEquals(2, $cachedMounts[0]->getStorageId());
+               $this->assertEquals('foo/bar', $cachedMounts[0]->getInternalPath());
+               $this->assertEquals('/foo/foo/bar', $cachedMounts[0]->getPath());
        }
 
        public function testGetMountsForFileIdSubFolderMount() {
@@ -411,6 +413,8 @@ class UserMountCacheTest extends TestCase {
                $this->assertEquals($folderId, $cachedMounts[0]->getRootId());
                $this->assertEquals(2, $cachedMounts[0]->getStorageId());
                $this->assertEquals('foo', $cachedMounts[0]->getRootInternalPath());
+               $this->assertEquals('bar', $cachedMounts[0]->getInternalPath());
+               $this->assertEquals('/bar', $cachedMounts[0]->getPath());
        }
 
        public function testGetMountsForFileIdSubFolderMountOutside() {