From 5186e65dfcefc97b9b43931b1d1d0d2bb6d0f692 Mon Sep 17 00:00:00 2001
From: pantsudev <pantsudev@local>
Date: Wed, 14 Jun 2017 13:53:54 +1000
Subject: [PATCH] Replace homehandler with search handler

---
 router/home_handler.go | 84 ------------------------------------------
 router/router.go       |  2 +-
 2 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 router/home_handler.go

diff --git a/router/home_handler.go b/router/home_handler.go
deleted file mode 100644
index 4537b827..00000000
--- a/router/home_handler.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package router
-
-import (
-	"html"
-	"net/http"
-	"strconv"
-
-	"github.com/NyaaPantsu/nyaa/cache"
-	"github.com/NyaaPantsu/nyaa/common"
-	"github.com/NyaaPantsu/nyaa/model"
-	"github.com/NyaaPantsu/nyaa/service/torrent"
-	"github.com/NyaaPantsu/nyaa/util/log"
-	msg "github.com/NyaaPantsu/nyaa/util/messages"
-	"github.com/gorilla/mux"
-)
-
-// HomeHandler : Controller for Home page, can have some query arguments
-func HomeHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	page := vars["page"]
-	messages := msg.GetMessages(r)
-	deleteVar := r.URL.Query()["deleted"]
-	defer r.Body.Close()
-
-	// db params url
-	var err error
-	maxPerPage := 50
-	maxString := r.URL.Query().Get("max")
-	if maxString != "" {
-		maxPerPage, err = strconv.Atoi(maxString)
-		if !log.CheckError(err) {
-			maxPerPage = 50 // default Value maxPerPage
-		}
-	}
-	if deleteVar != nil {
-		messages.AddInfoTf("infos", "torrent_deleted", "")
-	}
-	pagenum := 1
-	if page != "" {
-		pagenum, err = strconv.Atoi(html.EscapeString(page))
-		if !log.CheckError(err) {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		if pagenum <= 0 {
-			NotFoundHandler(w, r)
-			return
-		}
-	}
-
-	search := common.SearchParam{
-		Max:  uint(maxPerPage),
-		Page: pagenum,
-	}
-
-	torrents, nbTorrents, err := cache.Impl.Get(search, func() ([]model.Torrent, int, error) {
-		return torrentService.GetAllTorrents(maxPerPage, maxPerPage*(pagenum-1))
-	})
-	if !log.CheckError(err) {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	navigationTorrents := navigation{
-		TotalItem:      nbTorrents,
-		MaxItemPerPage: maxPerPage,
-		CurrentPage:    pagenum,
-		Route:          "search_page",
-	}
-
-	torrentsJSON := model.TorrentsToJSON(torrents)
-	common := newCommonVariables(r)
-	common.Navigation = navigationTorrents
-	htv := modelListVbs{
-		commonTemplateVariables: common,
-		Models:                  torrentsJSON,
-		Infos:                   messages.GetAllInfos(),
-	}
-
-	err = homeTemplate.ExecuteTemplate(w, "index.html", htv)
-	if err != nil {
-		log.Errorf("HomeHandler(): %s", err)
-	}
-}
diff --git a/router/router.go b/router/router.go
index c5639173..e910a061 100755
--- a/router/router.go
+++ b/router/router.go
@@ -26,7 +26,7 @@ func init() {
 	// TODO Use config from cli
 	// TODO Make sure the directory exists
 	gpgKeyHandler := http.FileServer(http.Dir(GPGPublicKeyPath))
-	gzipHomeHandler := http.HandlerFunc(HomeHandler)
+	gzipHomeHandler := http.HandlerFunc(SearchHandler)
 	gzipAPIHandler := http.HandlerFunc(APIHandler)
 	gzipAPIViewHandler := http.HandlerFunc(APIViewHandler)
 	gzipViewHandler := http.HandlerFunc(ViewHandler)