From 770cd32bf46fa065f8314c21d4522111cf9153e6 Mon Sep 17 00:00:00 2001 From: qydysky Date: Sun, 17 Nov 2024 14:26:01 +0800 Subject: [PATCH] =?utf8?q?Improve=20=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BD?= =?utf8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Reply/F.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Reply/F.go b/Reply/F.go index 75ab97c..363cf21 100644 --- a/Reply/F.go +++ b/Reply/F.go @@ -1295,9 +1295,7 @@ func init() { c.ResStruct{Code: -1, Message: e.Error(), Data: nil}.Write(w) return } else { - skip, _ := strconv.Atoi(r.URL.Query().Get("skip")) - size, _ := strconv.Atoi(r.URL.Query().Get("size")) - for i, n := skip, len(fs); i < n && (size == 0 || len(filePaths) < size); i++ { + for i, n := 0, len(fs); i < n; i++ { if filePath, e := videoInfo.Get.Run(context.Background(), fs[i]); e != nil { flog.L(`W: `, fs[i], e) continue @@ -1318,6 +1316,14 @@ func init() { sort.Slice(filePaths, func(i, j int) bool { return filePaths[i].StartT > filePaths[j].StartT }) + skip, _ := strconv.Atoi(r.URL.Query().Get("skip")) + size, _ := strconv.Atoi(r.URL.Query().Get("size")) + if skip <= len(filePaths) { + filePaths = filePaths[skip:] + } + if size < len(filePaths) { + filePaths = filePaths[:size] + } } else if len(filePaths) == 0 { c.ResStruct{Code: -1, Message: "直播流保存位置无效", Data: nil}.Write(w) flog.L(`W: `, `直播流保存位置无效`) -- 2.39.2