Remove XML sanitizer which was screwing up charset conversion (#58)

atom/parser.go

@@ -9,16 +9,14 @@ import (
 	"github.com/mmcdole/gofeed/extensions"
 	"github.com/mmcdole/gofeed/internal/shared"
 	"github.com/mmcdole/goxpp"
-	"golang.org/x/net/html/charset"
 )
 
 // Parser is an Atom Parser
 type Parser struct{}
 
 // Parse parses an xml feed into an atom.Feed
 func (ap *Parser) Parse(feed io.Reader) (*Feed, error) {
-	fr := shared.NewXMLSanitizerReader(feed)
-	p := xpp.NewXMLPullParser(fr, false, charset.NewReaderLabel)
+	p := xpp.NewXMLPullParser(feed, false, shared.NewReaderLabel)
 
 	_, err := shared.FindRoot(p)
 	if err != nil {

detector.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/mmcdole/gofeed/internal/shared"
 	"github.com/mmcdole/goxpp"
-	"golang.org/x/net/html/charset"
 )
 
 // FeedType represents one of the possible feed
@@ -27,8 +26,7 @@ const (
 // by looking for specific xml elements unique to the
 // various feed types.
 func DetectFeedType(feed io.Reader) FeedType {
-	fr := shared.NewXMLSanitizerReader(feed)
-	p := xpp.NewXMLPullParser(fr, false, charset.NewReaderLabel)
+	p := xpp.NewXMLPullParser(feed, false, shared.NewReaderLabel)
 
 	_, err := shared.FindRoot(p)
 	if err != nil {

internal/shared/charsetconv.go

@@ -0,0 +1,21 @@
+package shared
+
+import (
+	"fmt"
+	"io"
+
+	"golang.org/x/net/html/charset"
+)
+
+func NewReaderLabel(label string, input io.Reader) (io.Reader, error) {
+	conv, err := charset.NewReaderLabel(label, input)
+
+	fmt.Println("Created charset converter!")
+	if err != nil {
+		return nil, err
+	}
+
+	// Wrap the charset decoder reader with a XML sanitizer
+	//clean := NewXMLSanitizerReader(conv)
+	return conv, nil
+}

rss/parser.go

@@ -8,16 +8,14 @@ import (
 	"github.com/mmcdole/gofeed/extensions"
 	"github.com/mmcdole/gofeed/internal/shared"
 	"github.com/mmcdole/goxpp"
-	"golang.org/x/net/html/charset"
 )
 
 // Parser is a RSS Parser
 type Parser struct{}
 
 // Parse parses an xml feed into an rss.Feed
 func (rp *Parser) Parse(feed io.Reader) (*Feed, error) {
-	fr := shared.NewXMLSanitizerReader(feed)
-	p := xpp.NewXMLPullParser(fr, false, charset.NewReaderLabel)
+	p := xpp.NewXMLPullParser(feed, false, shared.NewReaderLabel)
 
 	_, err := shared.FindRoot(p)
 	if err != nil {