Fix #85

diff --git a/F/CookieCrypo.go b/F/CookieCrypo.go
index c6a8fca86ebe6f1fefef6cda89ab66538d00ba3a..9477bc39585a626f0add18a4b701522e95b2ff70 100644 (file)
--- 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 1bd69a9e47c5aa49e8750c1cf288eb24a5fc9d8d..fd7898ccaeff362eb0bde92d89753e7fff448d9f 100644 (file)
--- 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 57145b7770ae393ed8f239ef62c35de187964616..37a7faa135cb6aa858772f1fe759be1483099998 100644 (file)
--- 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 3933bfd41e2b55571abad69850ac9c4c6a13f8e2..0328a3a7d53b2afe2965bfd7124c84ec1deca6e4 100644 (file)
--- 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 4981fad7ee061ae2e9b2ac6bff5e54b3b1d8732d..a8ba0e47437c82ac3f9d2a47a3cf70b1de0e10e4 100644 (file)
--- 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 4b4ead27fe6031bd5408dc12056bfde24f8afafb..a174c4ceb62a199d77e378cfae5b9d8e6d50cac6 100644 (file)
--- 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 9559cd45f68b10307c48929f5a67069e5bfecdd0..ee3005fdc5f25bebf6a42b4b109d99e5b7187119 100644 (file)
--- 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 5ec185d2b43ccfe6e89a31878c14caefbd870fc6..073d650ba07fd5b67297307132d6c08accaa288d 100644 (file)
--- 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 b574e7d23f9f50b642d66897cbcdbd97c96dd3cf..5a38f5af5ed6d84e2b97df3f38e22e7045c0b2fd 100644 (file)
--- 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 d3902346a772666bdb7b502591d71a0d00c2c5ff..09246f308c6504da6c958e2488310b6cb760eca0 100644 (file)
--- 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=