diff --git a/go.mod b/go.mod index 03c53d4..b88c459 100644 --- a/go.mod +++ b/go.mod @@ -21,5 +21,5 @@ require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect github.com/xujiajun/mmap-go v1.0.1 // indirect github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b // indirect - golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect + golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e // indirect ) diff --git a/go.sum b/go.sum index 01e6449..93bf16d 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a h1:N2T1jUrTQE9Re6TFF5PhvEHXHCguynGhKjWVsIUt5cY= -golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e h1:w36l2Uw3dRan1K3TyXriXvY+6T56GNmlKGcqiQUJDfM= +golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/huso.go b/huso.go index d17b32e..b72bb45 100644 --- a/huso.go +++ b/huso.go @@ -76,12 +76,12 @@ func main() { log.Fatal(err) } defer animeCache.Close() - seasoncache, err = bigcache.NewBigCache(bigcache.DefaultConfig(2 * time.Hour)) + seasoncache, err = bigcache.NewBigCache(bigcache.DefaultConfig(7 * time.Hour)) if err != nil { log.Fatal(err) } defer seasoncache.Close() - userCache, err = bigcache.NewBigCache(bigcache.DefaultConfig(7 * time.Hour)) + userCache, err = bigcache.NewBigCache(bigcache.DefaultConfig(5 * time.Hour)) if err != nil { log.Fatal(err) } @@ -109,6 +109,7 @@ func main() { LangeArbeit() go Arbeiten() + go BissleArbeiten() go LangeArbeiten() go RunWebserv() diff --git a/praktikant.go b/praktikant.go index dd224ee..9cc22d2 100644 --- a/praktikant.go +++ b/praktikant.go @@ -17,18 +17,6 @@ func Arbeiten() { } func Arbeit() { - // season data - _, bytes, err := GetSeasonDataAll() - if err != nil { - color.Errorln(err.Error()) - logOut.WriteError(err) - } else { - err = seasoncache.Set(seasonApiJikan, bytes) - if err != nil { - color.Errorln(err.Error()) - logOut.WriteError(err) - } - } // refresh animelist of users animesUsers, err := ReadAnimeUsers() if err != nil { @@ -63,16 +51,15 @@ func Arbeit() { } } -func LangeArbeiten() { - for range time.Tick(6 * time.Hour) { - LangeArbeit() +func BissleArbeiten() { + for range time.Tick(4 * time.Hour) { + BissleArbeit() } } -func LangeArbeit() { - count := 0 - +func BissleArbeit() { // refresh user cache + count := 0 regUsers, err := ReadRegisteredUsers() if err != nil { // check if no users registered @@ -93,9 +80,30 @@ func LangeArbeit() { } color.Infof("%d User aktualisiert\n", count) logOut.WriteLine(fmt.Sprintf("🔃 %d User aktualisiert", count)) +} + +func LangeArbeiten() { + for range time.Tick(6 * time.Hour) { + LangeArbeit() + } +} + +func LangeArbeit() { + // season data + _, bytes, err := GetSeasonDataAll() + if err != nil { + color.Errorln(err.Error()) + logOut.WriteError(err) + } else { + err = seasoncache.Set(seasonApiJikan, bytes) + if err != nil { + color.Errorln(err.Error()) + logOut.WriteError(err) + } + } - count = 0 // refresh anime cache with watched + count := 0 animesUsers, err := ReadAnimeUsers() if err != nil { if err != nutsdb.ErrBucketEmpty { @@ -106,7 +114,7 @@ func LangeArbeit() { for _, a := range animesUsers { // search season first _, err = SearchSeason(a.Anime) - if err != nil { + if err == nil { continue } err = refreshAnime(a.Anime)