c6168be8b1
* Tag Search + Tests + Search slight refactor First commit improving search. Different struct have their own file with their tests. This way of separating struct by files is inspired by the go packages I've seen so far. Added new behaviour as discussed in #1334 * fix fallback to ES * Added some comments to explain PG fallback + log err moved * Refactored search Nearly fully covered WhereParams struct has disappeared for Query struct instead In DB model, we use an interface implementing Query struct methods * 1rst Refactor of Tags (WTF already?!) Prepare Tags for the refactored system. Now there will be descriptive tags for a particular release (ecchi, BDSM, ....) and typed tags. Typed tags are tags relevant to all torrents and can be limited to some input value. For example, video quality is a typed tag limited to some values (hd, full hd, sd, ...). In the same way, anidbid is also a typed tag but doesn't have default values. Furthermore, the location storage of tags have changed, now accepted descriptive tags are stored in the torrents table in the column "tags" and they are separated by commas. In the opposite, accepted typed tags can have have their own column in the torrents table. For example, anidbid, vndbid will populate the column DbID when accepted. On the other hand, videoquality will populate the same way as descriptive tags. This behaviour depends on the callbackOnType function in tag/helpers.go * fix for modtools :') * Added anidb, vndb, dlsite & vmdb id fields in torrent model. Tags don't have an accepted field anymore. Accepted Tags are in torrent.AcceptedTags and non-accepted ones in torrrent.Tags. New Helper + New Changelog for translation string. * New upload/edit form for torrent tags. Now the inputs are dynamically generated by the helper tag_form. No more modal window in those form, only inputs. Support of tags in API New translation string for the link to the modal on torrent view. More comments in the functions for tags * Improving how config for tags work. Adding a test on them with understandable messages. Config for tags have now a Field attribute which is linked to the Torrent model. For example anidbid tag type has now a AnidbID field in config which is the name of the field in torrent model (AnidbID). Every new tag type need to have a field attribute with its counterpart in torrent Model. Fixing some errors * Fix compile error + Tests Errors * Improve performance by caching the list of tags with an index Adding/removing tags works/tested New translation strings TODO: test/fix adding tag on upload/edit * Mini fix to display video quality + tags works/tested on modo edit * Fix editing tags on modpanel * Edit tags works * Add translation string * Add search backend for tags. ?tags=xxx,eee,ddd ?anidb=21 ?vndb=23 ?vgmdb=24 ?vq=full_hd * Fix Ajax tag Removal&Add * Added form for descriptive tags * Forgot to add the link between database and form for descriptive tags. * Adding the increase/decrease pantsu for descriptive tags * Fix #1370 * When you actually forgot to commit files after having forgotten commits
240 lignes
6,6 Kio
Go
240 lignes
6,6 Kio
Go
package upload
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"mime/multipart"
|
|
"os"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/NyaaPantsu/nyaa/utils/validator/tag"
|
|
|
|
"github.com/NyaaPantsu/nyaa/models/tag"
|
|
|
|
"github.com/NyaaPantsu/nyaa/config"
|
|
"github.com/NyaaPantsu/nyaa/models"
|
|
"github.com/NyaaPantsu/nyaa/utils/sanitize"
|
|
"github.com/NyaaPantsu/nyaa/utils/search"
|
|
"github.com/NyaaPantsu/nyaa/utils/validator/torrent"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// form names
|
|
const uploadFormTorrent = "torrent"
|
|
|
|
type torrentsQuery struct {
|
|
Category int `json:"category"`
|
|
SubCategory int `json:"sub_category"`
|
|
Status int `json:"status"`
|
|
Uploader int `json:"uploader"`
|
|
Downloads int `json:"downloads"`
|
|
}
|
|
|
|
// TorrentsRequest struct
|
|
type TorrentsRequest struct {
|
|
Query torrentsQuery `json:"search"`
|
|
Page int `json:"page"`
|
|
MaxPerPage int `json:"limit"`
|
|
}
|
|
|
|
// APIResultJSON for torrents in json for api
|
|
type APIResultJSON struct {
|
|
Torrents []models.TorrentJSON `json:"torrents"`
|
|
QueryRecordCount int `json:"queryRecordCount"`
|
|
TotalRecordCount int `json:"totalRecordCount"`
|
|
}
|
|
|
|
// ToParams : Convert a torrentsrequest to searchparams
|
|
func (r *TorrentsRequest) ToParams() *search.Query {
|
|
res := &search.Query{}
|
|
v := reflect.ValueOf(r.Query)
|
|
|
|
for i := 0; i < v.NumField(); i++ {
|
|
field := v.Field(i)
|
|
if field.Interface() != reflect.Zero(field.Type()).Interface() {
|
|
res.Append(v.Type().Field(i).Tag.Get("json"), field.Interface())
|
|
}
|
|
}
|
|
return res
|
|
}
|
|
|
|
// ExtractEditInfo : takes an http request and computes all fields for this form
|
|
func ExtractEditInfo(c *gin.Context, r *torrentValidator.TorrentRequest) error {
|
|
err := ExtractBasicValue(c, r)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.ValidateName()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.ExtractCategory()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.ExtractLanguage()
|
|
return err
|
|
}
|
|
|
|
// ExtractBasicValue : takes an http request and computes all basic fields for this form
|
|
func ExtractBasicValue(c *gin.Context, r *torrentValidator.TorrentRequest) error {
|
|
c.Bind(r)
|
|
r.Tags = tagsValidator.Bind(c, true) // This function already delete duplicated tags (only use one of the PostForm)
|
|
|
|
// trim whitespace
|
|
r.Name = strings.TrimSpace(r.Name)
|
|
r.Description = sanitize.Sanitize(strings.TrimSpace(r.Description), "default")
|
|
r.WebsiteLink = strings.TrimSpace(r.WebsiteLink)
|
|
r.Magnet = strings.TrimSpace(r.Magnet)
|
|
|
|
if len(r.Languages) == 0 { // Shouldn't have to do that since c.Bind actually bind arrays, but better off adding it in case gin doesn't do his work
|
|
r.Languages = c.PostFormArray("languages")
|
|
}
|
|
// then actually check that we have everything we need
|
|
|
|
err := r.ValidateDescription()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.ValidateWebsiteLink()
|
|
return err
|
|
}
|
|
|
|
// ExtractInfo : takes an http request and computes all fields for this form
|
|
func ExtractInfo(c *gin.Context, r *torrentValidator.TorrentRequest) error {
|
|
err := ExtractBasicValue(c, r)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.ExtractCategory()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.ExtractLanguage()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
tfile, err := r.ValidateMultipartUpload(c, uploadFormTorrent)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// We check name only here, reason: we can try to retrieve them from the torrent file
|
|
err = r.ValidateName()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// after data has been checked & extracted, write it to disk
|
|
if len(config.Get().Torrents.FileStorage) > 0 && r.Filesize > 0 {
|
|
err := writeTorrentToDisk(tfile, r.Infohash+".torrent", &r.Filepath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
r.Filepath = ""
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// UpdateTorrent : Update torrent model
|
|
func UpdateTorrent(r *torrentValidator.UpdateRequest, t *models.Torrent, currentUser *models.User) *models.Torrent {
|
|
if r.Update.Name != "" {
|
|
t.Name = r.Update.Name
|
|
}
|
|
if r.Update.Infohash != "" {
|
|
t.Hash = r.Update.Infohash
|
|
}
|
|
if r.Update.CategoryID != 0 {
|
|
t.Category = r.Update.CategoryID
|
|
}
|
|
if r.Update.SubCategoryID != 0 {
|
|
t.SubCategory = r.Update.SubCategoryID
|
|
}
|
|
if r.Update.Description != "" {
|
|
t.Description = r.Update.Description
|
|
}
|
|
if r.Update.WebsiteLink != "" {
|
|
t.WebsiteLink = r.Update.WebsiteLink
|
|
}
|
|
t.Languages = r.Update.Languages
|
|
status := models.TorrentStatusNormal
|
|
if r.Update.Remake { // overrides trusted
|
|
status = models.TorrentStatusRemake
|
|
} else if currentUser.IsTrusted() {
|
|
status = models.TorrentStatusTrusted
|
|
}
|
|
t.Status = status
|
|
|
|
t.Hidden = r.Update.Hidden
|
|
// This part of the code check that we have only one tag of the same type
|
|
var tagsReq models.Tags
|
|
|
|
for _, tagForm := range r.Update.Tags {
|
|
tag := &models.Tag{
|
|
Tag: tagForm.Tag,
|
|
Type: tagForm.Type,
|
|
Accepted: true,
|
|
TorrentID: t.ID,
|
|
UserID: 0, // 0 so we don't increase pantsu points for every tag for the actual user (would be too much increase)
|
|
Weight: config.Get().Torrents.Tags.MaxWeight + 1,
|
|
}
|
|
if currentUser.CurrentUserIdentical(t.UploaderID) {
|
|
// We do not pass the current user so we don't increase/decrease pantsu for owner torrents
|
|
tags.FilterOrCreate(tag, t, &models.User{}) // We create a tag or we filter out every tags and increase/decrease pantsu for already sent tags of the same type
|
|
} else {
|
|
// If we are not the owner, we increase/decrease pantsus for each successfull edit
|
|
// So it increases pantsu of moderator when they edit torrents
|
|
tags.FilterOrCreate(tag, t, currentUser)
|
|
}
|
|
tagsReq = append(tagsReq, *tag) // Finally we append the tag to the tag list
|
|
}
|
|
t.Tags = tagsReq // and overwrite the torrent tags
|
|
return t
|
|
}
|
|
|
|
// UpdateUnscopeTorrent : Update a torrent model without scoping
|
|
func UpdateUnscopeTorrent(r *torrentValidator.UpdateRequest, t *models.Torrent, currentUser *models.User) *models.Torrent {
|
|
t = UpdateTorrent(r, t, currentUser)
|
|
t.Status = r.Update.Status
|
|
return t
|
|
}
|
|
|
|
func writeTorrentToDisk(file multipart.File, name string, fullpath *string) error {
|
|
_, seekErr := file.Seek(0, io.SeekStart)
|
|
if seekErr != nil {
|
|
return seekErr
|
|
}
|
|
b, err := ioutil.ReadAll(file)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*fullpath = fmt.Sprintf("%s%c%s", config.Get().Torrents.FileStorage, os.PathSeparator, name)
|
|
return ioutil.WriteFile(*fullpath, b, 0644)
|
|
}
|
|
|
|
// NewTorrentRequest : creates a new torrent request struc with some default value
|
|
func NewTorrentRequest(params ...string) *torrentValidator.TorrentRequest {
|
|
torrentRequest := &torrentValidator.TorrentRequest{}
|
|
if len(params) > 1 {
|
|
torrentRequest.Category = params[0]
|
|
} else {
|
|
torrentRequest.Category = "3_12"
|
|
}
|
|
if len(params) > 2 {
|
|
torrentRequest.Description = params[1]
|
|
} else {
|
|
torrentRequest.Description = "Description"
|
|
}
|
|
return torrentRequest
|
|
}
|