Merge branch 'master' of projekte.fagott.pw:grilist

2 files changed, 12 insertions, 79 deletions

diff --git a/modules/grils/gril.go b/modules/grils/gril.go
deleted file mode 100644
index 7b54ab1..0000000
--- a/modules/grils/gril.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package grils
-
-import (
-        "database/sql"
-        "fmt"
-        "strconv"
-        "strings"
-        "time"
-
-        "fagott.pw/grilist/modules/series"
-
-        "github.com/lib/pq"
-)
-
-type DataSource int
-
-const (
-        DataSourceACD DataSource = iota
-        DataSourceAniDB
-        DataSourceAnilist
-)
-
-type Trait struct {
-        Name          string
-        Value         string
-        OfficialValue string
-}
-
-type Gril struct {
-        ID         int
-        KanjiName  string
-        RomajiName string
-        OtherNames []string
-        Age        sql.NullInt64
-        Birthday   pq.NullTime
-        Tags       []string
-        Traits     []Trait
-        ForeignIDs map[DataSource]int
-        UpdatedAt  time.Time
-        Lists      []int
-        Series     []series.Series
-}
-
-func (g *Gril) Slug() string {
-        if g.RomajiName == "" {
-                return strconv.Itoa(g.ID)
-        }
-        return fmt.Sprintf(
-                "%d/%s",
-                g.ID,
-                strings.Replace(g.RomajiName, " ", "", -1))
-}
-
-func ImagePath(id int, useThumbnail bool) string {
-        if useThumbnail {
-                return fmt.Sprintf("http://img.grilist.moe/gril/thumb/%d.jpg", id)
-        }
-        return fmt.Sprintf("http://img.grilist.moe/gril/full/%d.jpg", id)
-}
-
-func (g *Gril) ImagePath(prioritizeThumbnail bool) string {
-        return ImagePath(g.ID, prioritizeThumbnail)
-}
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index debb77b..4a9990f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -14,15 +14,11 @@ import (
         "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
+        "fagott.pw/grilist/models"
 
         "github.com/julienschmidt/httprouter"
 )
 
-type CachedGril struct {
-        Created time.Time
-        Gril    *Gril
-}
-
 var (
         pgArrayReg = regexp.MustCompile(`(((?P<value>(([^",\\{}\s(NULL)])+|"([^"\\]|\\"|\\\\)*")))(,)?)`)
         pgValueIdx int
@@ -55,8 +51,8 @@ func (m *GrilsModule) Init(g *grilist.Grilist) {
         m.c = cache.New()
 }
 
-func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gril, error) {
-        var grils []*Gril
+func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*models.Gril, error) {
+        var grils []*models.Gril
 
         rows, err := m.g.DB.Query(fmt.Sprintf(`SELECT id, kanji_name, romaji_name, other_names, updated_at, age, birthday, tags FROM grilist.grils_flattened WHERE %s`, whereClause), params...)
         if err != nil {
@@ -65,7 +61,7 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gr
 
         defer rows.Close()
         for rows.Next() {
-                gril := &Gril{}
+                gril := &models.Gril{}
                 var tags []byte
                 var otherNames []byte
                 err = rows.Scan(&gril.ID, &gril.KanjiName, &gril.RomajiName, &otherNames, &gril.UpdatedAt, &gril.Age, &gril.Birthday, &tags)
@@ -84,7 +80,7 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gr
         return grils, nil
 }
 
-func (m *GrilsModule) GetListsOfGril(gril *Gril) error {
+func (m *GrilsModule) GetListsOfGril(gril *models.Gril) error {
         rows, err := m.g.DB.Query(`SELECT list_id FROM grilist.lists_grils WHERE gril_id = $1`, gril.ID)
         if err != nil {
                 return err
@@ -121,7 +117,7 @@ func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.Das
         }
 
         for rows.Next() {
-                var g Gril
+                var g models.Gril
                 if err := rows.Scan(&g.ID, &g.RomajiName, &g.KanjiName); err != nil {
                         log.Println(err)
                         continue
@@ -144,12 +140,12 @@ func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.Das
         return categories
 }
 
-func (m *GrilsModule) FromID(id int) (*Gril, error) {
+func (m *GrilsModule) FromID(id int) (*models.Gril, error) {
         if g, ok := m.c.Get(id); ok {
-                return g.(*Gril), nil
+                return g.(*models.Gril), nil
         }
 
-        gril := &Gril{
+        gril := &models.Gril{
                 ID: id,
         }
         t1 := time.Now()
@@ -220,9 +216,9 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
         return gril, nil
 }
 
-func (m *GrilsModule) FromIDs(ids []int) ([]*Gril, error) {
+func (m *GrilsModule) FromIDs(ids []int) ([]*models.Gril, error) {
         if len(ids) == 0 {
-                return make([]*Gril, 0), nil
+                return make([]*models.Gril, 0), nil
         }
 
         idList := "("
@@ -276,7 +272,7 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
         }
 
         defer rows.Close()
-        var similar []*Gril
+        var similar []*models.Gril
         for rows.Next() {
                 var id int
                 if err := rows.Scan(&id); err != nil {