diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2018-07-22 19:54:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 19:54:04 -0700 |
| commit | ff331178aac1ab733229dbea2ba5a47a354580ef (patch) | |
| tree | 9613faab9cb720796336ae9756fc8aa81fd8790f /weed/server | |
| parent | 7e76a7d21be7ddba9f371dac25a5e358e5b5b49e (diff) | |
| parent | 79d18c69b4ba68e6fb84893ff7b43027b4db5387 (diff) | |
| download | seaweedfs-ff331178aac1ab733229dbea2ba5a47a354580ef.tar.xz seaweedfs-ff331178aac1ab733229dbea2ba5a47a354580ef.zip | |
Merge pull request #695 from zhangmingfeng/master
增加chunk图片文件支持width和height
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index b784dd60e..734291a36 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -135,7 +135,8 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) } } } - if ext == ".png" || ext == ".jpg" || ext == ".gif" { + var rs io.ReadSeeker + if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" { width, height := 0, 0 if r.FormValue("width") != "" { width, _ = strconv.Atoi(r.FormValue("width")) @@ -143,10 +144,10 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) if r.FormValue("height") != "" { height, _ = strconv.Atoi(r.FormValue("height")) } - n.Data, _, _ = images.Resized(ext, n.Data, width, height, r.FormValue("mode")) + rs, _, _ = images.Resized(ext, bytes.NewReader(n.Data), width, height, r.FormValue("mode")) } - if e := writeResponseContent(filename, mtype, bytes.NewReader(n.Data), w, r); e != nil { + if e := writeResponseContent(filename, mtype, rs, w, r); e != nil { glog.V(2).Infoln("response write error:", e) } } @@ -164,6 +165,9 @@ func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string, if fileName == "" && chunkManifest.Name != "" { fileName = chunkManifest.Name } + + ext := path.Ext(fileName) + mType := "" if chunkManifest.Mime != "" { mt := chunkManifest.Mime @@ -179,7 +183,18 @@ func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string, Master: vs.GetMaster(), } defer chunkedFileReader.Close() - if e := writeResponseContent(fileName, mType, chunkedFileReader, w, r); e != nil { + var rs io.ReadSeeker + if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" { + width, height := 0, 0 + if r.FormValue("width") != "" { + width, _ = strconv.Atoi(r.FormValue("width")) + } + if r.FormValue("height") != "" { + height, _ = strconv.Atoi(r.FormValue("height")) + } + rs, _, _ = images.Resized(ext, chunkedFileReader, width, height, r.FormValue("mode")) + } + if e := writeResponseContent(fileName, mType, rs, w, r); e != nil { glog.V(2).Infoln("response write error:", e) } return true |