mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-01 10:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

use existing mountpoint on auto accept

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2023-10-26 11:59:21 +02:00
parent 2bee588977
commit e8a3f28cf0
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/frontend/pkg/command/events.go
View File

@@ -162,11 +162,19 @@ func getMountpoint(ctx context.Context, itemid *provider.ResourceId, uid *user.U
// we need to sort the received shares by mount point in order to make things easier to evaluate.
base := path.Base(info.GetPath())
mount := base
var mountedShares []*collaboration.ReceivedShare
mountedShares := make([]*collaboration.ReceivedShare, 0, len(lrs.Shares))
for _, s := range lrs.Shares {
if !utils.ResourceIDEqual(s.Share.ResourceId, itemid) && s.State == collaboration.ShareState_SHARE_STATE_ACCEPTED {
mountedShares = append(mountedShares, s)
if s.State != collaboration.ShareState_SHARE_STATE_ACCEPTED {
// we don't care about unaccepted shares
continue
}
if utils.ResourceIDEqual(s.Share.ResourceId, itemid) {
// a share to the same resource already exists and is mounted
return s.MountPoint.Path, nil
}
mountedShares = append(mountedShares, s)
}
sort.Slice(mountedShares, func(i, j int) bool {