Detect encoding within content type

berlam · Oct 4, 2019 · fda7ec3 · fda7ec3
1 parent 1fa2e7b
commit fda7ec3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pkg/bcs/bcs.go b/pkg/bcs/bcs.go
@@ -3,6 +3,7 @@ package bcs
 import (
 	"eager/pkg"
 	"fmt"
+	"golang.org/x/net/html/charset"
 	"golang.org/x/net/publicsuffix"
 	"io/ioutil"
 	"log"
@@ -191,7 +192,8 @@ func retrieveEffortList(client *http.Client, server *url.URL) ([]byte, error) {
 			log.Println(err)
 		}
 	}()
-	data, err := ioutil.ReadAll(resp.Body)
+	reader, _ := charset.NewReader(resp.Body, resp.Header.Get("Content-Type"))
+	data, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}
@@ -213,7 +215,8 @@ func retrieveProjectEffortList(client *http.Client, server *url.URL) ([]byte, er
 			log.Println(err)
 		}
 	}()
-	data, err := ioutil.ReadAll(resp.Body)
+	reader, _ := charset.NewReader(resp.Body, resp.Header.Get("Content-Type"))
+	data, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/jira/v2/api.go b/pkg/jira/v2/api.go
@@ -6,6 +6,7 @@ import (
 	"eager/pkg/jira/model"
 	"encoding/json"
 	"fmt"
+	"golang.org/x/net/html/charset"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -42,7 +43,8 @@ func (api Api) Projects(startAt int) ([]pkg.Project, error) {
 		}
 	}()
 
-	data, err := ioutil.ReadAll(response.Body)
+	reader, _ := charset.NewReader(response.Body, response.Header.Get("Content-Type"))
+	data, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +88,8 @@ func (api Api) User(user pkg.User, projects []pkg.Project) (model.Account, error
 		}
 	}()
 
-	data, err := ioutil.ReadAll(response.Body)
+	reader, _ := charset.NewReader(response.Body, response.Header.Get("Content-Type"))
+	data, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return "", err
 	}
@@ -127,7 +130,8 @@ func (api Api) Issues(jql model.Jql, startAt int) (model.Account, []model.Issue,
 	}()
 
 	account, _ := url.PathUnescape(response.Header.Get(model.HeaderAccountId))
-	data, err := ioutil.ReadAll(response.Body)
+	reader, _ := charset.NewReader(response.Body, response.Header.Get("Content-Type"))
+	data, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return "", nil, err
 	}
@@ -164,7 +168,8 @@ func (api Api) Worklog(key model.IssueKey, startAt int) ([]model.Worklog, error)
 		}
 	}()
 
-	data, err := ioutil.ReadAll(response.Body)
+	reader, _ := charset.NewReader(response.Body, response.Header.Get("Content-Type"))
+	data, err := ioutil.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}