use public url also for deletions

1 files changed, 12 insertions, 4 deletions

diff --git a/weed/operation/delete_content.go b/weed/operation/delete_content.go
index 361c09e7e..d4a72f375 100644
--- a/weed/operation/delete_content.go
+++ b/weed/operation/delete_content.go
@@ -29,10 +29,18 @@ func ParseFileId(fid string) (vid string, key_cookie string, err error) {
 }
 
 // DeleteFiles batch deletes a list of fileIds
-func DeleteFiles(master string, grpcDialOption grpc.DialOption, fileIds []string) ([]*volume_server_pb.DeleteResult, error) {
-
-	lookupFunc := func(vids []string) (map[string]LookupResult, error) {
-		return LookupVolumeIds(master, grpcDialOption, vids)
+func DeleteFiles(master string, usePublicUrl bool, grpcDialOption grpc.DialOption, fileIds []string) ([]*volume_server_pb.DeleteResult, error) {
+
+	lookupFunc := func(vids []string) (results map[string]LookupResult, err error) {
+		results, err = LookupVolumeIds(master, grpcDialOption, vids)
+		if err == nil && usePublicUrl {
+			for _, result := range results {
+				for _, loc := range result.Locations {
+					loc.Url = loc.PublicUrl
+				}
+			}
+		}
+		return
 	}
 
 	return DeleteFilesWithLookupVolumeId(grpcDialOption, fileIds, lookupFunc)