mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 20:29:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

the code duplication was reduced

Browse Source
This commit is contained in:
Roman Perekhod
2024-09-26 12:26:03 +02:00
parent 204e9df249
commit c30b4aeb54
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/activitylog/pkg/service/response.go
View File

@@ -80,15 +80,7 @@ func WithResource(ref *provider.Reference, addSpace bool) ActivityOption {
vars["resource"] = Resource{
Name: filepath.Base(ref.GetPath()),
}
n := filepath.Base(filepath.Dir(ref.GetPath()))
if n == "." || n == "/" {
s, err := utils.GetSpace(ctx, toSpace(ref).GetOpaqueId(), gwc)
if err == nil {
n = s.GetName()
} else {
n = "root"
}
}
n := getFolderName(ctx, gwc, ref)
vars["folder"] = Resource{
Name: n,
}
@@ -137,15 +129,7 @@ func WithTrashedResource(ref *provider.Reference, rid *provider.ResourceId) Acti
vars["resource"] = Resource{
Name: filepath.Base(ref.GetPath()),
}
n := filepath.Base(filepath.Dir(ref.GetPath()))
if n == "." || n == "/" {
s, err := utils.GetSpace(ctx, toSpace(ref).GetOpaqueId(), gwc)
if err == nil {
n = s.GetName()
} else {
n = "root"
}
}
n := getFolderName(ctx, gwc, ref)
vars["folder"] = Resource{
Name: n,
}
@@ -334,6 +318,19 @@ func (s *ActivitylogService) GetVars(ctx context.Context, opts ...ActivityOption
return vars, nil
}
func getFolderName(ctx context.Context, gwc gateway.GatewayAPIClient, ref *provider.Reference) string {
n := filepath.Base(filepath.Dir(ref.GetPath()))
if n == "." || n == "/" {
s, err := utils.GetSpace(ctx, toSpace(ref).GetOpaqueId(), gwc)
if err == nil {
n = s.GetName()
} else {
n = "root"
}
}
return n
}
func mapField(val string) string {
switch val {
case "TYPE_PERMISSIONS", "permission":