From 9c8484f048fa2eb2c662f35f8cb76bd1e4d0504d Mon Sep 17 00:00:00 2001 From: qydysky Date: Mon, 14 Aug 2023 15:59:43 +0800 Subject: [PATCH] Fix #85 --- F/CookieCrypo.go | 1 - F/api.go | 1 - Reply/F.go | 3 ++- Reply/F/comp.go | 19 +++++++++++++++++-- Reply/F/danmuXml/danmuXml.go | 6 ++++-- Reply/F/liveOver/liveOver.go | 5 ++++- Reply/Reply.go | 3 ++- bili_danmu.go | 4 +--- go.mod | 2 +- go.sum | 4 ++-- 10 files changed, 33 insertions(+), 15 deletions(-) diff --git a/F/CookieCrypo.go b/F/CookieCrypo.go index c6a8fca..9477bc3 100644 --- a/F/CookieCrypo.go +++ b/F/CookieCrypo.go @@ -26,7 +26,6 @@ func CookieGet() []byte { pri = d } } else if pubS, ok := c.C.K_v.LoadV(`cookie加密公钥`).(string); ok && pubS != `` { - c.C.Log.Block(1000) //等待所有日志输出完毕 priS := `` fmt.Printf("cookie密钥路径: ") _, err := fmt.Scanln(&priS) diff --git a/F/api.go b/F/api.go index 1bd69a9..fd7898c 100644 --- a/F/api.go +++ b/F/api.go @@ -1380,7 +1380,6 @@ func (t *GetFunc) Get_cookie() (missKey []string) { apilog.L(`W: `, `或打开链接扫码登录：`+t.Stream_url.String()+scanPath) } - apilog.Block(1000) //show qr code in cmd qrterminal.GenerateWithConfig(img_url, qrterminal.Config{ Level: qrterminal.L, diff --git a/Reply/F.go b/Reply/F.go index 57145b7..37a7faa 100644 --- a/Reply/F.go +++ b/Reply/F.go @@ -1618,7 +1618,8 @@ func StartRecDanmu(c context.Context, filePath string) { f.L(`I: `, `结束`) // 弹幕录制结束 - if e := comp.Run[string](`bili_danmu.Reply.StartRecDanmu.Stop`, context.Background(), &filePath); e != nil { + type empty struct{} + if e := comp.Run[string](comp.Sign[empty](`startRecDanmu`, `stop`), context.Background(), &filePath); e != nil { f.L(`E: `, e) } diff --git a/Reply/F/comp.go b/Reply/F/comp.go index 3933bfd..0328a3a 100644 --- a/Reply/F/comp.go +++ b/Reply/F/comp.go @@ -1,6 +1,21 @@ package f import ( - _ "github.com/qydysky/bili_danmu/Reply/F/danmuXml" - _ "github.com/qydysky/bili_danmu/Reply/F/liveOver" + "github.com/qydysky/bili_danmu/Reply/F/danmuXml" + "github.com/qydysky/bili_danmu/Reply/F/liveOver" + comp "github.com/qydysky/part/component" ) + +func init() { + var linkMap = map[string][]string{ + "github.com/qydysky/Reply.startRecDanmu.stop": { + comp.Sign[danmuXml.Sign](), + }, + "github.com/qydysky/Reply.preparing": { + comp.Sign[liveOver.Sign](), + }, + } + if e := comp.Link(linkMap); e != nil { + panic(e) + } +} diff --git a/Reply/F/danmuXml/danmuXml.go b/Reply/F/danmuXml/danmuXml.go index 4981fad..a8ba0e4 100644 --- a/Reply/F/danmuXml/danmuXml.go +++ b/Reply/F/danmuXml/danmuXml.go @@ -1,4 +1,4 @@ -package danmuxml +package danmuXml import ( "bytes" @@ -13,8 +13,10 @@ import ( file "github.com/qydysky/part/file" ) +type Sign struct{} + func init() { - if e := comp.Put[string](`bili_danmu.Reply.StartRecDanmu.Stop.danmuxml.toXml`, toXml); e != nil { + if e := comp.Put[string](comp.Sign[Sign](), toXml); e != nil { panic(e) } } diff --git a/Reply/F/liveOver/liveOver.go b/Reply/F/liveOver/liveOver.go index 4b4ead2..a174c4c 100644 --- a/Reply/F/liveOver/liveOver.go +++ b/Reply/F/liveOver/liveOver.go @@ -9,8 +9,11 @@ import ( comp "github.com/qydysky/part/component" ) +type Sign struct{} + func init() { - if e := comp.Put[c.Common](`bili_danmu.Reply.wsmsg.preparing.liveOver.sumup`, sumup); e != nil { + type empty struct{} + if e := comp.Put[c.Common](comp.Sign[Sign](), sumup); e != nil { panic(e) } } diff --git a/Reply/Reply.go b/Reply/Reply.go index 9559cd4..ee3005f 100644 --- a/Reply/Reply.go +++ b/Reply/Reply.go @@ -771,7 +771,8 @@ func (replyF) preparing(s string) { var roomId, _ = strconv.Atoi(type_item.Roomid) StreamOStop(roomId) // 下播总结 - if e := comp.Run(`bili_danmu.Reply.wsmsg.preparing`, context.Background(), c.C); e != nil { + type empty struct{} + if e := comp.Run(comp.Sign[empty](`preparing`), context.Background(), c.C); e != nil { msglog.L(`E: `, e) } } diff --git a/bili_danmu.go b/bili_danmu.go index 5ec185d..073d650 100644 --- a/bili_danmu.go +++ b/bili_danmu.go @@ -28,9 +28,7 @@ import ( var version string func Start() { - var danmulog = c.C.Log.Base(`bilidanmu`) - defer danmulog.Block(1000) - + danmulog := c.C.Log.Base(`bilidanmu`) danmulog.L(`I: `, `当前PID:`, c.C.PID) danmulog.L(`I: `, "version: ", strings.TrimSpace(version)) diff --git a/go.mod b/go.mod index b574e7d..5a38f5a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/gotk3/gotk3 v0.6.2 github.com/mdp/qrterminal/v3 v3.1.1 - github.com/qydysky/part v0.28.1-0.20230810122650-0b8c64124a46 + github.com/qydysky/part v0.28.1-0.20230814074040-f9bfda2de89e github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 golang.org/x/text v0.12.0 diff --git a/go.sum b/go.sum index d390234..09246f3 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/qydysky/part v0.28.1-0.20230810122650-0b8c64124a46 h1:xxjY/mFDL+0rkzj5MG/pfRUa4oHSjxgHaHmgArQEHUw= -github.com/qydysky/part v0.28.1-0.20230810122650-0b8c64124a46/go.mod h1:iOK6EzUOqdqTyQZm+pf1qxYpKvLmdK+YHZehNN/2J3U= +github.com/qydysky/part v0.28.1-0.20230814074040-f9bfda2de89e h1:6/63PfGwQgzF+jDBVBUiiejRuORWqVsdc/HvN08FE0M= +github.com/qydysky/part v0.28.1-0.20230814074040-f9bfda2de89e/go.mod h1:iOK6EzUOqdqTyQZm+pf1qxYpKvLmdK+YHZehNN/2J3U= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= -- 2.39.2