From f078c93b9ee591212351ce36f62b6e495959f529 Mon Sep 17 00:00:00 2001 From: daru Date: Fri, 1 Jul 2022 17:08:10 +0200 Subject: [PATCH] We fast now --- klotz.go | 3 ++- praktikant.go | 21 --------------------- schaffer.go | 12 ++++-------- season.qtpl | 4 ++-- season.qtpl.go | 8 ++++---- 5 files changed, 12 insertions(+), 36 deletions(-) diff --git a/klotz.go b/klotz.go index c726630..6dd3c9b 100644 --- a/klotz.go +++ b/klotz.go @@ -320,7 +320,8 @@ type MmOracle struct { type MovieChart struct { MmId int `json:"mmId"` + Anime int64 `json:"anime"` + Title string `json:"title"` AvgScore float64 `json:"avgScore"` UserCount int `json:"userCount"` - Data Anime `json:"data"` } diff --git a/praktikant.go b/praktikant.go index 750cff9..e2cb05b 100644 --- a/praktikant.go +++ b/praktikant.go @@ -194,27 +194,6 @@ func LangeArbeit() { } } - charts, err := BuildMovieCharts() - if err != nil { - color.Errorln(err.Error()) - logOut.WriteError(err) - } else { - for _, c := range charts { - // search season first - _, err = SearchSeason(c.Data.Anime) - if err == nil { - continue - } - err = refreshAnime(c.Data.Anime) - if err != nil { - color.Errorln(err.Error()) - logOut.WriteError(err) - continue - } - count++ - } - } - color.Infof("%d Anime aktualisiert\n", count) logOut.WriteLine(fmt.Sprintf("🔃 %d Anime aktualisiert", count)) } diff --git a/schaffer.go b/schaffer.go index cb655af..e543105 100644 --- a/schaffer.go +++ b/schaffer.go @@ -295,18 +295,14 @@ func BuildMovieCharts() ([]MovieChart, error) { charts = make([]MovieChart, 0) for _, m := range movieList { c := MovieChart{ - MmId: m.Id, - } - anime, err := SearchAnime(m.Anime) - if err != nil { - color.Errorln(err.Error()) - continue + MmId: m.Id, + Anime: m.Anime, + Title: m.Title, } - c.Data = *anime scoreSum := 0 for _, u := range users { - progress, _, score, err := FetchProgressOnState(anime.Anime, u.Username, malApiStatusC) + progress, _, score, err := FetchProgressOnState(c.Anime, u.Username, malApiStatusC) if err != nil { color.Errorln(err.Error()) continue diff --git a/season.qtpl b/season.qtpl index fc298e3..47dae29 100644 --- a/season.qtpl +++ b/season.qtpl @@ -55,10 +55,10 @@ body { background-color: #1a1a1a; color: #fff; } {% for _, chart := range charts %} {%d chart.MmId %} - {%dl chart.Data.Anime %} + {%dl chart.Anime %} {%d chart.UserCount %} {%f.2 chart.AvgScore %} - {%s chart.Data.Title %} + {%s chart.Title %} {% endfor %} diff --git a/season.qtpl.go b/season.qtpl.go index ed676e7..05fe11b 100644 --- a/season.qtpl.go +++ b/season.qtpl.go @@ -67,13 +67,13 @@ func StreamIndex(qw422016 *qt422016.Writer, animes []Anime, oracles []MmOracle, //line season.qtpl:57 qw422016.N().D(chart.MmId) //line season.qtpl:57 - qw422016.N().S(` `) //line season.qtpl:58 - qw422016.N().DL(chart.Data.Anime) + qw422016.N().DL(chart.Anime) //line season.qtpl:58 qw422016.N().S(` `) //line season.qtpl:59 @@ -85,7 +85,7 @@ func StreamIndex(qw422016 *qt422016.Writer, animes []Anime, oracles []MmOracle, //line season.qtpl:60 qw422016.N().S(` `) //line season.qtpl:61 - qw422016.E().S(chart.Data.Title) + qw422016.E().S(chart.Title) //line season.qtpl:61 qw422016.N().S(` `) //line season.qtpl:63