forked from TrueCloudLab/frostfs-s3-gw
Add writer detector
WriterDetector allows to fetch ContentType and write status response, when streaming content Signed-off-by: Evgeniy Kulikov <kim@nspcc.ru>
This commit is contained in:
parent
ef0e179b33
commit
776eed76fb
1 changed files with 31 additions and 4 deletions
|
@ -1,8 +1,10 @@
|
||||||
package handler
|
package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/nspcc-dev/neofs-s3-gate/api"
|
"github.com/nspcc-dev/neofs-s3-gate/api"
|
||||||
|
@ -10,6 +12,31 @@ import (
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type (
|
||||||
|
detector struct {
|
||||||
|
io.Writer
|
||||||
|
sync.Once
|
||||||
|
|
||||||
|
contentType string
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func newDetector(w io.Writer) *detector {
|
||||||
|
return &detector{Writer: w}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *detector) Write(data []byte) (int, error) {
|
||||||
|
d.Once.Do(func() {
|
||||||
|
if rw, ok := d.Writer.(http.ResponseWriter); ok {
|
||||||
|
rw.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
d.contentType = http.DetectContentType(data)
|
||||||
|
})
|
||||||
|
|
||||||
|
return d.Writer.Write(data)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *handler) GetObjectHandler(w http.ResponseWriter, r *http.Request) {
|
func (h *handler) GetObjectHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
|
@ -37,10 +64,12 @@ func (h *handler) GetObjectHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
writer := newDetector(w)
|
||||||
|
|
||||||
params := &layer.GetObjectParams{
|
params := &layer.GetObjectParams{
|
||||||
Bucket: inf.Bucket,
|
Bucket: inf.Bucket,
|
||||||
Object: inf.Name,
|
Object: inf.Name,
|
||||||
Writer: w,
|
Writer: writer,
|
||||||
}
|
}
|
||||||
|
|
||||||
// params.Length = inf.Size
|
// params.Length = inf.Size
|
||||||
|
@ -61,9 +90,7 @@ func (h *handler) GetObjectHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set("Content-Type", inf.ContentType)
|
w.Header().Set("Content-Type", writer.contentType)
|
||||||
w.Header().Set("Last-Modified", inf.Created.Format(http.TimeFormat))
|
w.Header().Set("Last-Modified", inf.Created.Format(http.TimeFormat))
|
||||||
w.Header().Set("Content-Length", strconv.FormatInt(inf.Size, 10))
|
w.Header().Set("Content-Length", strconv.FormatInt(inf.Size, 10))
|
||||||
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue