Skip to content

Allow to name a version #35160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 19 commits into from
Jan 30, 2023
Merged

Allow to name a version #35160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1ade482
Modernise hook listener of files_versions
artonge Nov 22, 2022
e82bfba
Create files_versions table
artonge Nov 14, 2022
629de6c
Support getting and patching version-label
artonge Nov 29, 2022
6a2f8bc
Allow to delete a version through DAV
artonge Nov 29, 2022
1adc9d2
Delete file versions entries in DB when node is deleted
artonge Nov 23, 2022
ad46996
Prevent expiration of named versions
artonge Nov 28, 2022
8f23cc8
Rename Hooks.php to FileEventsListener.php
artonge Nov 29, 2022
2ce4ac4
User rootFolder instead of userFolder in FileEventsListener
artonge Dec 1, 2022
53d7362
Adapt files_versions tests to modernized hooks
artonge Dec 12, 2022
d8b4797
Fix hookconnector tests
artonge Dec 7, 2022
c88328e
Handle empty files in version creation logic
artonge Dec 8, 2022
6dcfb29
Fix renaming files_versions
artonge Dec 8, 2022
84e5b9c
Prevent storing versions with the same mtime
artonge Dec 8, 2022
3da63f4
Use node's owner if no user is connected
artonge Dec 15, 2022
88abb2d
Fix versions restoring with S3
artonge Dec 15, 2022
305b1b6
Forward branch env var to the cypress container
artonge Dec 21, 2022
fd9937a
Add cypress tests
artonge Dec 21, 2022
9600265
Handle undefined label in front-end
artonge Jan 19, 2023
552f5b0
Compile assets
artonge Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix hookconnector tests 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Jan 26, 2023
commit d8b479752d327f8901a84454c17fd3c6f701a98d
35 changes: 5 additions & 30 deletions apps/files_versions/lib/Listener/FileEventsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,7 @@ public function write_hook(Node $node): void {
return;
}

$owner = $node->getOwner();
// if ($owner === null) {
// return;
// }
$userFolder = $this->rootFolder->getUserFolder($owner->getUID());

$userFolder = $this->rootFolder->getUserFolder($node->getOwner()->getUID());
$path = $userFolder->getRelativePath($node->getPath());
$result = Storage::store($path);

Expand Down Expand Up @@ -177,12 +172,7 @@ public function remove_hook(Node $node): void {
* 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 {
$owner = $node->getOwner();
// if ($owner === null) {
// return;
// }
$userFolder = $this->rootFolder->getUserFolder($owner->getUID());

$userFolder = $this->rootFolder->getUserFolder($node->getOwner()->getUID());
$path = $userFolder->getRelativePath($node->getPath());
Storage::markDeletedFile($path);
$this->versionsDeleted[$node->getPath()] = $node;
Expand All @@ -195,12 +185,7 @@ public function pre_remove_hook(Node $node): void {
* of the stored versions along the actual file
*/
public function rename_hook(Node $source, Node $target): void {
$owner = $target->getOwner();
// if ($owner === null) {
// return;
// }
$userFolder = $this->rootFolder->getUserFolder($owner->getUID());

$userFolder = $this->rootFolder->getUserFolder($target->getOwner()->getUID());
$oldPath = $userFolder->getRelativePath($source->getPath());
$newPath = $userFolder->getRelativePath($target->getPath());
Storage::renameOrCopy($oldPath, $newPath, 'rename');
Expand All @@ -213,12 +198,7 @@ public function rename_hook(Node $source, Node $target): void {
* the stored versions to the new location
*/
public function copy_hook(Node $source, Node $target): void {
$owner = $target->getOwner();
// if ($owner === null) {
// return;
// }
$userFolder = $this->rootFolder->getUserFolder($owner->getUID());

$userFolder = $this->rootFolder->getUserFolder($target->getOwner()->getUID());
$oldPath = $userFolder->getRelativePath($source->getPath());
$newPath = $userFolder->getRelativePath($target->getPath());
Storage::renameOrCopy($oldPath, $newPath, 'copy');
Expand All @@ -234,12 +214,7 @@ public function copy_hook(Node $source, Node $target): void {
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
$owner = $source->getOwner();
// if ($owner === null) {
// return;
// }
$userFolder = $this->rootFolder->getUserFolder($owner->getUID());

$userFolder = $this->rootFolder->getUserFolder($source->getOwner()->getUID());
$oldPath = $userFolder->getRelativePath($source->getPath());
$newPath = $userFolder->getRelativePath($target->getPath());
$absOldPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files' . $oldPath);
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/Files/Node/HookConnectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ protected function setUp(): void {
parent::setUp();
$this->userId = $this->getUniqueID();
$this->createUser($this->userId, 'pass');
// this will setup the FS
$this->loginAsUser($this->userId);
$this->registerMount($this->userId, new Temporary(), '/' . $this->userId . '/files/');
\OC_Util::setupFS($this->userId);
$this->view = new View();
$this->root = new Root(
Filesystem::getMountManager(),
Expand Down