Collaborative locking #54
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
juliusknorr
force-pushed
the
enh/ocs-api
branch
from
81c0b3f to
c211bbe
Compare
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
2 times, most recently
from
1d53d77 to
1efd406
Compare
This was referenced Mar 23, 2022
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
from
90ab895 to
ac9b3a1
Compare
This was referenced Mar 24, 2022
Closed
vinicius73
reviewed
Apr 7, 2022
5 tasks
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
2 times, most recently
from
3477431 to
6973874
Compare
vinicius73
approved these changes
Apr 19, 2022
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
from
29c2c69 to
bdefda1
Compare
julien-nc
approved these changes
Apr 21, 2022
Comment on lines
+114
to
+117
|
|
||
|
|
||
|
|
There was a problem hiding this comment.
Any reason for those empty lines? 😁
| ``` | ||
| curl -X LOCK \ | ||
| --url http://admin:admin@nextcloud.dev.local/remote.php/dav/files/admin/myfile.odt \ | ||
| --header 'X-User-Lock: 1' |
There was a problem hiding this comment.
Maybe we should explain that this specifies the lock type. It's pretty self explanatory but still.
lib/Command/Lock.php
Outdated
| @@ -136,14 +136,16 @@ protected function execute(InputInterface $input, OutputInterface $output) { | |||
| $this->getStatus($input, $output, $fileId); | |||
| $this->unlockFile($input, $output, $fileId); | |||
| } catch (SuccessException $e) { | |||
| return; | |||
| return 0; | |||
There was a problem hiding this comment.
We could set the return type for this method. Or does it break the signature and then Php complains about a superclass method not being overloaded?
| @@ -94,7 +96,9 @@ public function locking(string $fileId): DataResponse { | |||
| $user = $this->userSession->getUser(); | |||
| $file = $this->fileService->getFileFromId($user->getUID(), (int)$fileId); | |||
|
|
|||
| $lock = $this->lockService->lockFile($file, $user); | |||
| $lock = $this->lockService->lock(new LockContext( | |||
There was a problem hiding this comment.
Any reason to name this controller's methods "locking" and "unlocking" instead of "lock" and "unlock"?
Signed-off-by: Julius Härtl <jus@bitgrid.net> WIP: working but no public api Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
from
7b514ab to
6e3e57c
Compare
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
… lock change Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
from
c516723 to
78e7373
Compare
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
from
29172c8 to
32eb85d
Compare
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Raudius
reviewed
May 2, 2022
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliusknorr
force-pushed
the
enh/collaborative-lock
branch
from
bac1cf4 to
4d3f9f2
Compare
|
Great work here! Thanks. 👏 |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #51
Fixes #57
Fixes #44
Only the parent etags should be updated, however this currently does not seem to propagate then to the parents of an incoming file share for the recipientWould require eTag for metadata changes server#8477This will enable the clients to already start with their implementation of file locking.