Refactor feed discovery and avoid an extra HTTP request if the url provided is the feed

1 files changed, 9 insertions, 4 deletions

diff --git a/internal/reader/parser/format.go b/internal/reader/parser/format.go
index 77a49d2c..1019d164 100644
--- a/internal/reader/parser/format.go
+++ b/internal/reader/parser/format.go
@@ -4,8 +4,9 @@
 package parser // import "miniflux.app/v2/internal/reader/parser"
 
 import (
+	"bytes"
 	"encoding/xml"
-	"strings"
+	"io"
 
 	rxml "miniflux.app/v2/internal/reader/xml"
 )
@@ -20,12 +21,16 @@ const (
 )
 
 // DetectFeedFormat tries to guess the feed format from input data.
-func DetectFeedFormat(data string) string {
-	if strings.HasPrefix(strings.TrimSpace(data), "{") {
+func DetectFeedFormat(r io.ReadSeeker) string {
+	data := make([]byte, 512)
+	r.Read(data)
+
+	if bytes.HasPrefix(bytes.TrimSpace(data), []byte("{")) {
 		return FormatJSON
 	}
 
-	decoder := rxml.NewDecoder(strings.NewReader(data))
+	r.Seek(0, io.SeekStart)
+	decoder := rxml.NewDecoder(r)
 
 	for {
 		token, _ := decoder.Token()