diff options
Diffstat (limited to 'go/weed')
| -rw-r--r-- | go/weed/upload.go | 7 | ||||
| -rw-r--r-- | go/weed/volume.go | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/go/weed/upload.go b/go/weed/upload.go index 8e75b387b..7256093cf 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -78,7 +78,12 @@ func upload(filename string, server string, fid string) (int, error) { debug("Failed to stat file:", filename) return 0, fiErr } - ret, e := operation.Upload("http://"+server+"/"+fid+"?ts="+strconv.Itoa(int(fi.ModTime().Unix())), path.Base(filename), fh, false) + filename = path.Base(filename) + isGzipped := path.Ext(filename) == ".gz" + if isGzipped { + filename = filename[0:len(filename)-3] + } + ret, e := operation.Upload("http://"+server+"/"+fid+"?ts="+strconv.Itoa(int(fi.ModTime().Unix())), filename, fh, isGzipped) if e != nil { return 0, e } diff --git a/go/weed/volume.go b/go/weed/volume.go index dbc0ee547..a22babd45 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -272,13 +272,13 @@ func parseURLPath(path string) (vid, fid, filename, ext string) { vid, fid, filename = parts[1], parts[2], parts[3] ext = filepath.Ext(filename) case 2: - parts := strings.Split(path, "/") - vid, fid = parts[1], parts[2] - dotIndex := strings.LastIndex(fid, ".") - if dotIndex > 0 { - ext = fid[dotIndex:] - fid = fid[0:dotIndex] - } + parts := strings.Split(path, "/") + vid, fid = parts[1], parts[2] + dotIndex := strings.LastIndex(fid, ".") + if dotIndex > 0 { + ext = fid[dotIndex:] + fid = fid[0:dotIndex] + } default: sepIndex := strings.LastIndex(path, "/") commaIndex := strings.LastIndex(path[sepIndex:], ",") |