From 6049d382d0b75df46b0d0b330e4297246984ffe0 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 16 Jan 2016 08:52:16 +0100 Subject: =?UTF-8?q?anilist=20als=20datasource=20hinzugef=C3=BCgt,=20imagep?= =?UTF-8?q?ath=20angepasst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/modules/grils/gril.go b/modules/grils/gril.go index af84d04..7cc1e4b 100644 --- a/modules/grils/gril.go +++ b/modules/grils/gril.go @@ -15,7 +15,8 @@ type DataSource int const ( DataSourceACD DataSource = iota - DataSourceAniDB + DataSourceAniDB DataSource = iota + DataSourceAnilist DataSource = iota ) type Gril struct { @@ -42,10 +43,19 @@ func (g *Gril) Slug() string { } func ImagePath(id int, prioritizeThumbnail bool) string { + // Image Priority + // without prioritizeThumbnail: Anilist > ACD (big) > ACD (thumbnail) + // with prioritizeThumbnail: Anilist > ACD (thumbnail) > ACD (big) + + anilistPath := fmt.Sprintf("assets/img/gril/%d/%d.jpg", DataSourceAnilist, id) + if _, err := os.Stat(anilistPath); err == nil { + return fmt.Sprintf(anilistPath) + } + var big string exts := []string{"png", "jpg", "gif", "jpeg"} for _, ext := range exts { - path := fmt.Sprintf("assets/img/gril/%d/0.%s", id, ext) + path := fmt.Sprintf("assets/img/gril/%d/%d/0.%s", DataSourceACD, id, ext) if _, err := os.Stat(path); err == nil { if prioritizeThumbnail { big = path @@ -56,7 +66,7 @@ func ImagePath(id int, prioritizeThumbnail bool) string { } for _, ext := range exts { - path := fmt.Sprintf("assets/img/gril/%d/1.%s", id, ext) + path := fmt.Sprintf("assets/img/gril/%d/%d/1.%s", DataSourceACD, id, ext) if _, err := os.Stat(path); err == nil { return path } -- cgit v0.10.1 From 012d8130aff2bbb25fad97244a7a7a47ad2f6103 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 16 Jan 2016 08:54:44 +0100 Subject: =?UTF-8?q?Sch=C3=B6nheitsfehler,=20das=20iota=20wird=20nicht=20im?= =?UTF-8?q?mer=20ben=C3=B6tigt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/modules/grils/gril.go b/modules/grils/gril.go index 7cc1e4b..7b782b3 100644 --- a/modules/grils/gril.go +++ b/modules/grils/gril.go @@ -15,8 +15,8 @@ type DataSource int const ( DataSourceACD DataSource = iota - DataSourceAniDB DataSource = iota - DataSourceAnilist DataSource = iota + DataSourceAniDB + DataSourceAnilist ) type Gril struct { -- cgit v0.10.1