copy mutation in dir fix
This commit is contained in:
		
							parent
							
								
									33237b6564
								
							
						
					
					
						commit
						72901e4685
					
				@ -30,3 +30,7 @@ func getPathFromId(id string) string {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	return dir + "/"
 | 
						return dir + "/"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func getFilenameFromID(id string) string {
 | 
				
			||||||
 | 
						return filepath.Base(id)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -3,6 +3,7 @@ package s3browser
 | 
				
			|||||||
import (
 | 
					import (
 | 
				
			||||||
	"context"
 | 
						"context"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
 | 
						"strings"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/minio/minio-go/v7"
 | 
						"github.com/minio/minio-go/v7"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
@ -33,6 +34,13 @@ func copyMutation(ctx context.Context, src, dest string) (*File, error) {
 | 
				
			|||||||
		return nil, fmt.Errorf("Failed to get s3Client from context")
 | 
							return nil, fmt.Errorf("Failed to get s3Client from context")
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Check if dest is a file or a dir
 | 
				
			||||||
 | 
						if strings.HasSuffix(dest, "/") {
 | 
				
			||||||
 | 
							// create new dest id
 | 
				
			||||||
 | 
							// TODO: What if a file with this id already exists?
 | 
				
			||||||
 | 
							dest += getFilenameFromID(src)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	info, err := s3Client.CopyObject(ctx, minio.CopyDestOptions{
 | 
						info, err := s3Client.CopyObject(ctx, minio.CopyDestOptions{
 | 
				
			||||||
		Bucket: bucketName,
 | 
							Bucket: bucketName,
 | 
				
			||||||
		Object: dest,
 | 
							Object: dest,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user