From 13369f8367e91a817017da96b93fefefdf461a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 3 May 2023 09:18:19 +0200 Subject: [PATCH] only stat if property is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/graph/pkg/service/v0/driveitems.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/services/graph/pkg/service/v0/driveitems.go b/services/graph/pkg/service/v0/driveitems.go index 69832e4ee..e23ceb3ad 100644 --- a/services/graph/pkg/service/v0/driveitems.go +++ b/services/graph/pkg/service/v0/driveitems.go @@ -237,12 +237,9 @@ func (g Graph) getSpecialDriveItems(ctx context.Context, baseURL *url.URL, space return nil } metadata := space.Opaque.Map - names := map[string]string{ - SpaceImageSpecialFolderName: "/.space/logo.png", - ReadmeSpecialFolderName: "/.space/readme.md", - } + names := [2]string{SpaceImageSpecialFolderName, ReadmeSpecialFolderName} - for itemName, itemPath := range names { + for _, itemName := range names { // The default is a path relative to the space root var ref storageprovider.Reference if itemID, ok := metadata[itemName]; ok { @@ -252,16 +249,11 @@ func (g Graph) getSpecialDriveItems(ctx context.Context, baseURL *url.URL, space ref = storageprovider.Reference{ ResourceId: &rid, } - } else { - ref = storageprovider.Reference{ - ResourceId: space.GetRoot(), - Path: itemPath, + spaceItem := g.getSpecialDriveItem(ctx, ref, itemName, baseURL, space) + if spaceItem != nil { + spaceItems = append(spaceItems, *spaceItem) } } - spaceItem := g.getSpecialDriveItem(ctx, ref, itemName, baseURL, space) - if spaceItem != nil { - spaceItems = append(spaceItems, *spaceItem) - } } // cache properties