This is a prelimenary work
Showing how we can remove services, preventing cyclic imports and lessing the number of imports.
Now db is in models. Db and models are highly tightened, according to go standards, you should put them in the same package.
In models, there are folders separating the different methods used to modify the models. For example, if you want to create a user, you have to use /models (for the user struct) and /models/user (for creating a user.
However, if you want to delete a torrent, you just have to import /models and do torrent.Delete(definitely bool).
By the way packages in models are the plural name of a model. For example, you have torrent.go for a torrent model and its package torrents for db stuff related functions (Find, Create, Some helpers)
2017-06-29 00:44:07 +02:00
package validator
2017-05-06 17:55:02 +02:00
import (
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
"reflect"
2017-05-06 18:52:27 +02:00
"strconv"
2017-05-26 12:12:52 +02:00
"github.com/NyaaPantsu/nyaa/util/log"
msg "github.com/NyaaPantsu/nyaa/util/messages"
2017-05-06 17:55:02 +02:00
)
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
// TODO: Rewrite module
// Functions are highly complex and require a lot of additional error handling
2017-05-06 17:55:02 +02:00
func IsZeroOfUnderlyingType ( x interface { } ) bool {
return x == reflect . Zero ( reflect . TypeOf ( x ) ) . Interface ( )
}
// AssignValue assign form values to model.
func AssignValue ( model interface { } , form interface { } ) {
modelIndirect := reflect . Indirect ( reflect . ValueOf ( model ) )
formElem := reflect . ValueOf ( form ) . Elem ( )
typeOfTForm := formElem . Type ( )
for i := 0 ; i < formElem . NumField ( ) ; i ++ {
2017-05-07 14:53:01 +02:00
tag := typeOfTForm . Field ( i ) . Tag
2017-05-07 19:59:38 +02:00
if tag . Get ( "omit" ) != "true" {
2017-05-07 14:53:01 +02:00
modelField := modelIndirect . FieldByName ( typeOfTForm . Field ( i ) . Name )
if modelField . IsValid ( ) {
formField := formElem . Field ( i )
modelField . Set ( formField )
} else {
log . Warnf ( "modelField : %s - %s" , typeOfTForm . Field ( i ) . Name , modelField )
}
2017-05-06 17:55:02 +02:00
}
}
}
2017-05-06 18:02:54 +02:00
2017-05-26 12:12:52 +02:00
// BindValueForm assign populate form from a request
This is a prelimenary work
Showing how we can remove services, preventing cyclic imports and lessing the number of imports.
Now db is in models. Db and models are highly tightened, according to go standards, you should put them in the same package.
In models, there are folders separating the different methods used to modify the models. For example, if you want to create a user, you have to use /models (for the user struct) and /models/user (for creating a user.
However, if you want to delete a torrent, you just have to import /models and do torrent.Delete(definitely bool).
By the way packages in models are the plural name of a model. For example, you have torrent.go for a torrent model and its package torrents for db stuff related functions (Find, Create, Some helpers)
2017-06-29 00:44:07 +02:00
/ * Deprecated , we use gin . Bind
2017-06-28 13:42:38 +02:00
func BindValueForm ( form interface { } , c * gin . Context ) {
2017-05-06 18:02:54 +02:00
formElem := reflect . ValueOf ( form ) . Elem ( )
for i := 0 ; i < formElem . NumField ( ) ; i ++ {
2017-05-06 18:52:27 +02:00
typeField := formElem . Type ( ) . Field ( i )
tag := typeField . Tag
2017-05-06 18:55:33 +02:00
switch typeField . Type . Name ( ) {
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
case "string" :
2017-06-28 13:42:38 +02:00
formElem . Field ( i ) . SetString ( c . PostForm ( tag . Get ( "form" ) ) )
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
case "int" :
2017-06-28 13:42:38 +02:00
nbr , _ := strconv . Atoi ( c . PostForm ( tag . Get ( "form" ) ) )
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
formElem . Field ( i ) . SetInt ( int64 ( nbr ) )
case "float" :
2017-06-28 13:42:38 +02:00
nbr , _ := strconv . Atoi ( c . PostForm ( tag . Get ( "form" ) ) )
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
formElem . Field ( i ) . SetFloat ( float64 ( nbr ) )
case "bool" :
2017-06-28 13:42:38 +02:00
nbr , _ := strconv . ParseBool ( c . PostForm ( tag . Get ( "form" ) ) )
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
formElem . Field ( i ) . SetBool ( nbr )
2017-05-06 18:55:33 +02:00
}
2017-05-06 18:02:54 +02:00
}
2017-05-06 18:55:33 +02:00
}
This is a prelimenary work
Showing how we can remove services, preventing cyclic imports and lessing the number of imports.
Now db is in models. Db and models are highly tightened, according to go standards, you should put them in the same package.
In models, there are folders separating the different methods used to modify the models. For example, if you want to create a user, you have to use /models (for the user struct) and /models/user (for creating a user.
However, if you want to delete a torrent, you just have to import /models and do torrent.Delete(definitely bool).
By the way packages in models are the plural name of a model. For example, you have torrent.go for a torrent model and its package torrents for db stuff related functions (Find, Create, Some helpers)
2017-06-29 00:44:07 +02:00
* /
2017-05-07 19:59:38 +02:00
2017-05-26 12:12:52 +02:00
// ValidateForm : Check if a form is valid according to its tags
2017-05-21 18:13:28 +02:00
func ValidateForm ( form interface { } , mes * msg . Messages ) {
2017-05-07 19:59:38 +02:00
formElem := reflect . ValueOf ( form ) . Elem ( )
for i := 0 ; i < formElem . NumField ( ) ; i ++ {
typeField := formElem . Type ( ) . Field ( i )
tag := typeField . Tag
inputName := typeField . Name
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
if tag . Get ( "hum_name" ) != "" { // For more human input name than gibberish
2017-05-07 19:59:38 +02:00
inputName = tag . Get ( "hum_name" )
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
if tag . Get ( "len_min" ) != "" && ( tag . Get ( "needed" ) != "" || formElem . Field ( i ) . Len ( ) > 0 ) { // Check minimum length
2017-06-20 02:06:07 +02:00
checkMinLength ( formElem . Field ( i ) , tag , inputName , mes )
2017-05-07 19:59:38 +02:00
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
if tag . Get ( "len_max" ) != "" && ( tag . Get ( "needed" ) != "" || formElem . Field ( i ) . Len ( ) > 0 ) { // Check maximum length
2017-06-20 02:06:07 +02:00
checkMaxLength ( formElem . Field ( i ) , tag , inputName , mes )
2017-05-07 19:59:38 +02:00
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
if tag . Get ( "equalInput" ) != "" && ( tag . Get ( "needed" ) != "" || formElem . Field ( i ) . Len ( ) > 0 ) {
2017-06-20 02:06:07 +02:00
checkEqualValue ( formElem , i , tag , inputName , mes )
2017-05-07 19:59:38 +02:00
}
2017-06-20 02:06:07 +02:00
checksOnFieldTypes ( formElem . Field ( i ) , inputName , typeField , tag , mes )
}
}
func checkMinLength ( fieldElem reflect . Value , tag reflect . StructTag , inputName string , mes * msg . Messages ) {
lenMin , _ := strconv . Atoi ( tag . Get ( "len_min" ) )
if fieldElem . Len ( ) < lenMin {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_min_length" , strconv . Itoa ( lenMin ) , inputName )
}
}
func checkMaxLength ( fieldElem reflect . Value , tag reflect . StructTag , inputName string , mes * msg . Messages ) {
lenMax , _ := strconv . Atoi ( tag . Get ( "len_max" ) )
if fieldElem . Len ( ) > lenMax {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_max_length" , strconv . Itoa ( lenMax ) , inputName )
}
}
func checkEqualValue ( formElem reflect . Value , i int , tag reflect . StructTag , inputName string , mes * msg . Messages ) {
otherInput := formElem . FieldByName ( tag . Get ( "equalInput" ) )
if formElem . Field ( i ) . Interface ( ) != otherInput . Interface ( ) {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_same_value" , inputName )
}
}
func checksOnFieldTypes ( fieldElem reflect . Value , inputName string , typeField reflect . StructField , tag reflect . StructTag , mes * msg . Messages ) {
switch typeField . Type . Name ( ) {
case "string" :
if tag . Get ( "equal" ) != "" && fieldElem . String ( ) != tag . Get ( "equal" ) {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_wrong_value" , inputName )
}
if tag . Get ( "needed" ) != "" && fieldElem . String ( ) == "" {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_field_needed" , inputName )
}
if fieldElem . String ( ) == "" && tag . Get ( "default" ) != "" {
fieldElem . SetString ( tag . Get ( "default" ) )
}
case "int" :
if tag . Get ( "equal" ) != "" { // Check minimum length
equal , _ := strconv . Atoi ( tag . Get ( "equal" ) )
if fieldElem . Int ( ) > int64 ( equal ) {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_wrong_value" , inputName )
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
}
2017-06-20 02:06:07 +02:00
}
if tag . Get ( "needed" ) != "" && fieldElem . Int ( ) == 0 {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_field_needed" , inputName )
}
if fieldElem . Int ( ) == 0 && tag . Get ( "default" ) != "" && tag . Get ( "notnull" ) != "" {
defaultValue , _ := strconv . Atoi ( tag . Get ( "default" ) )
fieldElem . SetInt ( int64 ( defaultValue ) )
}
case "float" :
if tag . Get ( "equal" ) != "" { // Check minimum length
equal , _ := strconv . Atoi ( tag . Get ( "equal" ) )
if fieldElem . Float ( ) != float64 ( equal ) {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_wrong_value" , inputName )
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
}
2017-06-20 02:06:07 +02:00
}
if tag . Get ( "needed" ) != "" && fieldElem . Float ( ) == 0 {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_field_needed" , inputName )
}
if fieldElem . Float ( ) == 0 && tag . Get ( "default" ) != "" && tag . Get ( "notnull" ) != "" {
defaultValue , _ := strconv . Atoi ( tag . Get ( "default" ) )
fieldElem . SetFloat ( float64 ( defaultValue ) )
}
case "bool" :
if tag . Get ( "equal" ) != "" { // Check minimum length
equal , _ := strconv . ParseBool ( tag . Get ( "equal" ) )
if fieldElem . Bool ( ) != equal {
mes . AddErrorTf ( tag . Get ( "form" ) , "error_wrong_value" , inputName )
2017-05-21 18:13:28 +02:00
}
2017-05-07 19:59:38 +02:00
}
2017-06-20 02:06:07 +02:00
if ! fieldElem . Bool ( ) && tag . Get ( "default" ) != "" && tag . Get ( "notnull" ) != "" {
defaultValue , _ := strconv . ParseBool ( tag . Get ( "default" ) )
fieldElem . SetBool ( defaultValue )
}
2017-05-07 19:59:38 +02:00
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
}