troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 06:39:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

#2185 use Go sub-repo to detect encoding

Browse source
This commit is contained in:
Unknwon 2015-12-13 19:56:33 -05:00
parent 79dcd7ee6e
commit 95f9c85bcc
7 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gopmfile
View file

@ -16,7 +16,6 @@ github.com/go-macaron/toolbox = commit:ab30a81
github.com/go-sql-driver/mysql = commit:d512f20 github.com/go-sql-driver/mysql = commit:d512f20
github.com/go-xorm/core = commit:acb6f00 github.com/go-xorm/core = commit:acb6f00
github.com/go-xorm/xorm = commit:a8fba4d github.com/go-xorm/xorm = commit:a8fba4d
github.com/gogits/chardet = commit:2404f77725
github.com/gogits/git-shell = commit:1ffc4bc github.com/gogits/git-shell = commit:1ffc4bc
github.com/gogits/go-gogs-client = commit:4b541fa github.com/gogits/go-gogs-client = commit:4b541fa
github.com/issue9/identicon = commit:f8c0d2c github.com/issue9/identicon = commit:f8c0d2c

4
README.md
View file

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.8.1 ##### Current version: 0.8.2
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|
@ -85,7 +85,7 @@ There are 5 ways to install Gogs:
### Screencasts ### Screencasts
- [Instalando Gogs no Ubuntu](http://blog.linuxpro.com.br/2015/08/14/instalando-gogs-no-ubuntu/) (Português) - [Instalando Gogs no Ubuntu](https://www.youtube.com/watch?v=4UkHAR1F7ZA) (Português)
### Deploy to Cloud ### Deploy to Cloud

2
gogs.go
View file

@ -18,7 +18,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.8.1.1213" const APP_VER = "0.8.2.1213"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

4
models/git_diff.go
View file

@ -244,8 +244,8 @@ func ParsePatch(maxlines int, reader io.Reader) (*Diff, error) {
buf.WriteString("\n") buf.WriteString("\n")
} }
} }
charsetLabel, err := base.DetectEncoding(buf.Bytes()) charsetLabel := base.DetectEncoding(buf.Bytes())
if charsetLabel != "UTF-8" && err == nil { if charsetLabel != "UTF-8" {
encoding, _ := charset.Lookup(charsetLabel) encoding, _ := charset.Lookup(charsetLabel)
if encoding != nil { if encoding != nil {
d := encoding.NewDecoder() d := encoding.NewDecoder()

13
modules/base/tool.go
View file

@ -22,8 +22,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/Unknwon/i18n" "github.com/Unknwon/i18n"
"github.com/microcosm-cc/bluemonday" "github.com/microcosm-cc/bluemonday"
"golang.org/x/net/html/charset"
"github.com/gogits/chardet"
"github.com/gogits/gogs/modules/avatar" "github.com/gogits/gogs/modules/avatar"
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
@ -52,13 +51,9 @@ func ShortSha(sha1 string) string {
return sha1 return sha1
} }
func DetectEncoding(content []byte) (string, error) { func DetectEncoding(content []byte) string {
detector := chardet.NewTextDetector() _, name, _ := charset.DetermineEncoding(content, setting.Repository.AnsiCharset)
result, err := detector.DetectBest(content) return name
if result.Charset != "UTF-8" && len(setting.Repository.AnsiCharset) > 0 {
return setting.Repository.AnsiCharset, err
}
return result.Charset, err
} }
func BasicAuthDecode(encoded string) (string, string, error) { func BasicAuthDecode(encoded string) (string, string, error) {

6
modules/template/template.go
View file

@ -127,11 +127,7 @@ func Sha1(str string) string {
} }
func ToUtf8WithErr(content []byte) (error, string) { func ToUtf8WithErr(content []byte) (error, string) {
charsetLabel, err := base.DetectEncoding(content) charsetLabel := base.DetectEncoding(content)
if err != nil {
return err, ""
}
if charsetLabel == "UTF-8" { if charsetLabel == "UTF-8" {
return nil, string(content) return nil, string(content)
} }

2
templates/.VERSION
View file

@ -1 +1 @@
0.8.1.1213 0.8.2.1213