Revert "Merge pull request #153 from majestrate/faster-rss"

This reverts commit a9d19644c9, reversing
changes made to 4f14dfb04f.

router/rssHandler.go

@@ -1,17 +1,17 @@
 package router
 
-import (
+import(
+	"time"
+	"net/http"
+	"github.com/gorilla/feeds"
 	"github.com/ewhal/nyaa/config"
 	"github.com/ewhal/nyaa/util/search"
-	"github.com/gorilla/feeds"
-	"net/http"
 	"strconv"
-	"time"
 )
 
 func RssHandler(w http.ResponseWriter, r *http.Request) {
 
-	_, torrents := search.SearchByQueryNoCount(r, 1)
+	_, torrents, _ := search.SearchByQuery( r, 1 )
 	created_as_time := time.Now()
 
 	if len(torrents) > 0 {

router/searchHandler.go

@@ -23,7 +23,7 @@ func SearchHandler(w http.ResponseWriter, r *http.Request) {
 
 	search_param, torrents, nbTorrents := search.SearchByQuery(r, pagenum)
 
-	for i := range torrents {
+	for i, _ := range torrents {
 		res := torrents[i].ToJson()
 		b = append(b, res)
 	}

service/torrent/torrent.go

@@ -53,28 +53,22 @@ func GetTorrentById(id string) (model.Torrents, error) {
 }
 
 func GetTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offset int) ([]model.Torrents, int) {
-	return getTorrentsOrderBy(parameters, orderBy, limit, offset, true)
-}
-
-func GetTorrentsOrderByNoCount(parameters *WhereParams, orderBy string, limit int, offset int) (torrents []model.Torrents) {
-	torrents, _ = getTorrentsOrderBy(parameters, orderBy, limit, offset, false)
-	return
-}
-
-func getTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offset int, countAll bool) ([]model.Torrents, int) {
 	var torrents []model.Torrents
 	var dbQuery *gorm.DB
 	var count int
-  
+	conditions := "torrent_hash IS NOT NULL" // filter out broken entries
-	conditions := "torrent_hash IS NOT NULL AND filesize > 0" //filter out broken entries
+	if strings.HasPrefix(orderBy, "filesize") {
+		// torrents w/ NULL filesize fuck up the sorting on postgres
+		// TODO: fix this properly
+		conditions += " AND filesize IS NOT NULL"
+	}
+
 	var params []interface{}
 	if parameters != nil { // if there is where parameters
 		conditions += " AND " + parameters.Conditions
 		params = parameters.Params
 	}
-	if countAll {
+	db.ORM.Model(&torrents).Where(conditions, params...).Count(&count)
-		db.ORM.Model(&torrents).Where(conditions, params...).Count(&count)
-	}
 	dbQuery = db.ORM.Model(&torrents).Where(conditions, params...)
 
 	if orderBy == "" { // default OrderBy
@@ -92,7 +86,7 @@ func getTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offs
  * Get Torrents with where parameters and limits, order by default
  */
 func GetTorrents(parameters WhereParams, limit int, offset int) ([]model.Torrents, int) {
-	return getTorrentsOrderBy(&parameters, "", limit, offset, true)
+	return GetTorrentsOrderBy(&parameters, "", limit, offset)
 }
 
 /* Get Torrents with where parameters but no limit and order by default (get all the torrents corresponding in the db)
@@ -113,11 +107,6 @@ func GetAllTorrents(limit int, offset int) ([]model.Torrents, int) {
 	return GetTorrentsOrderBy(nil, "", limit, offset)
 }
 
-func GetAllTorrentsNoCouting(limit int, offset int) (torrents []model.Torrents) {
-	torrents, _ = getTorrentsOrderBy(nil, "", limit, offset, false)
-	return
-}
-
 func GetAllTorrentsDB() ([]model.Torrents, int) {
 	return GetTorrentsOrderBy(nil, "", 0, 0)
 }

templates/_captcha.html

@@ -3,6 +3,6 @@
 		<label for="solution">Captcha</label>
 		<input type="text" name="captchaID" value="{{.CaptchaID}}" hidden>
 		<img src="/captcha/{{.CaptchaID}}.png">
-		<input type="text" name="solution" class="form-control" placeholder="Captcha" required>
+		<input type="number" name="solution" class="form-control" placeholder="Captcha" required>
 	</div>
 {{end}}

util/search/search.go

@@ -31,16 +31,6 @@ func Init(backend string) {
 }
 
 func SearchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, int) {
-	return searchByQuery(r, pagenum, true)
-
-}
-
-func SearchByQueryNoCount(r *http.Request, pagenum int) (param SearchParam, torrents []model.Torrents) {
-	param, torrents, _ = searchByQuery(r, pagenum, false)
-	return
-}
-
-func searchByQuery(r *http.Request, pagenum int, count bool) (search_param SearchParam, torrents []model.Torrents, n int) {
 	maxPerPage, errConv := strconv.Atoi(r.URL.Query().Get("max"))
 	if errConv != nil {
 		maxPerPage = 50 // default Value maxPerPage
@@ -49,6 +39,7 @@ func searchByQuery(r *http.Request, pagenum int, count bool) (search_param Searc
 	if maxPerPage > 300 {
 		maxPerPage = 300
 	}
+	search_param := SearchParam{}
 	search_param.Max = maxPerPage
 	search_param.Query = r.URL.Query().Get("q")
 	search_param.Category = r.URL.Query().Get("c")
@@ -91,17 +82,13 @@ func searchByQuery(r *http.Request, pagenum int, count bool) (search_param Searc
 		parameters.Params = append(parameters.Params, search_param.Status)
 	}
 	searchQuerySplit := strings.Split(search_param.Query, " ")
-	for i := range searchQuerySplit {
+	for i, _ := range searchQuerySplit {
-		conditions = append(conditions, "torrent_name LIKE ?")
+		conditions = append(conditions, "torrent_name " + search_op + " ?")
 		parameters.Params = append(parameters.Params, "%"+searchQuerySplit[i]+"%")
 	}
 
 	parameters.Conditions = strings.Join(conditions[:], " AND ")
 	log.Infof("SQL query is :: %s\n", parameters.Conditions)
-	if count {
+	torrents, n := torrentService.GetTorrentsOrderBy(&parameters, order_by, maxPerPage, maxPerPage*(pagenum-1))
-		torrents, n = torrentService.GetTorrentsOrderBy(&parameters, order_by, maxPerPage, maxPerPage*(pagenum-1))
+	return search_param, torrents, n
-	} else {
-		torrents = torrentService.GetTorrentsOrderByNoCount(&parameters, order_by, maxPerPage, maxPerPage*(pagenum-1))
-	}
-	return
 }