issue 43 "go fmt" chagnes from "Ryan S. Brown" <sb@ryansb.com>

some basic changes to parse upload url
This commit is contained in:
Chris Lu
2013-09-01 23:58:21 -07:00
parent 2e70cc8be7
commit 82b74c7940
28 changed files with 102 additions and 86 deletions

View File

@@ -6,19 +6,19 @@ import (
"net/http"
)
func DeleteFile(server string, fileId string) (error) {
func DeleteFile(server string, fileId string) error {
fid, parseErr := storage.ParseFileId(fileId)
if parseErr != nil {
return parseErr
}
lookup, lookupError := Lookup(server,fid.VolumeId)
lookup, lookupError := Lookup(server, fid.VolumeId)
if lookupError != nil {
return lookupError
return lookupError
}
if len(lookup.Locations) == 0 {
return nil
return nil
}
return Delete("http://"+lookup.Locations[0].PublicUrl+"/"+fileId)
return Delete("http://" + lookup.Locations[0].PublicUrl + "/" + fileId)
}
func Delete(url string) error {
req, err := http.NewRequest("DELETE", url, nil)

View File

@@ -95,8 +95,8 @@ func (fi FilePart) Upload(server string, fid string) (int, error) {
if fi.ModTime != 0 {
fileUrl += "?ts=" + strconv.Itoa(int(fi.ModTime))
}
if closer, ok := fi.Reader.(io.Closer); ok{
defer closer.Close()
if closer, ok := fi.Reader.(io.Closer); ok {
defer closer.Close()
}
ret, e := Upload(fileUrl, fi.FileName, fi.Reader, fi.IsGzipped, fi.MimeType)
if e != nil {