From 0fc8544075d3dabf82a32c6a197926101f326b54 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Tue, 22 Sep 2020 22:32:44 +0800
Subject: [PATCH] 20

---
 Reply/F.go       | 9 ++++++---
 bili_danmu.go    | 1 -
 demo/Autoban.txt | 8 +++++---
 demo/go.mod      | 6 +++---
 demo/go.sum      | 6 ++++++
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Reply/F.go b/Reply/F.go
index a8a8c0d..11d8d4c 100644
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -115,7 +115,7 @@ func Saveflvf(){
 			return
 		} else {
 			if saveflv.path != "" {return}
-			saveflv.path = strconv.Itoa(Msg_roomid) + "_" + p.Sys().GetTime()
+			saveflv.path = strconv.Itoa(Msg_roomid) + "_" + time.Now().Format(time.RFC3339)
 			l.I("直播流保存到", saveflv.path)
 
 			saveflv.wait = make(chan bool,1)
@@ -124,14 +124,17 @@ func Saveflvf(){
 			rr := p.Req()
 			go func(){
 				<- saveflv.cancel
-				close(rr.Cancel)
+				rr.Close()
 			}()
 			if e := rr.Reqf(p.Rval{
 				Url:url.(string),
+				Retry:10,
+				SleepTime:5,
 				SaveToPath:saveflv.path + ".flv",
 				Timeout:-1,
 			}); e != nil{l.E(e)}
 			Saveflv_transcode()
+			l.I("结束")
 			close(saveflv.wait)
 		} 
 	}
@@ -284,7 +287,7 @@ func Autobanf(s string) bool {
 	res = append(res, pt)
 
 	pt = cross(s, autoban.buf);
-	if pt < 0.7 {return false}//历史重复低去除
+	if pt > 0.7 {return false}//历史重复高去除
 	res = append(res, pt)
 
 	pt = cross(s, autoban.Banbuf);
diff --git a/bili_danmu.go b/bili_danmu.go
index 0df380d..87de871 100644
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -110,7 +110,6 @@ func Demo() {
 		}
 
 		{//附加功能 直播流转码
-			reply.Saveflv_transcode()
 			reply.Saveflv_wait()
 		}
 		danmulog.I("结束退出")
diff --git a/demo/Autoban.txt b/demo/Autoban.txt
index 8f63069..0e33db2 100644
--- a/demo/Autoban.txt
+++ b/demo/Autoban.txt
@@ -6,7 +6,9 @@
 呦钕
 菜
 垃圾
-媳妇的妹换衣服 点我免费
-﹏来﹏签﹏铭﹏少籹免费
-﹏来﹏签﹏名﹏婕光了啊免费
+媳妇的妹换衣服 点我
+铭少籹
+来签名婕光了啊免费
+自拍洗造点浅
+不穿内騒
 0123456789
\ No newline at end of file
diff --git a/demo/go.mod b/demo/go.mod
index 7cb07e0..5ea70f7 100644
--- a/demo/go.mod
+++ b/demo/go.mod
@@ -5,9 +5,9 @@ go 1.14
 require (
 	github.com/christopher-dG/go-obs-websocket v0.0.0-20200720193653-c4fed10356a5 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
-	github.com/qydysky/bili_danmu v0.0.0-20200922044320-64c89f442142
-	github.com/qydysky/part v0.0.0-20200922062343-5096e51d5989 // indirect
-	golang.org/x/sys v0.0.0-20200918174421-af09f7315aff // indirect
+	github.com/qydysky/bili_danmu v0.0.0-20200922064052-048a26977fed
+	github.com/qydysky/part v0.0.0-20200922141821-acab84cb701a // indirect
+	golang.org/x/sys v0.0.0-20200922070232-aee5d888a860 // indirect
 )
 
 replace github.com/qydysky/bili_danmu => ../
diff --git a/demo/go.sum b/demo/go.sum
index 7597f5e..f20be59 100644
--- a/demo/go.sum
+++ b/demo/go.sum
@@ -50,6 +50,10 @@ github.com/qydysky/part v0.0.0-20200922060746-8db61966366b h1:9Qe6wazp6ImV0jyIEL
 github.com/qydysky/part v0.0.0-20200922060746-8db61966366b/go.mod h1:+8N3UgJBVyJj8ar31eZtucwrKpLpay854Y5qq0xk3x0=
 github.com/qydysky/part v0.0.0-20200922062343-5096e51d5989 h1:W3Sm7L2/7q2VHEc0NFQKLV4mJpwouQCGDxziKiyCU/o=
 github.com/qydysky/part v0.0.0-20200922062343-5096e51d5989/go.mod h1:+8N3UgJBVyJj8ar31eZtucwrKpLpay854Y5qq0xk3x0=
+github.com/qydysky/part v0.0.0-20200922140825-5050288b80d4 h1:IqqEcdsgahVWR1OUY46RatCYYedyTHvHbnEi3M7WV+A=
+github.com/qydysky/part v0.0.0-20200922140825-5050288b80d4/go.mod h1:+8N3UgJBVyJj8ar31eZtucwrKpLpay854Y5qq0xk3x0=
+github.com/qydysky/part v0.0.0-20200922141821-acab84cb701a h1:NHe/LmpmVNWq2cK3jR2qKX/TcXszQ57PEo7eS7kOhv0=
+github.com/qydysky/part v0.0.0-20200922141821-acab84cb701a/go.mod h1:+8N3UgJBVyJj8ar31eZtucwrKpLpay854Y5qq0xk3x0=
 github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v2.20.8+incompatible h1:8c7Atn0FAUZJo+f4wYbN0iVpdWniCQk7IYwGtgdh1mY=
 github.com/shirou/gopsutil v2.20.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
@@ -84,6 +88,8 @@ golang.org/x/sys v0.0.0-20200917061948-648f2a039071 h1:t0H7WMwCt9t0LnLSYz5zdZ/Oi
 golang.org/x/sys v0.0.0-20200917061948-648f2a039071/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff h1:1CPUrky56AcgSpxz/KfgzQWzfG09u5YOL8MvPYBlrL8=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200922070232-aee5d888a860 h1:YEu4SMq7D0cmT7CBbXfcH0NZeuChAXwsHe/9XueUO6o=
+golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-- 
2.39.2