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
60 lignes
1,8 Kio
Go
60 lignes
1,8 Kio
Go
package model
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/NyaaPantsu/nyaa/config"
|
|
)
|
|
|
|
// Comment model
|
|
type Comment struct {
|
|
ID uint `gorm:"column:comment_id;primary_key"`
|
|
TorrentID uint `gorm:"column:torrent_id"`
|
|
UserID uint `gorm:"column:user_id"`
|
|
Content string `gorm:"column:content"`
|
|
CreatedAt time.Time `gorm:"column:created_at"`
|
|
UpdatedAt time.Time `gorm:"column:updated_at"`
|
|
DeletedAt *time.Time
|
|
|
|
Torrent *Torrent `gorm:"AssociationForeignKey:TorrentID;ForeignKey:torrent_id"`
|
|
User *User `gorm:"AssociationForeignKey:UserID;ForeignKey:user_id"`
|
|
}
|
|
|
|
// Size : Returns the total size of memory recursively allocated for this struct
|
|
func (c Comment) Size() int {
|
|
return (3 + 3*3 + 2 + 2 + len(c.Content)) * 8
|
|
}
|
|
|
|
// TableName : Return the name of comment table
|
|
func (c Comment) TableName() string {
|
|
return config.Conf.Models.CommentsTableName
|
|
}
|
|
|
|
// Identifier : Return the identifier of the comment
|
|
func (c *Comment) Identifier() string { // We Can personalize the identifier but we would have to handle toggle read in that case
|
|
return c.Torrent.Identifier()
|
|
}
|
|
|
|
// OldComment model from old nyaa
|
|
type OldComment struct {
|
|
TorrentID uint `gorm:"column:torrent_id"`
|
|
Username string `gorm:"column:username"`
|
|
Content string `gorm:"column:content"`
|
|
Date time.Time `gorm:"column:date"`
|
|
|
|
Torrent *Torrent `gorm:"ForeignKey:torrent_id"`
|
|
}
|
|
|
|
// Size : Returns the total size of memory recursively allocated for this struct
|
|
func (c OldComment) Size() int {
|
|
return (1 + 2*2 + len(c.Username) + len(c.Content) + 3 + 1) * 8
|
|
}
|
|
|
|
// TableName : Return the name of OldComment table
|
|
func (c OldComment) TableName() string {
|
|
// cba to rename this in the db
|
|
// TODO: Update database schema to fix this hack
|
|
// I find this odd considering how often the schema changes already
|
|
return "comments_old"
|
|
}
|