domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

#2282 fast detection of utf-8

Browse source
This commit is contained in:
Unknwon 2015-12-27 17:02:36 -05:00
parent 240fe07287
commit 44637f03cc
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/template/template.go
View file

@ -12,7 +12,6 @@ import (
"runtime"
"strings"
"time"
"unicode/utf8"
"golang.org/x/net/html/charset"
"golang.org/x/text/transform"
@ -131,11 +130,11 @@ func Sha1(str string) string {
}
func ToUtf8WithErr(content []byte) (error, string) {
if utf8.Valid(content[:1024]) {
charsetLabel := base.DetectEncoding(content)
if charsetLabel == "utf-8" {
return nil, string(content)
}
charsetLabel := base.DetectEncoding(content)
encoding, _ := charset.Lookup(charsetLabel)
if encoding == nil {
return fmt.Errorf("Unknown encoding: %s", charsetLabel), string(content)