Skip to content

Commit

Permalink
fix(workflows): Fix file systemtag cache
Browse files Browse the repository at this point in the history
Signed-off-by: Joas Schilling <coding@schilljs.com>
  • Loading branch information
nickvergessen committed Jul 11, 2024
1 parent 5b514e1 commit 89d9bcf
Showing 1 changed file with 9 additions and 21 deletions.
30 changes: 9 additions & 21 deletions apps/workflowengine/lib/Check/FileSystemTags.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/
namespace OCA\WorkflowEngine\Check;

use OC\Files\Storage\Wrapper\Jail;
use OCA\Files_Sharing\SharedStorage;
use OCA\WorkflowEngine\Entity\File;
use OCP\Files\Cache\ICache;
Expand All @@ -39,7 +40,6 @@
use OCP\SystemTag\TagNotFoundException;
use OCP\WorkflowEngine\ICheck;
use OCP\WorkflowEngine\IFileCheck;
use OC\Files\Storage\Wrapper\Wrapper;

class FileSystemTags implements ICheck, IFileCheck {
use TFileCheck;
Expand Down Expand Up @@ -154,27 +154,15 @@ protected function getSystemTags() {
* @return int[]
*/
protected function getFileIds(ICache $cache, $path, $isExternalStorage) {
/** @psalm-suppress InvalidArgument */
if ($this->storage->instanceOfStorage(\OCA\GroupFolders\Mount\GroupFolderStorage::class)) {
// Special implementation for groupfolder since all groupfolders share the same storage
// id so add the group folder id in the cache key too.
$groupFolderStorage = $this->storage;
if ($this->storage instanceof Wrapper) {
$groupFolderStorage = $this->storage->getInstanceOfStorage(\OCA\GroupFolders\Mount\GroupFolderStorage::class);
}
if ($groupFolderStorage === null) {
throw new \LogicException('Should not happen: Storage is instance of GroupFolderStorage but no group folder storage found while unwrapping.');
}
/**
* @psalm-suppress UndefinedDocblockClass
* @psalm-suppress UndefinedInterfaceMethod
*/
$cacheId = $cache->getNumericStorageId() . '/' . $groupFolderStorage->getFolderId();
$cacheId = $cache->getNumericStorageId();
if ($this->storage->instanceOfStorage(Jail::class)) {
$absolutePath = $this->storage->getUnjailedPath($path);
} else {
$cacheId = $cache->getNumericStorageId();
$absolutePath = $path;
}
if (isset($this->fileIds[$cacheId][$path])) {
return $this->fileIds[$cacheId][$path];

if (isset($this->fileIds[$cacheId][$absolutePath])) {
return $this->fileIds[$cacheId][$absolutePath];
}

$parentIds = [];
Expand All @@ -189,7 +177,7 @@ protected function getFileIds(ICache $cache, $path, $isExternalStorage) {
$parentIds[] = $fileId;
}

$this->fileIds[$cacheId][$path] = $parentIds;
$this->fileIds[$cacheId][$absolutePath] = $parentIds;

return $parentIds;
}
Expand Down

0 comments on commit 89d9bcf

Please sign in to comment.