refactor api: lookup file id

2 files changed, 19 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)
diff --git a/go/operation/lookup_volume_id.go b/go/operation/lookup_volume_id.go
index d95a0738a..cd1d3b1bd 100644
--- a/go/operation/lookup_volume_id.go
+++ b/go/operation/lookup_volume_id.go
@@ -35,3 +35,18 @@ func Lookup(server string, vid storage.VolumeId) (*LookupResult, error) {
 	}
 	return &ret, nil
 }
+
+func LookupFileId(server string, fileId string) (fullUrl string, err 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 "", errors.New("File Not Found")
+	}
+	return "http://" + lookup.Locations[0].PublicUrl + "/" + fileId, nil
+}