Skip to content

Commit

Permalink
fix: tarot (FloatTech#475)
Browse files Browse the repository at this point in the history
* fix tarot get img

* change: use sendtoslef check cache

但是好像过慢

* change: use imgpool

* fix

感觉改不好了

* fix: 修改变量赋值顺序
  • Loading branch information
Jiang-Red committed Oct 27, 2022
1 parent ce2f390 commit 3250ec1
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions plugin/tarot/tarot.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ func init() {
}).ApplySingle(ctxext.DefaultSingle)

cache := engine.DataFolder() + "cache"
_ = os.MkdirAll(cache, 0755)
_ = os.RemoveAll(cache)
err := os.MkdirAll(cache, 0755)
if err != nil {
panic(err)
}

getTarot := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
data, err := engine.GetLazyData("tarots.json", true)
Expand Down Expand Up @@ -142,19 +146,18 @@ func init() {
}
imgurl := bed + reverse[p] + card.ImgURL
imgname := ""
imgpath := cache + "/" + imgname + ".png"
if p == 1 {
imgname = reverse[p][:len(reverse[p])-1] + card.Name
imgname = reverse[p][:len(reverse[p])-1] + name
} else {
imgname = card.Name
imgname = name
}
imgpath := cache + "/" + imgname + ".png"
err := pool.SendImageFromPool(imgname, imgpath, func() error {
data, err := web.RequestDataWith(web.NewTLS12Client(), imgurl, "GET", "gitcode.net", web.RandUA())
if err != nil {
return err
}
var f *os.File
f, err = os.Create(imgpath)
f, err := os.Create(imgpath)
if err != nil {
return err
}
Expand Down Expand Up @@ -191,9 +194,9 @@ func init() {
var imgmsg message.MessageSegment
var err error
if p == 1 {
imgmsg, err = poolimg(ctx, imgurl, reverse[p][:len(reverse[p])-1]+card.Name, cache)
imgmsg, err = poolimg(ctx, imgurl, reverse[p][:len(reverse[p])-1]+name, cache)
} else {
imgmsg, err = poolimg(ctx, imgurl, card.Name, cache)
imgmsg, err = poolimg(ctx, imgurl, name, cache)
}
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
Expand Down Expand Up @@ -285,9 +288,9 @@ func init() {
var imgmsg message.MessageSegment
var err error
if p == 1 {
imgmsg, err = poolimg(ctx, imgurl, reverse[p][:len(reverse[p])-1]+card.Name, cache)
imgmsg, err = poolimg(ctx, imgurl, reverse[p][:len(reverse[p])-1]+name, cache)
} else {
imgmsg, err = poolimg(ctx, imgurl, card.Name, cache)
imgmsg, err = poolimg(ctx, imgurl, name, cache)
}
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
Expand Down

0 comments on commit 3250ec1

Please sign in to comment.