sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52184 from nextcloud/backport/51020/stable30

pull/52102/head
Louis 2025-04-17 11:38:34 +07:00 committed by GitHub
parent 0de5806598 9bed21a8d7
commit e08afe0849
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Files/ObjectStore/ObjectStoreStorage.php
Unescape Escape View File

@ -602,7 +602,14 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil
public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, ?ICacheEntry $sourceCacheEntry = null): bool {
$sourceCache = $sourceStorage->getCache();
if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class) && $sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
if (
$sourceStorage->instanceOfStorage(ObjectStoreStorage::class) &&
$sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()
) {
if ($this->getCache()->get($targetInternalPath)) {
$this->unlink($targetInternalPath);
$this->getCache()->remove($targetInternalPath);
}
$this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
// Do not import any data when source and target bucket are identical.
return true;
@ -625,6 +632,10 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil
/** @var ObjectStoreStorage $sourceStorage */
$sourceStorage->setPreserveCacheOnDelete(false);
}
if ($this->getCache()->get($targetInternalPath)) {
$this->unlink($targetInternalPath);
$this->getCache()->remove($targetInternalPath);
}
$this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
return true;

18
tests/lib/Files/Storage/StoragesTest.php
Unescape Escape View File

@ -42,6 +42,24 @@ abstract class StoragesTest extends TestCase {
$this->assertEquals('foo', $this->storage1->file_get_contents($target));
}
public function testMoveFileFromStorageWithExistingTarget() {
$source = 'source.txt';
$target = 'target.txt';
$this->storage1->file_put_contents($target, 'bar');
$this->storage2->file_put_contents($source, 'foo');
$targetURN = $this->storage1->getURN($this->storage1->getCache()->get($target)->getID());
$sourceURN = $this->storage2->getURN($this->storage2->getCache()->get($source)->getID());
$this->storage1->moveFromStorage($this->storage2, $source, $target);
$this->assertTrue($this->storage1->file_exists($target), $target . ' was not created in DB');
$this->assertFalse($this->storage2->file_exists($source), $source . ' still exists in DB');
$this->assertTrue($this->storage1->getObjectStore()->objectExists($sourceURN), $sourceURN . ' was not created in bucket');
$this->assertFalse($this->storage1->getObjectStore()->objectExists($targetURN), $targetURN . ' still exists in bucket');
$this->assertEquals('foo', $this->storage1->file_get_contents($target));
}
public function testMoveDirectoryFromStorage() {
$this->storage2->mkdir('source');
$this->storage2->file_put_contents('source/test1.txt', 'foo');