c5b3702fcd
Removed the old search parameter on /api. Fixed issue with navigatation. Fixed issue with notifications. Fixed issue with fake anonymous upload on search with userID. Fixed issue with number of upload on user page. Moved api to version 1.1.0 with search displaying same as /api
71 lignes
1,9 Kio
Go
71 lignes
1,9 Kio
Go
package searchController
|
|
|
|
import (
|
|
"html"
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"math"
|
|
|
|
"github.com/NyaaPantsu/nyaa/controllers/router"
|
|
"github.com/NyaaPantsu/nyaa/models"
|
|
"github.com/NyaaPantsu/nyaa/templates"
|
|
"github.com/NyaaPantsu/nyaa/utils/search"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// SearchHandler : Controller for displaying search result page, accepting common search arguments
|
|
func SearchHandler(c *gin.Context) {
|
|
var err error
|
|
// TODO Don't create a new client for each request
|
|
// TODO Fallback to postgres search if es is down
|
|
|
|
page := c.Param("page")
|
|
currentUser := router.GetUser(c)
|
|
// db params url
|
|
pagenum := 1
|
|
if page != "" {
|
|
pagenum, err = strconv.Atoi(html.EscapeString(page))
|
|
if err != nil {
|
|
c.AbortWithError(http.StatusNotFound, err)
|
|
return
|
|
}
|
|
if pagenum <= 0 {
|
|
c.AbortWithError(http.StatusNotFound, errors.New("Can't find a page with negative value"))
|
|
return
|
|
}
|
|
}
|
|
|
|
userID, err := strconv.ParseUint(c.Query("userID"), 10, 32)
|
|
if err != nil {
|
|
userID = 0
|
|
}
|
|
|
|
searchParam, torrents, nbTorrents, err := search.AuthorizedQuery(c, pagenum, currentUser.CurrentOrAdmin(uint(userID)))
|
|
if err != nil {
|
|
c.AbortWithError(http.StatusInternalServerError, err)
|
|
return
|
|
}
|
|
|
|
maxPages := math.Ceil(float64(nbTorrents) / float64(searchParam.Max))
|
|
if pagenum > int(maxPages) {
|
|
c.AbortWithError(http.StatusNotFound, errors.New("Page superior to the maximum number of pages"))
|
|
return
|
|
}
|
|
|
|
// Convert back to strings for now.
|
|
category := ""
|
|
if len(searchParam.Category) > 0 {
|
|
category = searchParam.Category[0].String()
|
|
}
|
|
nav := templates.Navigation{int(nbTorrents), int(searchParam.Max), int(searchParam.Offset), "search"}
|
|
searchForm := templates.NewSearchForm(c)
|
|
searchForm.TorrentParam, searchForm.Category = searchParam, category
|
|
|
|
if c.Query("refine") == "1" {
|
|
searchForm.ShowRefine = true
|
|
}
|
|
|
|
templates.ModelList(c, "site/torrents/listing.jet.html", models.TorrentsToJSON(torrents), nav, searchForm)
|
|
}
|