switch to mimemagic to avoid cgo

This commit is contained in:
andreimarcu 2015-09-28 21:41:07 -04:00
parent 56e305bfcc
commit 2255716c7d
2 changed files with 6 additions and 12 deletions

View file

@ -6,8 +6,8 @@ import (
"path"
"strings"
"bitbucket.org/taruti/mimemagic"
"github.com/flosch/pongo2"
"github.com/rakyll/magicmime"
"github.com/zenazn/goji/web"
)
@ -21,17 +21,12 @@ func fileDisplayHandler(c web.C, w http.ResponseWriter, r *http.Request) {
return
}
if err := magicmime.Open(magicmime.MAGIC_MIME_TYPE |
magicmime.MAGIC_SYMLINK |
magicmime.MAGIC_ERROR); err != nil {
oopsHandler(c, w, r)
}
defer magicmime.Close()
file, _ := os.Open(filePath)
header := make([]byte, 512)
file.Read(header)
file.Close()
mimetype, err := magicmime.TypeByFile(filePath)
if err != nil {
oopsHandler(c, w, r)
}
mimetype := mimemagic.Match("", header)
var tpl *pongo2.Template

View file

@ -81,7 +81,6 @@ func setup() {
goji.Get(nameRe, fileDisplayHandler)
goji.Get(selifRe, fileServeHandler)
goji.NotFound(notFoundHandler)
}
func main() {