aboutsummaryrefslogtreecommitdiff
path: root/go/operation/delete_content.go
diff options
context:
space:
mode:
Diffstat (limited to 'go/operation/delete_content.go')
-rw-r--r--go/operation/delete_content.go16
1 files changed, 4 insertions, 12 deletions
diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go
index f14259ee6..89f7fd695 100644
--- a/go/operation/delete_content.go
+++ b/go/operation/delete_content.go
@@ -2,23 +2,15 @@ package operation
import (
"code.google.com/p/weed-fs/go/glog"
- "code.google.com/p/weed-fs/go/storage"
"net/http"
)
func DeleteFile(server string, fileId string) error {
- fid, parseErr := storage.ParseFileId(fileId)
- if parseErr != nil {
- return parseErr
- }
- lookup, lookupError := Lookup(server, fid.VolumeId)
- if lookupError != nil {
- return lookupError
- }
- if len(lookup.Locations) == 0 {
- return nil
+ fileUrl, err := LookupFileId(server, fileId)
+ if err != nil {
+ return err
}
- return Delete("http://" + lookup.Locations[0].PublicUrl + "/" + fileId)
+ return Delete(fileUrl)
}
func Delete(url string) error {
req, err := http.NewRequest("DELETE", url, nil)