[ytparser]: return errors

2 files changed, 11 insertions, 9 deletions

diff --git a/grimtube.go b/grimtube.go
index a804f09..a48e00e 100644
--- a/grimtube.go
+++ b/grimtube.go
@@ -6,7 +6,7 @@ import (
 	//"io"
 	"log"
 	"strconv"
-	"path"
+	//"path"
 
 	"grimtube/ytparser"
 )
@@ -20,8 +20,6 @@ func serve(w http.ResponseWriter, templatePath string, data interface{}) {
 			return i - 1
 		},
 	}
-	base := path.Base(templatePath)
-	log.Println(base)
 	t, err := template.New("base.html").Funcs(funcMap).ParseFiles("templates/base.html", templatePath)
 	if err != nil {
 		panic(err)
@@ -54,7 +52,11 @@ func search(w http.ResponseWriter, r *http.Request) {
 				page = p
 			}
 		}
-		items := ytparser.Search(term, page)
+		log.Printf("searching: %s, page: %d\n", term, page)
+		items, err := ytparser.Search(term, page)
+		if err != nil {
+			log.Println(err)
+		}
 		data := struct {
 			Items []ytparser.Item
 			Term string
diff --git a/ytparser/ytparser.go b/ytparser/ytparser.go
index ec89406..57c2a31 100644
--- a/ytparser/ytparser.go
+++ b/ytparser/ytparser.go
@@ -37,7 +37,7 @@ func (item Item) String() string {
 	return fmt.Sprintf("id: %s, title: %s, url: %s, thumb: %s", item.Id, item.Title, item.Url, item.Thumb)
 }
 
-func parsejson(data string) []Item {
+func parsejson(data string) ([]Item, error) {
 	//fmt.Println(data)
 	dec := json.NewDecoder(strings.NewReader(data))
 
@@ -54,7 +54,7 @@ func parsejson(data string) []Item {
 		if err == io.EOF {
 			break
 		} else if err != nil {
-			panic(err)
+			return nil, err
 		}
 
 		switch t := tok.(type) {
@@ -122,7 +122,7 @@ func parsejson(data string) []Item {
 		default:
 		}
 	}
-	return items
+	return items, nil
 	//fmt.Println(names)
 }
 
@@ -154,10 +154,10 @@ func request(query string, page int) (string, error) {
 	return string(startData), nil
 }
 
-func Search(query string, page int) []Item {
+func Search(query string, page int) ([]Item, error) {
 	data, err := request(query, page)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	return parsejson(data)
 }