owncloudsql: fix path, naming and listing spaces #4808
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
|
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
butonic
force-pushed
the
fix-owncloudsql
branch
2 times, most recently
from
4844350 to
1bfaac8
Compare
dragotin
approved these changes
Aug 14, 2024
kobergj
requested changes
Aug 14, 2024
pkg/rgrpc/todo/pool/selector.go
Outdated
| @@ -130,9 +132,15 @@ func (s *Selector[T]) Next(opts ...Option) (T, error) { | |||
|
|
|||
| existingClient, ok := s.clientMap.Load(target) | |||
| if ok { | |||
| if options.logger != nil { | |||
There was a problem hiding this comment.
We should not allow nil loggers. The logger field should default to a noop logger.
pkg/rgrpc/todo/pool/selector.go
Outdated
| return existingClient.(T), nil | ||
| } | ||
|
|
||
| if options.logger != nil { |
There was a problem hiding this comment.
Same here. Expect logger is not nil
| ) | ||
|
|
||
| // ListStorageSpaces lists storage spaces according to the provided filters | ||
| func (fs *owncloudsqlfs) ListStorageSpaces(ctx context.Context, filter []*provider.ListStorageSpacesRequest_Filter, unrestricted bool) ([]*provider.StorageSpace, error) { | ||
| var ( | ||
| spaceID = "*" | ||
| // uid *userpb.UserId |
There was a problem hiding this comment.
not yet. we need to implement the user filter in a subsequent pr. this PR just makes listing spaces and navigating files work again. I'm trying to make things work gradually...
| @@ -49,7 +51,7 @@ func (fs *owncloudsqlfs) ListStorageSpaces(ctx context.Context, filter []*provid | |||
| case provider.ListStorageSpacesRequest_Filter_TYPE_ID: | |||
| _, spaceID, _, _ = storagespace.SplitID(filter[i].GetId().OpaqueId) | |||
| case provider.ListStorageSpacesRequest_Filter_TYPE_USER: | |||
| _, spaceID, _, _ = storagespace.SplitID(filter[i].GetId().OpaqueId) | |||
| // uid = filter[i].GetUser() | |||
Comment on lines
+68
to
+70
| // if uid != nil && utils.UserIDEqual(uid, u.Id) { | ||
| // return nil, errtypes.PermissionDenied("cannot access space of other user?") | ||
| // } |
butonic
force-pushed
the
fix-owncloudsql
branch
from
1bfaac8 to
3ef9e6f
Compare
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
butonic
force-pushed
the
fix-owncloudsql
branch
from
3ef9e6f to
2862bcd
Compare
kobergj
approved these changes
Aug 14, 2024
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.
@dragotin owncloudsql has bitrotted. uploads are still broken, even with this PR. oCIS seems to equire the storage driver to implement listing upload sessions and using the event handler to integrate with postprocessing.
This PR is just the basic fixes to get listing spaces and basic file navigation working again.
why do I still do this? I think being able to switch from oc10 / nc to ocis effortless is a worthwile thing. It would be great if clients could deal with multiple 'personal' spaces, then we could just deploy an owncloudsql storage alongside decomposedfs and then users could migrate at will.
For that a readonly owncloudsql might make sense ... hm ... we could list the owncloudsql spaces as projects ... that only the one user has access to ... 🤔
it any case pls give me a +1 so I can start working on the upload sessions ...