#105 add new CharsetReader option that supports UTF8, UTF16 and more decoding

Author: zhengchun

options.go

@@ -2,9 +2,10 @@ package xmlquery
 
 import (
 	"encoding/xml"
+	"io"
 )
 
-type ParserOptions struct{
+type ParserOptions struct {
 	Decoder *DecoderOptions
 }
 
@@ -17,14 +18,16 @@ func (options ParserOptions) apply(parser *parser) {
 // DecoderOptions implement the very same options than the standard
 // encoding/xml package. Please refer to this documentation:
 // https://golang.org/pkg/encoding/xml/#Decoder
-type DecoderOptions struct{
-	Strict    bool
-	AutoClose []string
-	Entity    map[string]string
+type DecoderOptions struct {
+	Strict        bool
+	AutoClose     []string
+	Entity        map[string]string
+	CharsetReader func(charset string, input io.Reader) (io.Reader, error)
 }
 
 func (options DecoderOptions) apply(decoder *xml.Decoder) {
 	decoder.Strict = options.Strict
 	decoder.AutoClose = options.AutoClose
 	decoder.Entity = options.Entity
+	decoder.CharsetReader = options.CharsetReader
 }

parse.go

@@ -69,7 +69,9 @@ func createParser(r io.Reader) *parser {
 		level:   0,
 		reader:  reader,
 	}
-	p.decoder.CharsetReader = charset.NewReaderLabel
+	if p.decoder.CharsetReader == nil {
+		p.decoder.CharsetReader = charset.NewReaderLabel
+	}
 	p.prev = p.doc
 	return p
 }