Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-10 05:25:58 +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

13
iris.go
View File

@@ -77,6 +77,7 @@ import (
"github.com/iris-contrib/response/xml"
"github.com/iris-contrib/template/html"
"github.com/kataras/go-errors"
"github.com/kataras/go-fs"
"github.com/kataras/iris/config"
"github.com/kataras/iris/context"
"github.com/kataras/iris/utils"
@@ -1724,9 +1725,9 @@ func (api *muxAPI) StaticServe(systemPath string, requestPath ...string) RouteNa
var reqPath string
if len(requestPath) == 0 {
reqPath = strings.Replace(systemPath, utils.PathSeparator, slash, -1) // replaces any \ to /
reqPath = strings.Replace(reqPath, "//", slash, -1) // for any case, replaces // to /
reqPath = strings.Replace(reqPath, ".", "", -1) // replace any dots (./mypath -> /mypath)
reqPath = strings.Replace(systemPath, fs.PathSeparator, slash, -1) // replaces any \ to /
reqPath = strings.Replace(reqPath, "//", slash, -1) // for any case, replaces // to /
reqPath = strings.Replace(reqPath, ".", "", -1) // replace any dots (./mypath -> /mypath)
} else {
reqPath = requestPath[0]
}
@@ -1734,10 +1735,10 @@ func (api *muxAPI) StaticServe(systemPath string, requestPath ...string) RouteNa
return api.Get(reqPath+"/*file", func(ctx *Context) {
filepath := ctx.Param("file")
spath := strings.Replace(filepath, "/", utils.PathSeparator, -1)
spath := strings.Replace(filepath, "/", fs.PathSeparator, -1)
spath = path.Join(systemPath, spath)
if !utils.DirectoryExists(spath) {
if !fs.DirectoryExists(spath) {
ctx.NotFound()
return
}
@@ -1816,7 +1817,7 @@ func (api *muxAPI) Favicon(favPath string, requestPath ...string) RouteNameFunc
fi, _ = f.Stat()
}
modtime := fi.ModTime().UTC().Format(config.TimeFormat)
cType := utils.TypeByExtension(favPath)
cType := fs.TypeByExtension(favPath)
// copy the bytes here in order to cache and not read the ico on each request.
cacheFav := make([]byte, fi.Size())
if _, err = f.Read(cacheFav); err != nil {