2017-07-01 23:09:35 +02:00
package upload
2017-05-11 05:04:11 +02:00
import (
2017-07-01 23:09:35 +02:00
"reflect"
"strings"
2017-05-27 00:45:18 +02:00
Tag Search + Tests + Search slight refactor [DONE] (#1342)
* 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
2017-08-22 03:48:10 +02:00
"github.com/NyaaPantsu/nyaa/utils/validator/tag"
2017-08-01 23:38:13 +02:00
"github.com/NyaaPantsu/nyaa/models/tag"
2017-05-20 01:10:16 +02:00
"github.com/NyaaPantsu/nyaa/config"
2017-06-29 13:15:23 +02:00
"github.com/NyaaPantsu/nyaa/models"
2017-07-02 16:54:55 +02:00
"github.com/NyaaPantsu/nyaa/utils/sanitize"
Tag Search + Tests + Search slight refactor [DONE] (#1342)
* 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
2017-08-22 03:48:10 +02:00
"github.com/NyaaPantsu/nyaa/utils/search"
2017-07-02 16:54:55 +02:00
"github.com/NyaaPantsu/nyaa/utils/validator/torrent"
2017-07-01 23:09:35 +02:00
"github.com/gin-gonic/gin"
2017-05-11 05:04:11 +02:00
)
2017-07-01 23:09:35 +02:00
// 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
Tag Search + Tests + Search slight refactor [DONE] (#1342)
* 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
2017-08-22 03:48:10 +02:00
func ( r * TorrentsRequest ) ToParams ( ) * search . Query {
res := & search . Query { }
2017-07-01 23:09:35 +02:00
v := reflect . ValueOf ( r . Query )
for i := 0 ; i < v . NumField ( ) ; i ++ {
field := v . Field ( i )
if field . Interface ( ) != reflect . Zero ( field . Type ( ) ) . Interface ( ) {
Tag Search + Tests + Search slight refactor [DONE] (#1342)
* 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
2017-08-22 03:48:10 +02:00
res . Append ( v . Type ( ) . Field ( i ) . Tag . Get ( "json" ) , field . Interface ( ) )
2017-05-11 05:04:11 +02:00
}
}
2017-07-01 23:09:35 +02:00
return res
2017-05-11 05:04:11 +02:00
}
2017-05-20 01:10:16 +02:00
2017-07-01 23:09:35 +02:00
// 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 )
Tag Search + Tests + Search slight refactor [DONE] (#1342)
* 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
2017-08-22 03:48:10 +02:00
r . Tags = tagsValidator . Bind ( c , true ) // This function already delete duplicated tags (only use one of the PostForm)
2017-08-01 23:38:13 +02:00
2017-07-01 23:09:35 +02:00
// 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 )
2017-07-06 22:19:44 +02:00
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" )
}
2017-07-01 23:09:35 +02:00
// 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
}
Upload to nyaa.si, anidex & TokyoTosho [done] (#1633)
* Update upload.go
* Update helpers.go
* Update template_test.go
* Update upload_multiple.jet.html
* change variable names
* wrong copypaste
* change variable name
* ditto
* Fix travis
* Update main.css
* Update upload.go
* Update upload.jet.html
* Update main.css
* Update upload.go
* More compact form
* CSS changes to go along
* Update main.css
* Update upload.jet.html
* Slightly lower bottom margin
* Update upload_multiple.jet.html
* tomorrow color adjustements
* small css adjustements
* Update upload.go
* Update default_config.yml
* Update default_config.yml
* Update structs.go
* Update user.go
* Update structs.go
* Update upload.go
* Update default_config.yml
* Update upload_multiple.jet.html
* Update upload.go
* Update upload.jet.html
* Update template_test.go
* this one is optional for anidex
* Update default_config.yml
* Possible improvement
As mentionned in my comment, it seems that having a checkbox already checked and disabled for logged in user + having the input text for apikey is a bit tedious.
Moreover, asking to check and fill the input text to upload in anidex when you are not logged is doing things twice. If you don't want to upload to anidex, don't fill the input.
So this commit push a new behaviour:
* If you are logged in and you have filled your anidex/nyaasi api key : the form should only show the checkbox asking if you want to upload to nyaasi.
* If you're not logged in or you don't have filled your api key in your profile settings: you only show the input text for the api key and not the checkbox. If someone wants to upload to nyaasi/anidex, he will just need to fill the input.
* This adds back the support of anonymous upload when logged in or not.
This works simply by checking if the user wants to upload as anon (when he checks the checkbox "upload as anonymous") or by checking the emptyness of apikey.
+ reverts the condition statements since it was needed to have apikey empty
* Forgot to save this file
* This commit adds the go routines for each upload service (anidex, nyaasi, tosho).
New controller and url to check the upload status (/upload/status/:id).
If you add ?json at the end, it outputs a json format of the multi upload status.
To prevent memory overload, we only keep in memory the multiupload status for 5 minutes.
Moved multipleform struct from templates to upload utils.
* fix form display on classic theme
* This commit adds:
* Javascript refreshing of the upload status
* Localization of the pages
* Fixed some bugs
This works, only need to get torrent file now.
* Added a new function to get the Path to the torrent file.
* Added a function to check that a torrent file exists and if not generate it on multiupload
* Enabled file upload through http post request to anidex
* Fixed bugs
* Modified the behaviour to generate torrent preivously. It is a synchrone function now. So we need to make it asynchronous in download.go
Now torrents file are always generated at upload time in a background processus with the correct trackers (needed ones + the ones provided by the user).
I made the anidex tracker as a needed one to allow multiupload even if the user hasn't included in his torrent file/magnet url.
* Moving deadtrackers list to default config
Support torrent file creation when upload without scraping
* Fix possible bug where no one is seeding a torrent yet (first time upload)
Add primary tracker in torrent file
* Fixing issue with boolean pointer for private torrent
* fixing index out of range for announcelist filtering
Fixing anidex tracker not found
* Fixing lang id error
* Anidex upload works
* Fix for multiupload with magnet
* This adds TokyoTosho support. Since TokyoTosho API only support upload by URL (and not torrent file upload). We need to make the download url available without ddos protection.
Also TokyoTosho doesn't need a category select. Since it does have limited option, we can automatically convert our categories to the tokyotosho one.
* Removing the folder tosho and put categories.go directly in upload package.
Added category conversion for nyaasi too.
Added tests on category conversion.
* This should add nyaasi support.
Is not tested though.
* Updated defaut config with new nyaa.si behaviour?
* Forgot to commit this file
2018-01-03 09:21:07 +01:00
err = r . ValidateMultipartUpload ( c , uploadFormTorrent )
2017-07-01 23:09:35 +02:00
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
}
Upload to nyaa.si, anidex & TokyoTosho [done] (#1633)
* Update upload.go
* Update helpers.go
* Update template_test.go
* Update upload_multiple.jet.html
* change variable names
* wrong copypaste
* change variable name
* ditto
* Fix travis
* Update main.css
* Update upload.go
* Update upload.jet.html
* Update main.css
* Update upload.go
* More compact form
* CSS changes to go along
* Update main.css
* Update upload.jet.html
* Slightly lower bottom margin
* Update upload_multiple.jet.html
* tomorrow color adjustements
* small css adjustements
* Update upload.go
* Update default_config.yml
* Update default_config.yml
* Update structs.go
* Update user.go
* Update structs.go
* Update upload.go
* Update default_config.yml
* Update upload_multiple.jet.html
* Update upload.go
* Update upload.jet.html
* Update template_test.go
* this one is optional for anidex
* Update default_config.yml
* Possible improvement
As mentionned in my comment, it seems that having a checkbox already checked and disabled for logged in user + having the input text for apikey is a bit tedious.
Moreover, asking to check and fill the input text to upload in anidex when you are not logged is doing things twice. If you don't want to upload to anidex, don't fill the input.
So this commit push a new behaviour:
* If you are logged in and you have filled your anidex/nyaasi api key : the form should only show the checkbox asking if you want to upload to nyaasi.
* If you're not logged in or you don't have filled your api key in your profile settings: you only show the input text for the api key and not the checkbox. If someone wants to upload to nyaasi/anidex, he will just need to fill the input.
* This adds back the support of anonymous upload when logged in or not.
This works simply by checking if the user wants to upload as anon (when he checks the checkbox "upload as anonymous") or by checking the emptyness of apikey.
+ reverts the condition statements since it was needed to have apikey empty
* Forgot to save this file
* This commit adds the go routines for each upload service (anidex, nyaasi, tosho).
New controller and url to check the upload status (/upload/status/:id).
If you add ?json at the end, it outputs a json format of the multi upload status.
To prevent memory overload, we only keep in memory the multiupload status for 5 minutes.
Moved multipleform struct from templates to upload utils.
* fix form display on classic theme
* This commit adds:
* Javascript refreshing of the upload status
* Localization of the pages
* Fixed some bugs
This works, only need to get torrent file now.
* Added a new function to get the Path to the torrent file.
* Added a function to check that a torrent file exists and if not generate it on multiupload
* Enabled file upload through http post request to anidex
* Fixed bugs
* Modified the behaviour to generate torrent preivously. It is a synchrone function now. So we need to make it asynchronous in download.go
Now torrents file are always generated at upload time in a background processus with the correct trackers (needed ones + the ones provided by the user).
I made the anidex tracker as a needed one to allow multiupload even if the user hasn't included in his torrent file/magnet url.
* Moving deadtrackers list to default config
Support torrent file creation when upload without scraping
* Fix possible bug where no one is seeding a torrent yet (first time upload)
Add primary tracker in torrent file
* Fixing issue with boolean pointer for private torrent
* fixing index out of range for announcelist filtering
Fixing anidex tracker not found
* Fixing lang id error
* Anidex upload works
* Fix for multiupload with magnet
* This adds TokyoTosho support. Since TokyoTosho API only support upload by URL (and not torrent file upload). We need to make the download url available without ddos protection.
Also TokyoTosho doesn't need a category select. Since it does have limited option, we can automatically convert our categories to the tokyotosho one.
* Removing the folder tosho and put categories.go directly in upload package.
Added category conversion for nyaasi too.
Added tests on category conversion.
* This should add nyaasi support.
Is not tested though.
* Updated defaut config with new nyaa.si behaviour?
* Forgot to commit this file
2018-01-03 09:21:07 +01:00
// We are not saving the file here because we need to add our own tracker list to the torrent file, therefore, we generate the torrent file at upload time through GenerateTorrent()
// when it is magnet
2017-07-01 23:09:35 +02:00
return nil
}
// UpdateTorrent : Update torrent model
2017-07-02 18:00:12 +02:00
func UpdateTorrent ( r * torrentValidator . UpdateRequest , t * models . Torrent , currentUser * models . User ) * models . Torrent {
2017-07-01 23:09:35 +02:00
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
}
2017-07-04 02:40:54 +02:00
t . Languages = r . Update . Languages
2017-07-01 23:09:35 +02:00
status := models . TorrentStatusNormal
if r . Update . Remake { // overrides trusted
status = models . TorrentStatusRemake
} else if currentUser . IsTrusted ( ) {
status = models . TorrentStatusTrusted
}
2017-11-14 09:39:39 +01:00
if status != t . Status && status != models . TorrentStatusBlocked {
t . DeletedAt = nil
}
2017-07-01 23:09:35 +02:00
t . Status = status
2017-07-02 18:00:12 +02:00
2017-07-14 17:53:37 +02:00
t . Hidden = r . Update . Hidden
2017-08-01 23:38:13 +02:00
// This part of the code check that we have only one tag of the same type
var tagsReq models . Tags
Tag Search + Tests + Search slight refactor [DONE] (#1342)
* 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
2017-08-22 03:48:10 +02:00
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
2017-07-02 18:00:12 +02:00
return t
2017-07-01 23:09:35 +02:00
}
2017-07-17 21:32:55 +02:00
// 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
}
2017-07-01 23:09:35 +02:00
// NewTorrentRequest : creates a new torrent request struc with some default value
2017-07-04 03:05:00 +02:00
func NewTorrentRequest ( params ... string ) * torrentValidator . TorrentRequest {
torrentRequest := & torrentValidator . TorrentRequest { }
2017-07-01 23:09:35 +02:00
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"
2017-05-20 01:10:16 +02:00
}
2017-07-04 03:05:00 +02:00
return torrentRequest
2017-05-20 01:10:16 +02:00
}