Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-21 02:45:59 +00:00
Code Releases Activity

Replace utils/file with go-fs and go-installer, fix previous tests

Browse Source
This commit is contained in:
Gerasimos Maropoulos
2016-09-01 06:34:55 +03:00
parent 1d49188da9
commit 6163726bc5
7 changed files with 65 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
context.go
View File

@@ -21,6 +21,8 @@ import (
"sync"
"time"
"github.com/kataras/go-fs"
"github.com/iris-contrib/formBinder"
"github.com/kataras/go-errors"
"github.com/kataras/iris/config"
@@ -405,12 +407,12 @@ func (ctx *Context) ReadForm(formObject interface{}) error {
multipartForm, err := reqCtx.MultipartForm()
if err == nil {
//we have multipart form
return errReadBody.Format(formBinder.Decode(multipartForm.Value, formObject))
return errReadBody.With(formBinder.Decode(multipartForm.Value, formObject))
}
// if no multipart and post arguments ( means normal form)
if reqCtx.PostArgs().Len() == 0 && reqCtx.QueryArgs().Len() == 0 {
return errReadBody.Format(errNoForm)
return errReadBody.With(errNoForm)
}
form := make(map[string][]string, reqCtx.PostArgs().Len()+reqCtx.QueryArgs().Len())
@@ -438,7 +440,7 @@ func (ctx *Context) ReadForm(formObject interface{}) error {
}
})
return errReadBody.Format(formBinder.Decode(form, formObject))
return errReadBody.With(formBinder.Decode(form, formObject))
}
/* Response */
@@ -637,7 +639,7 @@ func (ctx *Context) ServeContent(content io.ReadSeeker, filename string, modtime
return nil
}
ctx.RequestCtx.Response.Header.Set(contentType, utils.TypeByExtension(filename))
ctx.RequestCtx.Response.Header.Set(contentType, fs.TypeByExtension(filename))
ctx.RequestCtx.Response.Header.Set(lastModified, modtime.UTC().Format(config.TimeFormat))
ctx.RequestCtx.SetStatusCode(StatusOK)
var out io.Writer
@@ -654,7 +656,7 @@ func (ctx *Context) ServeContent(content io.ReadSeeker, filename string, modtime
}
_, err := io.Copy(out, content)
return errServeContent.Format(err)
return errServeContent.With(err)
}
// ServeFile serves a view file, to send a file ( zip for example) to the client you should use the SendFile(serverfilename,clientfilename)