From 582ce36aadccbc962ad01aebe2f0dcba7e790143 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Fri, 22 Oct 2021 15:19:09 +0200 Subject: [PATCH] fix space name when listing personal spaces (#2196) --- changelog/unreleased/update-storage-spaces.md | 1 + pkg/storage/utils/decomposedfs/spaces.go | 17 +++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/changelog/unreleased/update-storage-spaces.md b/changelog/unreleased/update-storage-spaces.md index c7b2fc5e15..940e58e929 100644 --- a/changelog/unreleased/update-storage-spaces.md +++ b/changelog/unreleased/update-storage-spaces.md @@ -4,3 +4,4 @@ Added the UpdateStorageSpace method to the decomposedfs. https://github.com/cs3org/reva/pull/2162 https://github.com/cs3org/reva/pull/2195 +https://github.com/cs3org/reva/pull/2196 diff --git a/pkg/storage/utils/decomposedfs/spaces.go b/pkg/storage/utils/decomposedfs/spaces.go index 276d0162d5..d84e9600c9 100644 --- a/pkg/storage/utils/decomposedfs/spaces.go +++ b/pkg/storage/utils/decomposedfs/spaces.go @@ -326,6 +326,10 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, node *node.Nod // TODO apply more filters + sname, err := xattr.Get(node.InternalPath(), xattrs.SpaceNameAttr) + if err != nil { + return nil, err + } space := &provider.StorageSpace{ // FIXME the driver should know its id move setting the spaceid from the storage provider to the drivers //Id: &provider.StorageSpaceId{OpaqueId: "1284d238-aa92-42ce-bdc4-0b0000009157!" + n.ID}, @@ -334,22 +338,11 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, node *node.Nod //StorageId: "1284d238-aa92-42ce-bdc4-0b0000009157", OpaqueId: node.ID, }, - Name: node.Name, + Name: string(sname), SpaceType: spaceType, // Mtime is set either as node.tmtime or as fi.mtime below } - switch space.SpaceType { - case "project": - sname, err := xattr.Get(node.InternalPath(), xattrs.SpaceNameAttr) - if err != nil { - return nil, err - } - space.Name = string(sname) - default: - space.Name = "root" - } - user := ctxpkg.ContextMustGetUser(ctx) // filter out spaces user cannot access (currently based on stat permission)