5376b9e271
* New config files
As decided, config files are parsed at runtime.
I decided to go for YAML config files because there can be comments in
it.
There are 2 files:
* config/default_config.yml <= which shouldn't be edited unless we add a
config parameter
* config/config.yml <= which is the user-defined config. This file
shouldn't be commited
Changed every call to config.XXX to config.Conf.XXX (look to the new
stucture of config in config/types.go)
Of course, putting config parameters in config.yml overrides config in
config_default.yml. You don't have to put everything in it, just add
what you want to override.
* Fixing test
Replacing conf.New by config.Conf
* Fixing call to config.Conf to config.Config{} in test files
* Might have fixed testing with this
Printf instead of Fatalf
* Renaming config.yml in example file
* Forbid commiting config.yml
* Should be now fixed
* Do not need this file anymore
73 lignes
2 Kio
Go
73 lignes
2 Kio
Go
package model
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/NyaaPantsu/nyaa/config"
|
|
)
|
|
|
|
// TorrentReport model
|
|
// User can be null (anonymous reports)
|
|
// FIXME can't preload field Torrents for model.TorrentReport
|
|
type TorrentReport struct {
|
|
ID uint `gorm:"column:torrent_report_id;primary_key"`
|
|
Description string `gorm:"column:type"`
|
|
TorrentID uint `gorm:"column:torrent_id"`
|
|
UserID uint `gorm:"column:user_id"`
|
|
|
|
CreatedAt time.Time `gorm:"column:created_at"`
|
|
|
|
Torrent *Torrent `gorm:"AssociationForeignKey:TorrentID;ForeignKey:torrent_id"`
|
|
User *User `gorm:"AssociationForeignKey:UserID;ForeignKey:user_id"`
|
|
}
|
|
|
|
// TableName : Return the name of torrent report table
|
|
func (report TorrentReport) TableName() string {
|
|
return config.Conf.Models.ReportsTableName
|
|
}
|
|
|
|
// TorrentReportJSON : Json struct of torrent report model
|
|
type TorrentReportJSON struct {
|
|
ID uint `json:"id"`
|
|
Description string `json:"description"`
|
|
Torrent TorrentJSON `json:"torrent"`
|
|
User UserJSON `json:"user"`
|
|
}
|
|
|
|
/* Model Conversion to Json */
|
|
|
|
func getReportDescription(d string) string {
|
|
if d == "illegal" {
|
|
return "Illegal content"
|
|
} else if d == "spam" {
|
|
return "Spam / Garbage"
|
|
} else if d == "wrongcat" {
|
|
return "Wrong category"
|
|
} else if d == "dup" {
|
|
return "Duplicate / Deprecated"
|
|
}
|
|
return "???"
|
|
}
|
|
|
|
// ToJSON : conversion to json of a torrent report
|
|
func (report *TorrentReport) ToJSON() TorrentReportJSON {
|
|
t := TorrentJSON{}
|
|
if report.Torrent != nil { // FIXME: report.Torrent should never be nil
|
|
t = report.Torrent.ToJSON()
|
|
}
|
|
u := UserJSON{}
|
|
if report.User != nil {
|
|
u = report.User.ToJSON()
|
|
}
|
|
json := TorrentReportJSON{report.ID, getReportDescription(report.Description), t, u}
|
|
return json
|
|
}
|
|
|
|
// TorrentReportsToJSON : Conversion of multiple reports to json
|
|
func TorrentReportsToJSON(reports []TorrentReport) []TorrentReportJSON {
|
|
json := make([]TorrentReportJSON, len(reports))
|
|
for i := range reports {
|
|
json[i] = reports[i].ToJSON()
|
|
}
|
|
return json
|
|
}
|