Fix parsing response for getting albums

canhlinh · Sep 27, 2019 · f35f7bb · f35f7bb
1 parent c4c30ee
commit f35f7bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/client.go b/client.go
@@ -359,8 +359,7 @@ func (client *Client) GetAlbums() (Albums, error) {
 	defer body.Close()
 
 	stringBody := BodyToString(body)
-	jsonBody := JsonBodyByScanLine(stringBody, 4, 5)
-
+	jsonBody := JsonBodyByScanLine(stringBody, 4, -1)
 	albumlResponse := NewAlbumlResponse(jsonBody)
 
 	albums, err := albumlResponse.Albums()

diff --git a/file.txt b/file.txt
diff --git a/models.go b/models.go
@@ -230,8 +230,6 @@ func (al *AlbumlResponse) Albums() (albums []*Album, err error) {
 
 	mainArray := al.getMainArray()
 
-	log.Warn(NewJSONString(mainArray))
-
 	for _, arr := range mainArray {
 		albumID, albumName := al.getAlbumInfo(arr.([]interface{}))
 		albums = append(albums, &Album{

diff --git a/util.go b/util.go
@@ -63,9 +63,17 @@ func JsonBodyByScanLine(s string, start, end int) string {
 	for scanner.Scan() {
 
 		text := scanner.Text()
+		text = strings.TrimSpace(text)
 
-		if i >= start && i <= end {
+		if i >= start {
 			b += text
+			if end == -1 && text == "]" {
+				break
+			}
+
+			if i == end {
+				break
+			}
 		}
 
 		i++