* 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
152 lignes
5,8 Kio
Go
152 lignes
5,8 Kio
Go
package tags
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/NyaaPantsu/nyaa/config"
|
|
"github.com/NyaaPantsu/nyaa/models"
|
|
"github.com/NyaaPantsu/nyaa/models/users"
|
|
"github.com/NyaaPantsu/nyaa/utils/log"
|
|
)
|
|
|
|
// FilterOrCreate check if a tag type has reached the maximal votes and removes the other tag of the same type
|
|
// Filtering means that we sum up all the tag with the same type/value
|
|
// and compare the sum with the maximum value (of votes) a tag can have
|
|
// if the value is greater than the maximum, we don't add the tag as a simple vote
|
|
// we add it directly in torrent model as an accepted tag and remove other tags with the same type
|
|
// This function return true if it has added/filtered the tags and false if errors were encountered
|
|
func FilterOrCreate(tag *models.Tag, torrent *models.Torrent, currentUser *models.User) bool {
|
|
// In case we are adding a default tag, we need to split the tag. Since the input form ask for comma separated tags
|
|
if tag.Type == config.Get().Torrents.Tags.Default && strings.Contains(tag.Tag, ",") {
|
|
tagsToAdd := strings.Split(tag.Tag, ",")
|
|
for _, tagToAdd := range tagsToAdd {
|
|
tagCopy := *tag
|
|
tagCopy.Tag = strings.TrimSpace(tagToAdd)
|
|
FilterOrCreate(&tagCopy, torrent, currentUser)
|
|
}
|
|
return true
|
|
}
|
|
if tag.Type != config.Get().Torrents.Tags.Default {
|
|
tagConf := config.Get().Torrents.Tags.Types.Get(tag.Type)
|
|
if tagConf.Name == "" {
|
|
return false
|
|
}
|
|
var oldValue = fmt.Sprint(reflect.ValueOf(torrent).Elem().FieldByName(tagConf.Field).Interface())
|
|
// If the tag is already accepted in torrent, don't need to create it again or modify it
|
|
if oldValue == tag.Tag || (oldValue == "0" && tag.Tag == "") || tag.Tag == "0" {
|
|
return true
|
|
}
|
|
}
|
|
if torrent.ID == 0 { // FilterOrCreate should be called after Bind to filter empty tags, so no need to check if tags are empty again
|
|
return false
|
|
}
|
|
tagSum := models.Tag{}
|
|
if !tag.Accepted {
|
|
// Here we only sum the tags of the same type, same value for the torrent specified, we don't handle errors since if no tags found, it returns an error
|
|
models.ORM.Select("torrent_id, tag, type, SUM(weight) as total").Where("torrent_id = ? AND tag = ? AND type = ?", torrent.ID, tag.Tag, tag.Type).Group("type, tag").Find(&tagSum)
|
|
} else {
|
|
// if the tag given is an accepted one, tagSum is the tag given
|
|
tagSum = *tag
|
|
}
|
|
|
|
// if the total sum is equal or lesser than the maximum set in config
|
|
if (tagSum.Total+tag.Weight) <= config.Get().Torrents.Tags.MaxWeight && !tagSum.Accepted {
|
|
// We only add the tag
|
|
_, err := New(tag, torrent)
|
|
if err != nil {
|
|
log.CheckErrorWithMessage(err, "TAG_NOT_CREATED: Couldn't create tag: %s")
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
// if the total sum is greater than the maximum set in config
|
|
// or if the tag is accepted (when owner uploads/edit torrent details)
|
|
// we can select all the tags of the same type
|
|
tags, err := FindAll(tag.Type, torrent.ID)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
// delete them and decrease/increase pantsu of the users who have voted wrongly/rightly
|
|
for _, toDelete := range tags {
|
|
// find the user who has voted for the tag
|
|
user, _, err := users.FindRawByID(toDelete.UserID)
|
|
if err != nil {
|
|
log.CheckErrorWithMessage(err, "USER_NOT_FOUND: Couldn't update pantsu points!")
|
|
}
|
|
// if the user exist
|
|
if user.ID > 0 {
|
|
// and if he has voted for the right tag value
|
|
if toDelete.Tag == tag.Tag {
|
|
// we increase his pantsu
|
|
user.IncreasePantsu()
|
|
} else {
|
|
// else we decrease them
|
|
user.DecreasePantsu()
|
|
}
|
|
// and finally we update the user so the changes take effect
|
|
user.Update()
|
|
}
|
|
// Not forget to delete the tag
|
|
toDelete.Delete()
|
|
}
|
|
if currentUser.ID > 0 {
|
|
// Same as for the current user, we increase his pantsus and update
|
|
currentUser.IncreasePantsu()
|
|
currentUser.Update() // we do it here since we didn't save the tag previously and didn't increase his pantsu
|
|
}
|
|
callbackOnType(&tagSum, torrent) // This callback will make different action depending on the tag type
|
|
return true
|
|
}
|
|
|
|
/// callbackOnType is a function which will perform different action depending on the tag type
|
|
func callbackOnType(tag *models.Tag, torrent *models.Torrent) {
|
|
if torrent.ID > 0 {
|
|
switch tag.Type {
|
|
case config.Get().Torrents.Tags.Default:
|
|
// We need to check that the tag doesn't actually exist
|
|
tags := strings.Split(torrent.AcceptedTags, ",")
|
|
for _, tagComp := range tags {
|
|
// if it exists, we return
|
|
if tag.Tag == tagComp {
|
|
return
|
|
}
|
|
}
|
|
// if it doesn't exist
|
|
// We check if the torrent has already accepted tags and that the tag is not empty
|
|
if torrent.AcceptedTags != "" && tag.Tag != "" {
|
|
// if yes we append to it a comma before inserting the tag
|
|
torrent.AcceptedTags += ","
|
|
}
|
|
// We finally add the tag to the column
|
|
torrent.AcceptedTags += tag.Tag
|
|
case "anidbid", "vndbid", "vgmdbid", "dlsite":
|
|
u64, err := strconv.ParseUint(tag.Tag, 10, 32)
|
|
if err != nil {
|
|
log.CheckErrorWithMessage(err, "CONVERT_TYPE: Can't convert tag '%s' to uint", tag.Tag)
|
|
return
|
|
}
|
|
// TODO: Perform a check that anidbid is in anidb database
|
|
tagConf := config.Get().Torrents.Tags.Types.Get(tag.Type)
|
|
if u64 > 0 {
|
|
reflect.ValueOf(torrent).Elem().FieldByName(tagConf.Field).SetUint(u64)
|
|
}
|
|
default:
|
|
// Some tag type can have default values that you have to choose from
|
|
// We, here, check that the tag is one of them
|
|
tagConf := config.Get().Torrents.Tags.Types.Get(tag.Type)
|
|
// We look for the tag type in config
|
|
if tagConf.Name != "" {
|
|
// and then check that the value is in his defaults if defaults are set
|
|
if len(tagConf.Defaults) > 0 && tagConf.Defaults[0] != "db" && tag.Tag != "" && !tagConf.Defaults.Contains(tag.Tag) {
|
|
// if not we return the function
|
|
return
|
|
}
|
|
// We overwrite the tag type in the torrent model
|
|
reflect.ValueOf(torrent).Elem().FieldByName(tagConf.Field).SetString(tag.Tag)
|
|
}
|
|
}
|
|
}
|
|
}
|