diff options
| author | Julius Härtl <jus@bitgrid.net> | 2023-06-19 22:40:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 22:40:55 +0200 |
| commit | bec4f76e6b1b064c39f9756c516e1833fe2efb12 (patch) | |
| tree | 507eee04d3a25ff164d78168e2f5ead61fcb2abd | |
| parent | d9bf410762e3e0e6bdb5a788ea6af5d314e7e523 (diff) | |
| parent | de85610385fe9f7a9bbf992f3fd59233e698e79a (diff) | |
| download | nextcloud-server-bec4f76e6b1b064c39f9756c516e1833fe2efb12.tar.gz nextcloud-server-bec4f76e6b1b064c39f9756c516e1833fe2efb12.zip | |
Merge pull request #38890 from nextcloud/obj-store-copy-list-source-cache
| -rw-r--r-- | lib/private/Files/ObjectStore/ObjectStoreStorage.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 978b5b0451c..d918bd98729 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -38,6 +38,7 @@ use Icewind\Streams\IteratorDirectory; use OC\Files\Cache\Cache; use OC\Files\Cache\CacheEntry; use OC\Files\Storage\PolyFill\CopyDirectory; +use OCP\Files\Cache\ICache; use OCP\Files\Cache\ICacheEntry; use OCP\Files\FileInfo; use OCP\Files\GenericFileException; @@ -593,7 +594,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil if (is_array($sourceEntryData) && array_key_exists('scan_permissions', $sourceEntryData)) { $sourceEntry['permissions'] = $sourceEntryData['scan_permissions']; } - $this->copyInner($sourceEntry, $targetInternalPath); + $this->copyInner($sourceStorage->getCache(), $sourceEntry, $targetInternalPath); return true; } } @@ -611,12 +612,12 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil throw new NotFoundException('Source object not found'); } - $this->copyInner($sourceEntry, $target); + $this->copyInner($cache, $sourceEntry, $target); return true; } - private function copyInner(ICacheEntry $sourceEntry, string $to) { + private function copyInner(ICache $sourceCache, ICacheEntry $sourceEntry, string $to) { $cache = $this->getCache(); if ($sourceEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) { @@ -625,8 +626,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil } $this->mkdir($to); - foreach ($cache->getFolderContentsById($sourceEntry->getId()) as $child) { - $this->copyInner($child, $to . '/' . $child->getName()); + foreach ($sourceCache->getFolderContentsById($sourceEntry->getId()) as $child) { + $this->copyInner($sourceCache, $child, $to . '/' . $child->getName()); } } else { $this->copyFile($sourceEntry, $to); |