reorder functions

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jun 3, 2022 · 6dae327 · 6dae327
1 parent 42a0265
commit 6dae327
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -632,26 +632,6 @@ func (s *service) Move(ctx context.Context, req *provider.MoveRequest) (*provide
 	})
 }
 
-// isRename checks if the two references lie in the responsibility of the sharesstorageprovider and if a rename occurs
-func isRename(s, d *provider.Reference) bool {
-	// if the source is a share jail child where the path is .
-	return ((isShareJailChild(s.ResourceId) && s.Path == ".") ||
-		// or if the source is the share jail with a single path segment, e.g. './old'
-		(isShareJailRoot(s.ResourceId) && len(strings.SplitN(s.Path, "/", 3)) == 2)) &&
-		// and if the destination is the share jail a single path segment, e.g. './new'
-		isShareJailRoot(d.ResourceId) && len(strings.SplitN(d.Path, "/", 3)) == 2
-}
-
-func isShareJailRoot(id *provider.ResourceId) bool {
-	_, space := storagespace.SplitStorageID(id.StorageId)
-	return space == utils.ShareStorageProviderID && id.OpaqueId == utils.ShareStorageProviderID
-}
-
-func isShareJailChild(id *provider.ResourceId) bool {
-	_, space := storagespace.SplitStorageID(id.StorageId)
-	return space == utils.ShareStorageProviderID && id.OpaqueId != utils.ShareStorageProviderID
-}
-
 // SetLock puts a lock on the given reference
 func (s *service) SetLock(ctx context.Context, req *provider.SetLockRequest) (*provider.SetLockResponse, error) {
 	return nil, gstatus.Errorf(codes.Unimplemented, "method not implemented")
@@ -1089,6 +1069,26 @@ func buildReferenceInShare(ref *provider.Reference, s *collaboration.ReceivedSha
 	}
 }
 
+// isRename checks if the two references lie in the responsibility of the sharesstorageprovider and if a rename occurs
+func isRename(s, d *provider.Reference) bool {
+	// if the source is a share jail child where the path is .
+	return ((isShareJailChild(s.ResourceId) && s.Path == ".") ||
+		// or if the source is the share jail with a single path segment, e.g. './old'
+		(isShareJailRoot(s.ResourceId) && len(strings.SplitN(s.Path, "/", 3)) == 2)) &&
+		// and if the destination is the share jail a single path segment, e.g. './new'
+		isShareJailRoot(d.ResourceId) && len(strings.SplitN(d.Path, "/", 3)) == 2
+}
+
+func isShareJailChild(id *provider.ResourceId) bool {
+	_, space := storagespace.SplitStorageID(id.StorageId)
+	return space == utils.ShareStorageProviderID && id.OpaqueId != utils.ShareStorageProviderID
+}
+
+func isShareJailRoot(id *provider.ResourceId) bool {
+	_, space := storagespace.SplitStorageID(id.StorageId)
+	return space == utils.ShareStorageProviderID && id.OpaqueId == utils.ShareStorageProviderID
+}
+
 func isVirtualRoot(ref *provider.Reference) bool {
 	return isShareJailRoot(ref.ResourceId) && (ref.Path == "" || ref.Path == "." || ref.Path == "./")
 }