Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
chardet
=======
#chardet

##history

fix dependency from

`code.google.com/p/go.text` TO `golang.org/x/text`

讲真,中英文混合的GBK会识别为UTF-16BE

![](http://qq.yh31.com/tp/zjbq/201609231126325282.jpg)


##
detect text encoding, like python chardet, but for go

本包用于探测文本的编码格式。
Expand Down
16 changes: 8 additions & 8 deletions codec.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package chardet

import (
"bytes"
"code.google.com/p/go.text/encoding"
"code.google.com/p/go.text/encoding/japanese"
"code.google.com/p/go.text/encoding/korean"
"code.google.com/p/go.text/encoding/simplifiedchinese"
"code.google.com/p/go.text/encoding/traditionalchinese"
"code.google.com/p/go.text/encoding/unicode"
"code.google.com/p/go.text/transform"
"bytes"
"golang.org/x/text/encoding"
"golang.org/x/text/encoding/japanese"
"golang.org/x/text/encoding/korean"
"golang.org/x/text/encoding/simplifiedchinese"
"golang.org/x/text/encoding/traditionalchinese"
"golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform"
"errors"
"io"
)
Expand Down
26 changes: 16 additions & 10 deletions trans-utf32.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package chardet

import (
"code.google.com/p/go.text/transform"
"golang.org/x/text/encoding"
"golang.org/x/text/transform"
. "unicode/utf8"
)

Expand Down Expand Up @@ -188,23 +189,28 @@ func (u *u8t32l) Reset() {
type utf32le struct{}

// 返回解码小端在前的UTF-16到UTF-8的解码器
func (u utf32le) NewDecoder() transform.Transformer {
return new(u32lt8)
func (u utf32le) NewDecoder() *encoding.Decoder {
return &encoding.Decoder{Transformer: &u32lt8{
}}
}

// 返回编码UTF-8到小端在前的UTF-16的编码器
func (u utf32le) NewEncoder() transform.Transformer {
return new(u8t32l)
func (u utf32le) NewEncoder() *encoding.Encoder {
return &encoding.Encoder{Transformer: &u8t32l{
}}
}

type utf32be struct{}

// 返回编码UTF-8到大端在前的UTF-16的解码器
func (u utf32be) NewDecoder() transform.Transformer {
return new(u32bt8)
func (u utf32be) NewDecoder() *encoding.Decoder {
return &encoding.Decoder{Transformer: &u32bt8{
}}
}

// 返回解码大端在前的UTF-16到UTF-8的解码器
func (u utf32be) NewEncoder() transform.Transformer {
return new(u8t32b)
func (u utf32be) NewEncoder() *encoding.Encoder {
return &encoding.Encoder{Transformer: &u32bt8{
}}
}