Skip to content

Decode from customisable encodings. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Decode from customisable encodings. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions phpserialize/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,27 @@ import (
"fmt"
"strconv"
"strings"
"golang.org/x/text/encoding"
)

type PhpDecoder struct {
source *strings.Reader
encoding *encoding.Decoder
}

func Decode(value string) (result interface{}, err error) {
func DecodeWithEncoding(value string, encoding encoding.Encoding) (result interface{}, err error) {
decoder := &PhpDecoder{
source: strings.NewReader(value),
encoding: encoding.NewDecoder(),
}
result, err = decoder.DecodeValue()
return
}

func Decode(value string) (result interface{}, err error) {
return DecodeWithEncoding(value, encoding.Nop)
}

//all integer is int64，float number is float64
func (decoder *PhpDecoder) DecodeValue() (value interface{}, err error) {
if token, _, err := decoder.source.ReadRune(); err == nil {
Expand Down Expand Up @@ -129,10 +136,15 @@ func (decoder *PhpDecoder) decodeString() (value string, err error) {
tmpValue := make([]byte, strLen, strLen)
if nRead, _err := decoder.source.Read(tmpValue); _err != nil || nRead != strLen {
err = errors.New(fmt.Sprintf("Can not read string content %v. Read only: %v from %v", _err, nRead, strLen))
}
err = decoder.expect('"')
var encoded []byte
if encoded, err = decoder.encoding.Bytes(tmpValue); err != nil {
return
} else {
value = string(tmpValue)
err = decoder.expect('"')
value = string(encoded)
}

}
} else {
err = errors.New("Can not read string length")
Expand Down