switch to mimemagic to avoid cgo
This commit is contained in:
parent
56e305bfcc
commit
2255716c7d
17
display.go
17
display.go
|
@ -6,8 +6,8 @@ import (
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"bitbucket.org/taruti/mimemagic"
|
||||||
"github.com/flosch/pongo2"
|
"github.com/flosch/pongo2"
|
||||||
"github.com/rakyll/magicmime"
|
|
||||||
"github.com/zenazn/goji/web"
|
"github.com/zenazn/goji/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -21,17 +21,12 @@ func fileDisplayHandler(c web.C, w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := magicmime.Open(magicmime.MAGIC_MIME_TYPE |
|
file, _ := os.Open(filePath)
|
||||||
magicmime.MAGIC_SYMLINK |
|
header := make([]byte, 512)
|
||||||
magicmime.MAGIC_ERROR); err != nil {
|
file.Read(header)
|
||||||
oopsHandler(c, w, r)
|
file.Close()
|
||||||
}
|
|
||||||
defer magicmime.Close()
|
|
||||||
|
|
||||||
mimetype, err := magicmime.TypeByFile(filePath)
|
mimetype := mimemagic.Match("", header)
|
||||||
if err != nil {
|
|
||||||
oopsHandler(c, w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
var tpl *pongo2.Template
|
var tpl *pongo2.Template
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue