implementing GET file

This commit is contained in:
tim-kos 2013-05-10 16:35:58 +02:00
parent 6be4b9690e
commit 4cf005572c
1 changed files with 42 additions and 1 deletions

View File

@ -96,6 +96,9 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} else if r.Method == "HEAD" { } else if r.Method == "HEAD" {
h.headFile(w, r, id) h.headFile(w, r, id)
return return
} else if r.Method == "GET" {
h.getFile(w, r, id)
return
} }
// handle invalid method // handle invalid method
@ -171,6 +174,44 @@ func (h *Handler) headFile(w http.ResponseWriter, r *http.Request, id string) {
w.Header().Set("Offset", fmt.Sprintf("%d", info.Offset)) w.Header().Set("Offset", fmt.Sprintf("%d", info.Offset))
} }
// GET requests on files aren't part of the protocol yet,
// but it is implemented here anyway for the demo. It still lacks the meta data
// extension in order to send the proper content type header.
func (h *Handler) getFile(w http.ResponseWriter, r *http.Request, fileId string) {
info, err := h.store.GetInfo(fileId)
if os.IsNotExist(err) {
h.err(err, w, http.StatusNotFound)
return
}
if err != nil {
h.err(err, w, http.StatusInternalServerError)
return
}
data, err := h.store.ReadFile(fileId)
if os.IsNotExist(err) {
h.err(err, w, http.StatusNotFound)
return
}
if err != nil {
h.err(err, w, http.StatusInternalServerError)
return
}
defer data.Close()
w.Header().Set("Offset", strconv.FormatInt(info.Offset, 10))
// @TODO: Once the meta extension is done, send the proper content type here
//w.Header().Set("Content-Type", info.Meta.ContentType)
w.Header().Set("Content-Length", strconv.FormatInt(info.FinalLength, 10))
if _, err := io.CopyN(w, data, info.FinalLength); err != nil {
return
}
}
func getPositiveIntHeader(r *http.Request, key string) (int64, error) { func getPositiveIntHeader(r *http.Request, key string) (int64, error) {
val := r.Header.Get(key) val := r.Header.Get(key)
if val == "" { if val == "" {