From: qydysky <qydysky@foxmail.com>
Date: Tue, 16 May 2023 17:55:39 +0000 (+0800)
Subject: Fix ws退出错误
X-Git-Tag: v0.9.3~2
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=071533ab9deda5278c1fa1089ad0822d06d12a60;p=bili_danmu%2F.git

Fix ws退出错误
---

diff --git a/F/api.go b/F/api.go
index e79be8a..8171966 100644
--- a/F/api.go
+++ b/F/api.go
@@ -139,10 +139,6 @@ func (c *GetFunc) Get(key string) {
 			`LIVE_BUVID`: { //LIVE_BUVID
 				c.Get_LIVE_BUVID,
 			},
-
-			`Silver_2_coin`: { //银瓜子2硬币
-				c.Silver_2_coin,
-			},
 			`CheckSwitch_FansMedal`: { //切换粉丝牌
 				c.CheckSwitch_FansMedal,
 			},
@@ -209,9 +205,6 @@ func (c *GetFunc) Get(key string) {
 			`LIVE_BUVID`: func() bool { //LIVE_BUVID
 				return c.LiveBuvidUpdated.After(time.Now().Add(-time.Hour))
 			},
-			`Silver_2_coin`: func() bool { //银瓜子2硬币
-				return true
-			},
 			`CheckSwitch_FansMedal`: func() bool { //切换粉丝牌
 				return true
 			},
diff --git a/bili_danmu.go b/bili_danmu.go
index 2a10e87..c903300 100644
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -48,18 +48,11 @@ func Start() {
 		var interrupt = make(chan os.Signal, 2)
 		//捕获ctrl+c退出
 		signal.Notify(interrupt, os.Interrupt)
-		danmulog.L(`T: `, "3s内两次ctrl+c强制退出")
-		for {
-			<-interrupt
-			c.C.Danmu_Main_mq.PushLock_tag(`interrupt`, nil)
-			select {
-			case <-interrupt:
-				c.C.Danmu_Main_mq.PushLock_tag(`interrupt`, nil)
-				danmulog.L(`I: `, "强制退出!").Block(1000)
-				os.Exit(1)
-			case <-time.After(time.Second * 3):
-			}
-		}
+		danmulog.L(`I: `, "ctrl+c退出")
+		<-interrupt
+		c.C.Danmu_Main_mq.PushLock_tag(`interrupt`, nil)
+		danmulog.L(`I: `, "退出!").Block(1000)
+		os.Exit(1)
 	}()
 
 	// 启动时显示ip
@@ -81,7 +74,7 @@ func Start() {
 		//获取uid
 		F.Get(c.C).Get(`Uid`)
 		//兑换硬币
-		F.Get(c.C).Get(`Silver_2_coin`)
+		F.Get(c.C).Silver_2_coin()
 		//每日签到
 		F.Dosign()
 		// 附加功能 savetojson
@@ -135,14 +128,13 @@ func Start() {
 		})
 
 		for exit_sign := true; exit_sign; {
-			if len(change_room_chan) == 0 {
+			if c.C.Roomid == 0 {
 				fmt.Println("回车查看指令")
-			}
-
-			select {
-			case <-change_room_chan:
-			case <-interrupt_chan:
-				exit_sign = false
+				select {
+				case <-change_room_chan:
+				case <-interrupt_chan:
+					exit_sign = false
+				}
 			}
 
 			if !exit_sign {
diff --git a/go.mod b/go.mod
index 5cdf485..905994e 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/gotk3/gotk3 v0.6.2
 	github.com/mdp/qrterminal/v3 v3.0.0
-	github.com/qydysky/part v0.27.1
+	github.com/qydysky/part v0.27.3
 	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.9.0
diff --git a/go.sum b/go.sum
index 3b38bb3..f9b2e09 100644
--- a/go.sum
+++ b/go.sum
@@ -31,8 +31,8 @@ github.com/mdp/qrterminal/v3 v3.0.0/go.mod h1:NJpfAs7OAm77Dy8EkWrtE4aq+cE6McoLXl
 github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI=
 github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/qydysky/part v0.27.1 h1:syJqzbITS3TGmNMgqHPwR8eoJIK8REa8wbQubbUbldg=
-github.com/qydysky/part v0.27.1/go.mod h1:IEMpGB0NBl6MklZmoenSpS5ChhaIL79JYFo6mF1UkAU=
+github.com/qydysky/part v0.27.3 h1:mTh5o+wiwX47/e0aGQCU3Qr0QPNkZEN1yMgcD23fQXs=
+github.com/qydysky/part v0.27.3/go.mod h1:IEMpGB0NBl6MklZmoenSpS5ChhaIL79JYFo6mF1UkAU=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=