Closes #13, Download Link should be sent as string in JSON

Author: MeNsaaH

cmd/api.go

@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/bisoncorps/gophie/engine"
 	log "github.com/sirupsen/logrus"
@@ -48,11 +47,11 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	} else {
 		site = engine.GetEngine(eng)
 	}
-	log.Info("Using Engine ", site)
+
+	log.Debug("Using Engine ", site)
 	if search != "" {
 		log.Debug("Searching for ", search)
-		query := strings.ReplaceAll(search, "+", " ")
-		result = site.Search(query)
+		result = site.Search(search)
 	} else if list != "" {
 		log.Debug("listing page ", list)
 		pagenum, _ := strconv.Atoi(list)

engine/engines.go

@@ -1,10 +1,10 @@
 package engine
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net/url"
-	//  "path"
 	"strconv"
 	"strings"
 
@@ -44,10 +44,34 @@ type Movie struct {
 	Source         string // The Engine From which it is gotten from
 }
 
+// MovieJSON : JSON structure of all downloadable movies
+type MovieJSON struct {
+	Movie
+	DownloadLink  string
+	SDownloadLink []string
+}
+
 func (m *Movie) String() string {
 	return fmt.Sprintf("%s (%v)", m.Title, m.Year)
 }
 
+// MarshalJSON Json structure to return from api
+func (m *Movie) MarshalJSON() ([]byte, error) {
+	var sDownloadLink []string
+	for _, link := range m.SDownloadLink {
+		sDownloadLink = append(sDownloadLink, link.String())
+	}
+
+	movie := MovieJSON{
+		Movie:         *m,
+		DownloadLink:  m.DownloadLink.String(),
+		SDownloadLink: sDownloadLink,
+	}
+
+	return json.Marshal(movie)
+
+}
+
 // SearchResult : the results of search from engine
 type SearchResult struct {
 	Query  string