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
93 lignes
2,5 Kio
Go
93 lignes
2,5 Kio
Go
package search
|
|
|
|
import (
|
|
"strconv"
|
|
"time"
|
|
)
|
|
|
|
// DateFilter date to filter for
|
|
type DateFilter string
|
|
|
|
// ParseOld parses a date to a datefilter object and return true if it succeeded
|
|
// Deprecated: This function will be removed in 1.2, please use Parse
|
|
func (d *DateFilter) ParseOld(s string, dateType string) bool {
|
|
if s == "" {
|
|
*d = ""
|
|
return false
|
|
}
|
|
dateInt, err := strconv.Atoi(s)
|
|
if err != nil {
|
|
*d = ""
|
|
return false
|
|
}
|
|
switch dateType {
|
|
case "m":
|
|
*d = DateFilter(time.Now().AddDate(0, -dateInt, 0).Format("2006-01-02"))
|
|
case "y":
|
|
*d = DateFilter(time.Now().AddDate(-dateInt, 0, 0).Format("2006-01-02"))
|
|
default:
|
|
*d = DateFilter(time.Now().AddDate(0, 0, -dateInt).Format("2006-01-02"))
|
|
}
|
|
return true
|
|
}
|
|
|
|
// Parse parses a date to a datefilter object and return true if it succeeded
|
|
// This functions accept only date formatted in this way YYYY/MM/DD
|
|
func (d *DateFilter) Parse(s string) bool {
|
|
if s == "" {
|
|
*d = ""
|
|
return false
|
|
}
|
|
date, err := time.Parse("2006/01/02", s)
|
|
if err != nil {
|
|
*d = ""
|
|
return false
|
|
}
|
|
*d = DateFilter(date.Format("2006-01-02"))
|
|
return true
|
|
}
|
|
|
|
// ToESQuery convert DateFilter type to ES query format
|
|
func (d DateFilter) ToESQuery() string {
|
|
if d != "" {
|
|
return string(d)
|
|
}
|
|
return "*"
|
|
}
|
|
|
|
// ToDBQuery convert DateFilter type to ES query format
|
|
func (d DateFilter) ToDBQuery() string {
|
|
if d != "" {
|
|
return string(d)
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func backwardCompatibility(max string, from string, to string, dtype string) (DateFilter, DateFilter) {
|
|
fromDate, toDate := DateFilter(""), DateFilter("")
|
|
maxage, err := strconv.Atoi(max)
|
|
if err != nil {
|
|
// if we can't convert it, this means maxage was not provided or wrongly, so we try to filter the query with other date filter args
|
|
// Deprecated : We have to give backward compatibility here to dateType
|
|
// This will be removed on 1.2, please remove from using it and go to maxage or Date argument
|
|
if dtype != "" {
|
|
// if to xxx is not provided, fromDate is equal to from xxx
|
|
if to != "" {
|
|
fromDate.ParseOld(to, dtype)
|
|
toDate.ParseOld(from, dtype)
|
|
return fromDate, toDate
|
|
}
|
|
|
|
fromDate.ParseOld(from, dtype)
|
|
return fromDate, toDate
|
|
}
|
|
// This will be the future default behavior
|
|
// We only try to parse the dates sent and if it works we assign them
|
|
fromDate.Parse(from)
|
|
toDate.Parse(to)
|
|
return fromDate, toDate
|
|
}
|
|
// Maxage behavior where we convert the substracted date to string
|
|
fromDate = DateFilter(time.Now().AddDate(0, 0, -maxage).Format("2006-01-02"))
|
|
return fromDate, toDate
|
|
}
|