From b3cc11687ff603f7c7c6118394cbce78f2b5de05 Mon Sep 17 00:00:00 2001 From: Nyah Check Date: Sat, 16 Sep 2017 23:18:19 -0600 Subject: [PATCH] api/test: Fixed issues with api tests. Fixes #13 --- api/api_test.go | 2 +- api/apidata.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/api_test.go b/api/api_test.go index 6858408..37b04f1 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -39,7 +39,7 @@ func TestApi(t *testing.T) { t.Errorf("APIGetVideoStream(%d): expected %v, actual %v", i, nil, err) } - file := path + rawVideo.Title + rawVideo.Author + file := path + table.url + ".mp3" err = APIConvertVideo(file, 123, ID, video) if err != nil { t.Errorf("APIConvertVideo(%d): expected %v, actual %v", i, nil, err) diff --git a/api/apidata.go b/api/apidata.go index cadaf52..ae0dfd2 100644 --- a/api/apidata.go +++ b/api/apidata.go @@ -89,18 +89,18 @@ func APIGetVideoStream(id string, video *RawVideoData) (videoData []string, err } data := map[string]string{ - "quality": dec_data["quality"][0], - "type": dec_data["type"][0], - "url": dec_data["url"][0], - "sig": dec_data["sig"][0], + "quality": dec_data.Get("quality"), + "type": dec_data.Get("type"), + "url": dec_data.Get("url"), + "sig": dec_data.Get("sig"), "title": video.Title, "author": video.Author, - "format": dec_data["format"][0], + "format": dec_data.Get("format"), } str, _ := json.Marshal(data) decodedVideo = append(decodedVideo, string(str)) - logrus.Infof("\nDecoded %d bytes of %q, in %q format", len(decodedVideo), dec_data["quality"][0], dec_data["format"][0]) + logrus.Infof("\nDecoded %d bytes of %q, in %q format", len(decodedVideo), dec_data.Get("quality"), dec_data.Get("format")) } return decodedVideo, nil