Removed duplication of relativePathToSpaceID

Author: jessegeens

internal/http/services/owncloud/ocgraph/drives.go

@@ -158,15 +158,15 @@ func (s *svc) convertShareToSpace(rsi *gateway.ReceivedShareResourceInfo) *libre
 			Id:        libregraph.PtrString(fmt.Sprintf("%s$%s!%s", shareJailID, shareJailID, rsi.ReceivedShare.Share.Id.OpaqueId)),
 			WebDavUrl: libregraph.PtrString(fullURL(s.c.WebDavBase, rsi.ResourceInfo.Path)),
 			RemoteItem: &libregraph.RemoteItem{
-				DriveAlias: libregraph.PtrString(strings.TrimSuffix(strings.TrimPrefix(rsi.ResourceInfo.Path, "/"), relativePathToSpaceID(rsi.ResourceInfo))), // the drive alias must not start with /
+				DriveAlias: libregraph.PtrString(strings.TrimSuffix(strings.TrimPrefix(rsi.ResourceInfo.Path, "/"), spaces.RelativePathToSpaceID(rsi.ResourceInfo))), // the drive alias must not start with /
 				ETag:       libregraph.PtrString(rsi.ResourceInfo.Etag),
 				Folder:     &libregraph.Folder{},
 				// The Id must correspond to the id in the OCS response, for the time being
 				// It is in the form <something>!<something-else>
 				Id:                   libregraph.PtrString(spaces.EncodeResourceID(rsi.ResourceInfo.Id)),
 				LastModifiedDateTime: libregraph.PtrTime(time.Unix(int64(rsi.ResourceInfo.Mtime.Seconds), int64(rsi.ResourceInfo.Mtime.Nanos))),
 				Name:                 libregraph.PtrString(filepath.Base(rsi.ResourceInfo.Path)),
-				Path:                 libregraph.PtrString(relativePathToSpaceID(rsi.ResourceInfo)),
+				Path:                 libregraph.PtrString(spaces.RelativePathToSpaceID(rsi.ResourceInfo)),
 				// RootId must have the same token before ! as Id
 				// the second part for the time being is not used
 				RootId: libregraph.PtrString(fmt.Sprintf("%s!unused_root_id", spaces.EncodeSpaceID(rsi.ResourceInfo.Id.StorageId, rsi.ResourceInfo.Id.SpaceId))),
@@ -176,10 +176,6 @@ func (s *svc) convertShareToSpace(rsi *gateway.ReceivedShareResourceInfo) *libre
 	}
 }
 
-func relativePathToSpaceID(info *providerpb.ResourceInfo) string {
-	return strings.TrimPrefix(info.Path, info.Id.SpaceId)
-}
-
 func generateCs3Filters(request *godata.GoDataRequest) ([]*providerpb.ListStorageSpacesRequest_Filter, error) {
 	var filters spaces.ListStorageSpaceFilter
 	if request.Query.Filter != nil {

internal/http/services/owncloud/ocgraph/shares.go

@@ -135,7 +135,7 @@ func (s *svc) cs3ReceivedShareToDriveItem(ctx context.Context, rsi *gateway.Rece
 			Id:                   libregraph.PtrString(encodeSpaceIDForShareJail(rsi.ResourceInfo)),
 			LastModifiedDateTime: libregraph.PtrTime(utils.TSToTime(rsi.ResourceInfo.Mtime)),
 			Name:                 libregraph.PtrString(rsi.ResourceInfo.Name),
-			Path:                 libregraph.PtrString(relativePathToSpaceID(rsi.ResourceInfo)),
+			Path:                 libregraph.PtrString(spaces.RelativePathToSpaceID(rsi.ResourceInfo)),
 			// ParentReference: &libregraph.ItemReference{
 			// 	DriveId:   libregraph.PtrString(spaces.EncodeResourceID(share.ResourceInfo.ParentId)),
 			// 	DriveType: nil, // FIXME: no way to know it unless we hardcode it
@@ -322,7 +322,7 @@ func (s *svc) getSharedByMe(w http.ResponseWriter, r *http.Request) {
 
 func (s *svc) cs3ShareToDriveItem(ctx context.Context, info *provider.ResourceInfo, shares []*share) (*libregraph.DriveItem, error) {
 
-	parentRelativePath := path.Dir(relativePathToSpaceID(info))
+	parentRelativePath := path.Dir(spaces.RelativePathToSpaceID(info))
 
 	permissions, err := s.cs3sharesToPermissions(ctx, shares)
 	if err != nil {

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -1167,10 +1167,6 @@ func (h *Handler) addFilters(w http.ResponseWriter, r *http.Request, prefix stri
 	return collaborationFilters, linkFilters, nil
 }
 
-func relativePathToSpaceID(info *provider.ResourceInfo) string {
-	return strings.TrimPrefix(info.Path, info.Id.SpaceId)
-}
-
 func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, info *provider.ResourceInfo) error {
 	log := appctx.GetLogger(ctx)
 	if info != nil {
@@ -1189,8 +1185,8 @@ func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, inf
 		s.FileSource = s.ItemSource
 		switch {
 		case h.sharePrefix == "/":
-			s.FileTarget = relativePathToSpaceID(info)
-			s.Path = relativePathToSpaceID(info)
+			s.FileTarget = spaces.RelativePathToSpaceID(info)
+			s.Path = spaces.RelativePathToSpaceID(info)
 		case s.ShareType == conversions.ShareTypePublicLink:
 			s.FileTarget = path.Join("/", path.Base(info.Path))
 			s.Path = path.Join("/", path.Base(info.Path))

pkg/spaces/utils.go

@@ -85,3 +85,7 @@ func EncodeSpaceID(storageID, path string) string {
 	encodedPath := base32.StdEncoding.EncodeToString([]byte(path))
 	return fmt.Sprintf("%s$%s", storageID, encodedPath)
 }
+
+func RelativePathToSpaceID(info *provider.ResourceInfo) string {
+	return strings.TrimPrefix(info.Path, info.Id.SpaceId)
+}