containers/mumbledj
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix crash on invalid playlist URL

Browse source
This commit is contained in:
Matthieu Grieger 2015-02-02 19:45:17 -08:00
parent 00fb7ff05a
commit 7c57cbc3d9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
playlist.go
View file

@ -37,13 +37,15 @@ func NewPlaylist(user, id string) (*Playlist, error) {
if response, err := http.Get(jsonUrl); err == nil { if response, err := http.Get(jsonUrl); err == nil {
defer response.Body.Close() defer response.Body.Close()
if response.StatusCode != 400 { if response.StatusCode != 400 && response.StatusCode != 404 {
if body, err := ioutil.ReadAll(response.Body); err == nil { if body, err := ioutil.ReadAll(response.Body); err == nil {
jsonString = string(body) jsonString = string(body)
} }
} else { } else {
return nil, errors.New("Invalid YouTube ID supplied.") return nil, errors.New("Invalid YouTube ID supplied.")
} }
} else {
return nil, errors.New("An error occurred while receiving HTTP GET request.")
} }
jsonData := map[string]interface{}{} jsonData := map[string]interface{}{}

4
song.go
View file

@ -39,13 +39,15 @@ func NewSong(user, id string) (*Song, error) {
if response, err := http.Get(jsonUrl); err == nil { if response, err := http.Get(jsonUrl); err == nil {
defer response.Body.Close() defer response.Body.Close()
if response.StatusCode != 400 { if response.StatusCode != 400 && response.StatusCode != 404 {
if body, err := ioutil.ReadAll(response.Body); err == nil { if body, err := ioutil.ReadAll(response.Body); err == nil {
jsonString = string(body) jsonString = string(body)
} }
} else { } else {
return nil, errors.New("Invalid YouTube ID supplied.") return nil, errors.New("Invalid YouTube ID supplied.")
} }
} else {
return nil, errors.New("An error occurred while receiving HTTP GET request.")
} }
jsonData := map[string]interface{}{} jsonData := map[string]interface{}{}