From 8ebd78852b604c733ec8ed8e08b2d8e39c999f99 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Sun, 7 Jan 2024 01:09:50 +0800
Subject: [PATCH] =?utf8?q?Improve=20=E7=BB=93=E6=9D=9F=E6=97=B6=E6=89=8D?=
 =?utf8?q?=E4=BF=9D=E5=AD=98=E5=BD=95=E6=92=AD=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Reply/stream.go | 55 +++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/Reply/stream.go b/Reply/stream.go
index bad33f9..9670504 100644
--- a/Reply/stream.go
+++ b/Reply/stream.go
@@ -1265,48 +1265,49 @@ func (t *M4SStream) Start() bool {
 					})
 					defer cancelMsg()
 
+					ms.getSavepath()
+
+					var (
+						cp = ms.Current_save_path
+						st = ms.stream_type
+						cr = ms.common.Roomid
+					)
+
 					l := ms.log.Base_add(`文件保存`)
 					startf := func(_ *M4SStream) error {
 						l.L(`T: `, `开始`)
 						return nil
 					}
 					stopf := func(_ *M4SStream) error {
+						// savestate
+						{
+							fj := file.New(cp+"0.json", 0, true)
+							var pathInfo paf
+							pathInfo.Uname = ms.common.Uname
+							pathInfo.UpUid = ms.common.UpUid
+							pathInfo.Roomid = ms.common.Roomid
+							pathInfo.Format = st
+							pathInfo.Qn = c.C.Qn[ms.common.Live_qn]
+							pathInfo.Name = ms.common.Title
+							pathInfo.StartT = time.Now().Format(time.DateTime)
+							pathInfo.StartLiveT = ms.common.Live_Start_Time.Format(time.DateTime)
+							pathInfo.Path = path.Base(cp)
+							if pathInfoJson, err := json.Marshal(pathInfo); err != nil {
+								l.L(`E: `, err)
+							} else if _, err := fj.Write(pathInfoJson, true); err != nil {
+								l.L(`E: `, err)
+							}
+							fj.Close()
+						}
 						l.L(`T: `, `结束`)
 						return nil
 					}
-					ms.getSavepath()
 
 					// 移除历史流
 					if err := ms.removeStream(); err != nil {
 						l.L(`W: `, err)
 					}
 
-					var (
-						cp = ms.Current_save_path
-						st = ms.stream_type
-						cr = ms.common.Roomid
-					)
-
-					// savestate
-					{
-						fj := file.New(cp+"0.json", 0, true)
-						var pathInfo paf
-						pathInfo.Uname = ms.common.Uname
-						pathInfo.UpUid = ms.common.UpUid
-						pathInfo.Roomid = ms.common.Roomid
-						pathInfo.Format = st
-						pathInfo.Qn = c.C.Qn[ms.common.Live_qn]
-						pathInfo.Name = ms.common.Title
-						pathInfo.StartT = time.Now().Format(time.DateTime)
-						pathInfo.StartLiveT = ms.common.Live_Start_Time.Format(time.DateTime)
-						pathInfo.Path = path.Base(cp)
-						if pathInfoJson, err := json.Marshal(pathInfo); err != nil {
-							l.L(`E: `, err)
-						} else if _, err := fj.Write(pathInfoJson, true); err != nil {
-							l.L(`E: `, err)
-						}
-						fj.Close()
-					}
 					go StartRecDanmu(contextC, cp)             //保存弹幕
 					go Ass_f(contextC, cp, cp+"0", time.Now()) //开始ass
 					startT := time.Now()
-- 
2.39.2