Skip to content

Commit a6bd717

Browse files
fumiamafumiama
committed
🔥 精简 log 输出
1 parent f2914ad commit a6bd717

File tree

24 files changed

+222
-152
lines changed

24 files changed

+222
-152
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/FloatTech/AnimeAPI v1.3.3-0.20220405074902-947bbc912682
77
github.com/FloatTech/sqlite v0.2.1
8-
github.com/FloatTech/zbputils v1.3.3-0.20220404063419-35ea3d038087
8+
github.com/FloatTech/zbputils v1.3.3-0.20220405145116-f0fb3e428563
99
github.com/antchfx/htmlquery v1.2.4
1010
github.com/corona10/goimagehash v1.0.3
1111
github.com/fogleman/gg v1.3.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/FloatTech/AnimeAPI v1.3.3-0.20220405074902-947bbc912682 h1:5pjrW6uotr
22
github.com/FloatTech/AnimeAPI v1.3.3-0.20220405074902-947bbc912682/go.mod h1:YhosmTPUUN8NTwUy3YQCXM9ESQ14x3NUi81cAIbklUs=
33
github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
44
github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
5-
github.com/FloatTech/zbputils v1.3.3-0.20220404063419-35ea3d038087 h1:yq9lwq5tbKuFEr9eiPeZsORmWKSAErFrzAIPc/1hmuA=
6-
github.com/FloatTech/zbputils v1.3.3-0.20220404063419-35ea3d038087/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
5+
github.com/FloatTech/zbputils v1.3.3-0.20220405145116-f0fb3e428563 h1:oQmb9iVoJtONBpQSD9YFWbtTznLTovtKCOBOypWDgsk=
6+
github.com/FloatTech/zbputils v1.3.3-0.20220405145116-f0fb3e428563/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
77
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
88
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
99
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=

‎plugin/ai_reply/ai_tts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func init() {
7272
}
7373
return numcn.EncodeFromFloat64(f)
7474
})
75-
log.Println("[tts]:", reply)
75+
log.Debugln("[tts]:", reply)
7676
return reply
7777
})))
7878
}

‎plugin/bilibili_parse/bilibili_parse.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/FloatTech/zbputils/control"
1010
"github.com/antchfx/htmlquery"
11-
log "github.com/sirupsen/logrus"
1211
zero "github.com/wdvxdr1123/ZeroBot"
1312
"github.com/wdvxdr1123/ZeroBot/message"
1413
)
@@ -27,17 +26,21 @@ func init() {
2726

2827
engine.OnRegex(bilibiliRe).SetBlock(true).Handle(func(ctx *zero.Ctx) {
2928
bilibiliURL := ctx.State["regex_matched"].([]string)[0]
30-
m := parseURL(bilibiliURL)
29+
m, err := parseURL(bilibiliURL)
30+
if err != nil {
31+
ctx.SendChain(message.Text("ERROR:", err))
32+
return
33+
}
3134
if len(m) != 0 {
3235
ctx.Send(m)
3336
}
3437
})
3538
}
3639

37-
func parseURL(bilibiliURL string) (m message.Message) {
40+
func parseURL(bilibiliURL string) (m message.Message, err error) {
3841
doc, err := htmlquery.LoadURL(bilibiliURL)
3942
if err != nil {
40-
log.Errorln("[bilibiliparse]:访问的链接为", bilibiliURL, ",错误为", err)
43+
return
4144
}
4245
videoURL := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='url']").Attr[2].Val
4346
re := regexp.MustCompile(validRe)

‎plugin/bilibili_push/bilibili_push.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ func init() {
7373
dbpath := en.DataFolder()
7474
dbfile := dbpath + "push.db"
7575
bdb = initialize(dbfile)
76-
log.Println("[bilibilipush]加载bilibilipush数据库")
7776
}()
7877

7978
en.OnRegex(`^添加b站订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
@@ -221,7 +220,7 @@ func bilibiliPushDaily() {
221220
t := time.NewTicker(time.Second * 10)
222221
defer t.Stop()
223222
for range t.C {
224-
log.Println("-----bilibilipush拉取推送信息-----")
223+
log.Debugln("-----bilibilipush拉取推送信息-----")
225224
sendDynamic()
226225
sendLive()
227226
}

‎plugin/book_review/book_review.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ func init() {
4141
b := getBookReviewByKeyword(ctx.State["regex_matched"].([]string)[1])
4242
data, err := text.RenderToBase64(b.BookReview, text.FontFile, 400, 20)
4343
if err != nil {
44-
log.Println("err:", err)
44+
ctx.SendChain(message.Text("ERROR:", err))
45+
return
4546
}
4647
if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
4748
ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -53,7 +54,8 @@ func init() {
5354
br := getRandomBookReview()
5455
data, err := text.RenderToBase64(br.BookReview, text.FontFile, 400, 20)
5556
if err != nil {
56-
log.Println("err:", err)
57+
ctx.SendChain(message.Text("ERROR:", err))
58+
return
5759
}
5860
if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
5961
ctx.SendChain(message.Text("ERROR:可能被风控了"))

‎plugin/cangtoushi/cangtoushi.go

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
control "github.com/FloatTech/zbputils/control"
1313
"github.com/antchfx/htmlquery"
14-
log "github.com/sirupsen/logrus"
1514
zero "github.com/wdvxdr1123/ZeroBot"
1615
"github.com/wdvxdr1123/ZeroBot/message"
1716
"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -37,85 +36,103 @@ func init() {
3736
})
3837
engine.OnRegex(`藏头诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
3938
kw := ctx.State["regex_matched"].([]string)[1]
40-
login()
39+
err := login()
40+
if err != nil {
41+
ctx.SendChain(message.Text("ERROR:", err))
42+
return
43+
}
4144
data, err := search(kw, "7", "0")
4245
if err != nil {
43-
log.Errorln("[cangtoushi]:", err)
46+
ctx.SendChain(message.Text("ERROR:", err))
47+
return
48+
}
49+
text, err := dealHTML(helper.BytesToString(data))
50+
if err != nil {
51+
ctx.SendChain(message.Text("ERROR:", err))
52+
return
4453
}
45-
text := dealHTML(helper.BytesToString(data))
4654
ctx.SendChain(message.Text(text))
4755
})
4856

4957
engine.OnRegex(`藏尾诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
5058
kw := ctx.State["regex_matched"].([]string)[1]
51-
login()
59+
err := login()
60+
if err != nil {
61+
ctx.SendChain(message.Text("ERROR:", err))
62+
return
63+
}
5264
data, err := search(kw, "7", "2")
5365
if err != nil {
54-
log.Errorln("[cangtoushi]:", err)
66+
ctx.SendChain(message.Text("ERROR:", err))
67+
return
68+
}
69+
text, err := dealHTML(helper.BytesToString(data))
70+
if err != nil {
71+
ctx.SendChain(message.Text("ERROR:", err))
72+
return
5573
}
56-
text := dealHTML(helper.BytesToString(data))
5774
ctx.SendChain(message.Text(text))
5875
})
5976
}
6077

61-
func login() {
78+
func login() error {
6279
gCurCookieJar, _ = cookiejar.New(nil)
6380
client := &http.Client{
6481
Jar: gCurCookieJar,
6582
}
6683
request, err := http.NewRequest("GET", loginURL, nil)
6784
if err != nil {
68-
log.Errorln("[cangtoushi]:", err)
85+
return err
6986
}
7087
request.Header.Add("User-Agent", ua)
7188
response, err := client.Do(request)
7289
if err != nil {
73-
log.Errorln("[cangtoushi]:", err)
90+
return err
7491
}
7592
data, err := io.ReadAll(response.Body)
7693
if err != nil {
77-
log.Errorln("[cangtoushi]:", err)
94+
return err
7895
}
7996
response.Body.Close()
8097
doc, err := htmlquery.Parse(strings.NewReader(helper.BytesToString(data)))
8198
if err != nil {
82-
log.Errorln("[cangtoushi]:", err)
99+
return err
83100
}
84101
csrf = htmlquery.SelectAttr(htmlquery.FindOne(doc, "//input[@name='_csrf']"), "value")
102+
return nil
85103
}
86104

87105
func search(kw, zishu, position string) (data []byte, err error) {
88106
postStr := fmt.Sprintf("_csrf=%s&kw=%s&zishu=%s&position=%s", url.QueryEscape(csrf), url.QueryEscape(kw), zishu, position)
89-
log.Println("postStr:", postStr)
90107
client := &http.Client{
91108
Jar: gCurCookieJar,
92109
}
93110
request, err := http.NewRequest("POST", searchURL, strings.NewReader(postStr))
94111
if err != nil {
95-
log.Errorln("[cangtoushi]:", err)
112+
return nil, err
96113
}
97114
request.Header.Add("Referer", referer)
98115
request.Header.Add("User-Agent", ua)
99116
request.Header.Add("Content-Type", "application/x-www-form-urlencoded")
100117
response, err := client.Do(request)
101118
if err != nil {
102-
log.Errorln("[cangtoushi]:", err)
119+
return nil, err
103120
}
104121
data, err = io.ReadAll(response.Body)
105122
if err != nil {
106-
log.Errorln("[cangtoushi]:", err)
123+
return nil, err
107124
}
108125
response.Body.Close()
109126
return
110127
}
111128

112-
func dealHTML(data string) (text string) {
129+
func dealHTML(data string) (text string, err error) {
113130
doc, err := htmlquery.Parse(strings.NewReader(data))
114131
if err != nil {
115-
log.Errorln("[cangtoushi]:", err)
132+
return "", err
116133
}
117134
text = htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@class='card']/div[@class='card']"))
118135
text = strings.ReplaceAll(text, " ", "")
119136
text = strings.Replace(text, "\n", "", 1)
120-
return text
137+
return text, nil
121138
}

‎plugin/coser/coser.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/tidwall/gjson"
88

9-
log "github.com/sirupsen/logrus"
109
zero "github.com/wdvxdr1123/ZeroBot"
1110
"github.com/wdvxdr1123/ZeroBot/message"
1211
"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -31,9 +30,9 @@ func init() {
3130
ctx.SendChain(message.Text("少女祈祷中......"))
3231
data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
3332
if err != nil {
34-
log.Println("err为:", err)
33+
ctx.SendChain(message.Text("ERROR:", err))
34+
return
3535
}
36-
3736
text := gjson.Get(helper.BytesToString(data), "data.Title").String()
3837
m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
3938
ds := ""

‎plugin/jandan/jandan.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func init() {
6969
}
7070
LOOP:
7171
for i := 0; i < pageTotal; i++ {
72-
logrus.Infoln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
72+
logrus.Debugln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
7373
doc, err = htmlquery.LoadURL(webpageURL)
7474
if err != nil {
7575
ctx.SendChain(message.Text("ERROR:", err))

‎plugin/juejuezi/juejuezi.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
control "github.com/FloatTech/zbputils/control"
1111
"github.com/FloatTech/zbputils/ctxext"
12-
log "github.com/sirupsen/logrus"
1312
"github.com/tidwall/gjson"
1413
zero "github.com/wdvxdr1123/ZeroBot"
1514
"github.com/wdvxdr1123/ZeroBot/message"
@@ -35,14 +34,16 @@ func init() {
3534
case 2:
3635
data, err := juejuezi(string(toDealStr[0]), string(toDealStr[1]))
3736
if err != nil {
38-
ctx.SendChain(message.Text(err))
37+
ctx.SendChain(message.Text("ERROR:", err))
38+
return
3939
}
4040
ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
4141
default:
4242
params := ctx.GetWordSlices(string(toDealStr)).Get("slices").Array()
4343
data, err := juejuezi(params[0].String(), params[1].String())
4444
if err != nil {
45-
ctx.SendChain(message.Text(err))
45+
ctx.SendChain(message.Text("ERROR:", err))
46+
return
4647
}
4748
ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
4849
}
@@ -55,13 +56,13 @@ func juejuezi(verb, noun string) (data []byte, err error) {
5556
// 提交请求
5657
request, err := http.NewRequest("POST", juejueziURL, strings.NewReader(juejueziStr))
5758
if err != nil {
58-
log.Errorln("[juejuezi]:", err)
59+
return nil, err
5960
}
6061
request.Header.Add("Referer", referer)
6162
request.Header.Add("User-Agent", ua)
6263
response, err := client.Do(request)
6364
if err != nil {
64-
log.Errorln("[juejuezi]:", err)
65+
return nil, err
6566
}
6667
data, err = io.ReadAll(response.Body)
6768
response.Body.Close()

0 commit comments

Comments
 (0)