upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix renaming files_versions

Browse source 
Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Louis Chemineau 2022-12-08 16:40:10 +01:00 committed by Louis (Rebase PR Action)
parent c88328e68e
commit 6dcfb29cfc
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/files_versions/lib/Listener/FileEventsListener.php
View file

@ -33,7 +33,6 @@ namespace OCA\Files_Versions\Listener;
use OC\Files\Filesystem;
use OC\Files\Mount\MoveableMount;
use OC\Files\Node\NonExistingFile;
use OC\Files\Node\NonExistingFolder;
use OC\Files\View;
use OCA\Files_Versions\Db\VersionEntity;
use OCA\Files_Versions\Db\VersionsMapper;
@ -183,7 +182,7 @@ class FileEventsListener implements IEventListener {
return;
}
$userFolder = $this->rootFolder->getUserFolder($node->getOwner()->getUID());
$userFolder = $this->rootFolder->getUserFolder(\OC_User::getUser());
$path = $userFolder->getRelativePath($node->getPath());
$result = Storage::store($path);
@ -244,7 +243,7 @@ class FileEventsListener implements IEventListener {
return;
}
$node = $this->versionsDeleted[$path];
$userFolder = $this->rootFolder->getUserFolder($node->getOwner()->getUID());
$userFolder = $this->rootFolder->getUserFolder(\OC_User::getUser());
$relativePath = $userFolder->getRelativePath($node->getPath());
unset($this->versionsDeleted[$path]);
Storage::delete($relativePath);
@ -255,7 +254,7 @@ class FileEventsListener implements IEventListener {
* mark file as "deleted" so that we can clean up the versions if the file is gone
*/
public function pre_remove_hook(Node $node): void {
$userFolder = $this->rootFolder->getUserFolder($node->getOwner()->getUID());
$userFolder = $this->rootFolder->getUserFolder(\OC_User::getUser());
$path = $userFolder->getRelativePath($node->getPath());
Storage::markDeletedFile($path);
$this->versionsDeleted[$node->getPath()] = $node;
@ -268,7 +267,7 @@ class FileEventsListener implements IEventListener {
* of the stored versions along the actual file
*/
public function rename_hook(Node $source, Node $target): void {
$userFolder = $this->rootFolder->getUserFolder($target->getOwner()->getUID());
$userFolder = $this->rootFolder->getUserFolder(\OC_User::getUser());
$oldPath = $userFolder->getRelativePath($source->getPath());
$newPath = $userFolder->getRelativePath($target->getPath());
Storage::renameOrCopy($oldPath, $newPath, 'rename');
@ -281,7 +280,7 @@ class FileEventsListener implements IEventListener {
* the stored versions to the new location
*/
public function copy_hook(Node $source, Node $target): void {
$userFolder = $this->rootFolder->getUserFolder($target->getOwner()->getUID());
$userFolder = $this->rootFolder->getUserFolder(\OC_User::getUser());
$oldPath = $userFolder->getRelativePath($source->getPath());
$newPath = $userFolder->getRelativePath($target->getPath());
Storage::renameOrCopy($oldPath, $newPath, 'copy');
@ -297,7 +296,7 @@ class FileEventsListener implements IEventListener {
public function pre_renameOrCopy_hook(Node $source, Node $target): void {
// if we rename a movable mount point, then the versions don't have
// to be renamed
$userFolder = $this->rootFolder->getUserFolder($source->getOwner()->getUID());
$userFolder = $this->rootFolder->getUserFolder(\OC_User::getUser());
$oldPath = $userFolder->getRelativePath($source->getPath());
$newPath = $userFolder->getRelativePath($target->getPath());
$absOldPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files' . $oldPath);

4
apps/files_versions/tests/StorageTest.php
View file

@ -44,8 +44,6 @@ class StorageTest extends TestCase {
protected function setUp(): void {
parent::setUp();
\OC::$server->boot();
$expiration = $this->createMock(Expiration::class);
$expiration->method('getMaxAgeAsTimestamp')
->willReturnCallback(function () {
@ -53,7 +51,7 @@ class StorageTest extends TestCase {
});
$this->overwriteService(Expiration::class, $expiration);
// Hooks::connectHooks();
\OC::$server->boot();
$this->createUser('version_test', '');
$this->loginAsUser('version_test');

2
apps/files_versions/tests/VersioningTest.php
View file

@ -100,7 +100,7 @@ class VersioningTest extends \Test\TestCase {
// clear hooks
\OC_Hook::clear();
\OC::registerShareHooks(\OC::$server->getSystemConfig());
// \OCA\Files_Versions\Hooks::connectHooks();
\OC::$server->boot();
self::loginHelper(self::TEST_VERSIONS_USER);
$this->rootView = new \OC\Files\View();