From 3f0cb130421b4626041d3d60f0bde9e5da9d5dcc Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 22 Aug 2017 15:44:52 +0200 Subject: [PATCH] Allow getting the filepath when getting cached mounts by fileid Signed-off-by: Robin Appelman --- lib/composer/composer/autoload_classmap.php | 2 + lib/composer/composer/autoload_static.php | 2 + .../Files/Config/CachedMountFileInfo.php | 48 +++++++++++++++++++ lib/private/Files/Config/UserMountCache.php | 17 ++++++- .../Files/Config/ICachedMountFieInfo.php | 43 +++++++++++++++++ lib/public/Files/Config/IUserMountCache.php | 2 +- tests/lib/Files/Config/UserMountCacheTest.php | 4 ++ 7 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 lib/private/Files/Config/CachedMountFileInfo.php create mode 100644 lib/public/Files/Config/ICachedMountFieInfo.php diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index cea600bf59..444f8ef252 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -121,6 +121,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/ICachedMountFieInfo.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', @@ -598,6 +599,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 f476777e66..a4140038fe 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -151,6 +151,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/ICachedMountFieInfo.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', @@ -628,6 +629,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 index 0000000000..e315493a69 --- /dev/null +++ b/lib/private/Files/Config/CachedMountFileInfo.php @@ -0,0 +1,48 @@ + + * + * @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 . + * + */ + +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 9466aaf6c8..62befbf9e8 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -27,6 +27,7 @@ namespace OC\Files\Config; use OC\DB\QueryBuilder\Literal; 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; @@ -282,7 +283,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) { @@ -294,7 +295,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; } @@ -302,6 +303,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/ICachedMountFieInfo.php b/lib/public/Files/Config/ICachedMountFieInfo.php new file mode 100644 index 0000000000..e884b97550 --- /dev/null +++ b/lib/public/Files/Config/ICachedMountFieInfo.php @@ -0,0 +1,43 @@ + + * + * @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 . + * + */ + +namespace OCP\Files\Config; + +/** + * Holds information about a mount for a user + * + * @since 13.0.0 + */ +interface ICachedMountFileInfo extends ICachedMountInfo { + /** + * Return the path for the file within the cached mount + * + * @return string + * @since 13.0.0 + */ + public function getInternalPath(); + + /** + * @return string + * @since 13.0.0 + */ + public function getPath(); +} diff --git a/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php index fca797d3b6..4529edd8f6 100644 --- 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 a96b385fcb..ddf40a2b5e 100644 --- a/tests/lib/Files/Config/UserMountCacheTest.php +++ b/tests/lib/Files/Config/UserMountCacheTest.php @@ -380,6 +380,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() { @@ -412,6 +414,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() {