Albirew/nyaa-pantsu
Archivé
1
0
Bifurcation 0
Ce dépôt a été archivé le 2022-05-07. Vous pouvez voir ses fichiers ou le cloner, mais pas ouvrir de ticket ou de demandes d'ajout, ni soumettre de changements.
nyaa-pantsu/common/torrent.go
akuma06 5991a21818 First batch of changes for the refactor (#1078)
* First batch of changes for the refactor

Added the support of gin in routes and other services/utils
Begining implementation of JetHTML

* Remove os folder

* Move scrapers to own repo

* Second batch of changes

All .jet.html are the working templates.
You can now test this PR, the index Page and upload works. If you want to complete the other html templates, you're welcome

* Move captcha to util

* Move uploadService to utils

* Use govalidator instead of regex

* Third batch of changes

All the front end should as previously.
I also fixed some minor things unrelated to the refactor (mostly style issues on static pages)
Now errors can be accessed by importing the "errors" helpers and using the `yield errors(name="xxx")` command in templates.
Same for infos.
Templates are now more hierarchized with a base template "base.jet.html" which is extended depending on the context in "index_site" or "index_admin" layouts. Those layouts are extended than in every pages.
Other helpers are captcha to render a captcha `yield captcha(captchaid="xxx")`
And also csrf, with the command `yield csrf_field()`
To translate, you don't have anymore to do `call $.T "xxx"`, you just have to do `T("xxx")`.

Pages for the website part are in folders in the folder "templates/site". Pages for the admin part are in "templates/admin". Layouts are separated in "templates/layouts". Helpers and menu are in "templates/layouts/helpers" and "templates/layouts/menu". Error pages should be put in "templates/errors"

* Added test on templates

When adding a new template, you have to tell to template_test.go, the context of the new template (if it doesn't use the common context)

* Panel admin works

Now the templating part should work. The PR can now be fully tested.

I think we should push the templating PR  and do the routes/controllers/removal of services in another branch. So we know that this one is functional

* Updated dependencies

* Fixed test for modelhelper

* Fix testing for commentlist

* Fix travis :')

* Just renamed router and removed network

* Applying same SEO fix

* Update form_validator.go

* Added back regexp package
2017-06-28 21:42:38 +10:00

273 lignes
7,3 Kio
Go

package common
import (
"context"
"encoding/json"
"strconv"
"strings"
"time"
elastic "gopkg.in/olivere/elastic.v5"
"github.com/NyaaPantsu/nyaa/config"
"github.com/NyaaPantsu/nyaa/model"
"github.com/NyaaPantsu/nyaa/util/log"
"github.com/gin-gonic/gin"
)
// TorrentParam defines all parameters that can be provided when searching for a torrent
type TorrentParam struct {
All bool // True means ignore everything but Max and Offset
Full bool // True means load all members
Order bool // True means ascending
Hidden bool // True means filter hidden torrents
Status Status
Sort SortMode
Category Categories
Max uint32
Offset uint32
UserID uint32
TorrentID uint32
FromID uint32
FromDate DateFilter
ToDate DateFilter
NotNull string // csv
Null string // csv
NameLike string // csv
Language string
MinSize SizeBytes
MaxSize SizeBytes
}
// FromRequest : parse a request in torrent param
// TODO Should probably return an error ?
func (p *TorrentParam) FromRequest(c *gin.Context) {
var err error
nameLike := strings.TrimSpace(c.Query("q"))
max, err := strconv.ParseUint(c.Query("limit"), 10, 32)
if err != nil {
max = uint64(config.Conf.Navigation.TorrentsPerPage)
} else if max > uint64(config.Conf.Navigation.MaxTorrentsPerPage) {
max = uint64(config.Conf.Navigation.MaxTorrentsPerPage)
}
// FIXME 0 means no userId defined
userID, err := strconv.ParseUint(c.Query("userID"), 10, 32)
if err != nil {
userID = 0
}
// FIXME 0 means no userId defined
fromID, err := strconv.ParseUint(c.Query("fromID"), 10, 32)
if err != nil {
fromID = 0
}
var status Status
status.Parse(c.Query("s"))
maxage, err := strconv.Atoi(c.Query("maxage"))
fromDate, toDate := DateFilter(""), DateFilter("")
if err != nil {
// if to xxx is not provided, fromDate is equal to from xxx
if c.Query("toDate") != "" {
fromDate.Parse(c.Query("toDate"), c.Query("dateType"))
toDate.Parse(c.Query("fromDate"), c.Query("dateType"))
} else {
fromDate.Parse(c.Query("fromDate"), c.Query("dateType"))
}
} else {
fromDate = DateFilter(time.Now().AddDate(0, 0, -maxage).Format("2006-01-02"))
}
categories := ParseCategories(c.Query("c"))
var sortMode SortMode
sortMode.Parse(c.Query("sort"))
var minSize SizeBytes
var maxSize SizeBytes
minSize.Parse(c.Query("minSize"), c.Query("sizeType"))
maxSize.Parse(c.Query("maxSize"), c.Query("sizeType"))
ascending := false
if c.Query("order") == "true" {
ascending = true
}
language := strings.TrimSpace(c.Query("lang"))
p.NameLike = nameLike
p.Max = uint32(max)
p.UserID = uint32(userID)
// TODO Use All
p.All = false
// TODO Use Full
p.Full = false
p.Order = ascending
p.Status = status
p.Sort = sortMode
p.Category = categories
p.Language = language
p.FromDate = fromDate
p.ToDate = toDate
p.MinSize = minSize
p.MaxSize = maxSize
// FIXME 0 means no TorrentId defined
// Do we even need that ?
p.TorrentID = 0
// Needed to display result after a certain torrentID
p.FromID = uint32(fromID)
}
// ToFilterQuery : Builds a query string with for es query string query defined here
// https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
func (p *TorrentParam) ToFilterQuery() string {
// Don't set sub category unless main category is set
query := ""
if len(p.Category) > 0 {
conditionsOr := make([]string, len(p.Category))
for key, val := range p.Category {
if val.IsSubSet() {
conditionsOr[key] = "(category: " + strconv.FormatInt(int64(val.Main), 10) + " AND sub_category: " + strconv.FormatInt(int64(val.Sub), 10) + ")"
} else {
conditionsOr[key] = "(category: " + strconv.FormatInt(int64(val.Main), 10) + ")"
}
}
query += "(" + strings.Join(conditionsOr, " OR ") + ")"
}
if p.UserID != 0 {
query += " uploader_id:" + strconv.FormatInt(int64(p.UserID), 10)
}
if p.Hidden {
query += " hidden:false"
}
if p.Status != ShowAll {
if p.Status != FilterRemakes {
query += " status:" + p.Status.ToString()
} else {
/* From the old nyaa behavior, FilterRemake means everything BUT
* remakes
*/
query += " !status:" + p.Status.ToString()
}
}
if p.FromID != 0 {
query += " id:>" + strconv.FormatInt(int64(p.FromID), 10)
}
if p.FromDate != "" && p.ToDate != "" {
query += " date: [" + string(p.FromDate) + " " + string(p.ToDate) + "]"
} else if p.FromDate != "" {
query += " date: [" + string(p.FromDate) + " *]"
} else if p.ToDate != "" {
query += " date: [* " + string(p.ToDate) + "]"
}
sMinSize := strconv.FormatUint(uint64(p.MinSize), 10)
sMaxSize := strconv.FormatUint(uint64(p.MaxSize), 10)
if p.MinSize > 0 && p.MaxSize > 0 {
query += " filesize: [" + sMinSize + " " + sMaxSize + "]"
} else if p.MinSize > 0 {
query += " filesize: [" + sMinSize + " *]"
} else if p.MaxSize > 0 {
query += " filesize: [* " + sMaxSize + "]"
}
if p.Language != "" {
query += " language:" + p.Language
}
return query
}
// Find :
/* Uses elasticsearch to find the torrents based on TorrentParam
* We decided to fetch only the ids from ES and then query these ids to the
* database
*/
func (p *TorrentParam) Find(client *elastic.Client) (int64, []model.Torrent, error) {
// TODO Why is it needed, what does it do ?
ctx := context.Background()
var query elastic.Query
if p.NameLike == "" {
query = elastic.NewMatchAllQuery()
} else {
query = elastic.NewSimpleQueryStringQuery(p.NameLike).
Field("name").
Analyzer(config.Conf.Search.ElasticsearchAnalyzer).
DefaultOperator("AND")
}
// TODO Find a better way to keep in sync with mapping in ansible
search := client.Search().
Index(config.Conf.Search.ElasticsearchIndex).
Query(query).
Type(config.Conf.Search.ElasticsearchType).
From(int((p.Offset-1)*p.Max)).
Size(int(p.Max)).
Sort(p.Sort.ToESField(), p.Order).
Sort("_score", false) // Don't put _score before the field sort, it messes with the sorting
filterQueryString := p.ToFilterQuery()
if filterQueryString != "" {
filterQuery := elastic.NewQueryStringQuery(filterQueryString).
DefaultOperator("AND")
search = search.PostFilter(filterQuery)
}
result, err := search.Do(ctx)
if err != nil {
return 0, nil, err
}
log.Infof("Query '%s' took %d milliseconds.", p.NameLike, result.TookInMillis)
log.Infof("Amount of results %d.", result.TotalHits())
torrents := make([]model.Torrent, len(result.Hits.Hits))
if len(result.Hits.Hits) <= 0 {
return 0, nil, nil
}
for i, hit := range result.Hits.Hits {
// Deserialize hit.Source into a Tweet (could also be just a map[string]interface{}).
var tJson model.TorrentJSON
err := json.Unmarshal(*hit.Source, &tJson)
if err != nil {
log.Errorf("Cannot unmarshal elasticsearch torrent: %s", err)
}
torrent := tJson.ToTorrent()
torrents[i] = torrent
}
return result.TotalHits(), torrents, nil
}
// Clone : To clone a torrent params
func (p *TorrentParam) Clone() TorrentParam {
return TorrentParam{
Order: p.Order,
Status: p.Status,
Sort: p.Sort,
Category: p.Category,
Max: p.Max,
Offset: p.Offset,
UserID: p.UserID,
TorrentID: p.TorrentID,
FromID: p.FromID,
FromDate: p.FromDate,
ToDate: p.ToDate,
NotNull: p.NotNull,
Null: p.Null,
NameLike: p.NameLike,
Language: p.Language,
MinSize: p.MinSize,
MaxSize: p.MaxSize,
}
}