use source cache when listing folder during recursive copy

Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/38896/head
Robin Appelman 12 months ago committed by Julius Härtl
parent 1ca50d1a8a
commit 7f4de89b5e
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF

@ -35,6 +35,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\NotFoundException;
@ -550,7 +551,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
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;
}
}
@ -568,12 +569,12 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
throw new NotFoundException('Source object not found');
}
$this->copyInner($sourceEntry, $path2);
$this->copyInner($cache, $sourceEntry, $path2);
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) {
@ -582,8 +583,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
}
$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);

Loading…
Cancel
Save