feat: 扫描整理并行化、WebSocket 实时进度与统计看板
- 移动阶段并行处理文件,按原子计数上报累计进度 - 扫描遍历阶段实时上报已发现文件数,界面不再卡在 0/0 - 新增 /api/scan/ws WebSocket 实时推送扫描状态;前端断线指数退避自动重连,并以低频轮询兜底 - 新增统计看板与媒体库筛选/排序,目录选择器路径不存在时回退到最近可用父目录 - 存放目录支持自定义并持久化,默认输出到 KMP已整理
This commit is contained in:
@@ -52,10 +52,23 @@ func (c *FsController) List(ctx *gin.Context) {
|
||||
Error(ctx, http.StatusBadRequest, "路径解析失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
st, err := os.Stat(abs)
|
||||
if err != nil || !st.IsDir() {
|
||||
Error(ctx, http.StatusBadRequest, "目录不存在或不可访问: "+abs)
|
||||
return
|
||||
// 目录不存在/不可访问时向上回退到最近的已存在父目录,避免阻塞目录选择器
|
||||
for {
|
||||
st, statErr := os.Stat(abs)
|
||||
if statErr == nil && st.IsDir() {
|
||||
break
|
||||
}
|
||||
parent := filepath.Dir(abs)
|
||||
if parent == abs {
|
||||
// 已到根仍不存在:回退到盘符层
|
||||
if runtime.GOOS == "windows" {
|
||||
Success(ctx, FsListResult{Drives: listLogicalDrives()})
|
||||
return
|
||||
}
|
||||
abs = string(os.PathSeparator)
|
||||
break
|
||||
}
|
||||
abs = parent
|
||||
}
|
||||
|
||||
entries, err := os.ReadDir(abs)
|
||||
|
||||
@@ -28,6 +28,7 @@ func NewRouter(st *store.Store) *gin.Engine {
|
||||
sc := NewScanController(service.NewScanService(st))
|
||||
apiGroup.POST("/scan/start", sc.Start)
|
||||
apiGroup.GET("/scan/status", sc.Status)
|
||||
apiGroup.GET("/scan/ws", sc.Ws)
|
||||
|
||||
fc := NewFsController()
|
||||
apiGroup.GET("/fs/list", fc.List)
|
||||
|
||||
@@ -18,9 +18,10 @@ func NewScanController(svc *service.ScanService) *ScanController {
|
||||
return &ScanController{service: svc}
|
||||
}
|
||||
|
||||
// scanStartReq 扫描启动请求;dir 为空时使用服务当前运行目录
|
||||
// scanStartReq 扫描启动请求;dir 为空时使用服务当前运行目录,destDir 为空时默认输出到扫描目录下的「KMP已整理」
|
||||
type scanStartReq struct {
|
||||
Dir string `json:"dir"`
|
||||
Dir string `json:"dir"`
|
||||
DestDir string `json:"destDir"`
|
||||
}
|
||||
|
||||
// Start POST /api/scan/start 触发一次扫描整理
|
||||
@@ -30,7 +31,7 @@ func (c *ScanController) Start(ctx *gin.Context) {
|
||||
Error(ctx, http.StatusBadRequest, "请求参数错误:"+err.Error())
|
||||
return
|
||||
}
|
||||
if err := c.service.Start(req.Dir); err != nil {
|
||||
if err := c.service.Start(req.Dir, req.DestDir); err != nil {
|
||||
Error(ctx, http.StatusBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
// 扫描状态 WebSocket 实时推送端点。
|
||||
package api
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gorilla/websocket"
|
||||
)
|
||||
|
||||
// wsUpgrader WebSocket 升级器
|
||||
var wsUpgrader = websocket.Upgrader{
|
||||
ReadBufferSize: 1024,
|
||||
WriteBufferSize: 4096,
|
||||
// 同源管理页,允许任意来源,便于局域网访问
|
||||
CheckOrigin: func(r *http.Request) bool { return true },
|
||||
}
|
||||
|
||||
const (
|
||||
wsWriteWait = 10 * time.Second
|
||||
wsPongWait = 60 * time.Second
|
||||
wsPingPeriod = (wsPongWait * 9) / 10
|
||||
)
|
||||
|
||||
// Ws GET /api/scan/ws 建立 WebSocket 连接,持续推送扫描状态。
|
||||
// 连接建立后立即推送当前状态快照;断开后前端可自动重连(服务端不做重连保证)。
|
||||
func (c *ScanController) Ws(ctx *gin.Context) {
|
||||
conn, err := wsUpgrader.Upgrade(ctx.Writer, ctx.Request, nil)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
ch, cancel := c.service.Subscribe()
|
||||
defer func() {
|
||||
cancel()
|
||||
conn.Close()
|
||||
}()
|
||||
|
||||
// 读协程:仅用于感知客户端断开/失活(配合 pong 心跳),不处理业务消息
|
||||
conn.SetReadLimit(1024)
|
||||
_ = conn.SetReadDeadline(time.Now().Add(wsPongWait))
|
||||
conn.SetPongHandler(func(string) error {
|
||||
return conn.SetReadDeadline(time.Now().Add(wsPongWait))
|
||||
})
|
||||
|
||||
// 写协程:先推送快照,再转发订阅更新,并周期性 ping 保活
|
||||
writeDone := make(chan struct{})
|
||||
go func() {
|
||||
defer close(writeDone)
|
||||
write := func(msgType int, data []byte) bool {
|
||||
if err := conn.WriteMessage(msgType, data); err != nil {
|
||||
conn.Close() // 写失败即断开,让读协程退出
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
if b, err := json.Marshal(c.service.Status()); err == nil {
|
||||
if !write(websocket.TextMessage, b) {
|
||||
return
|
||||
}
|
||||
}
|
||||
ticker := time.NewTicker(wsPingPeriod)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case st, ok := <-ch:
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
b, err := json.Marshal(st)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
if !write(websocket.TextMessage, b) {
|
||||
return
|
||||
}
|
||||
case <-ticker.C:
|
||||
if !write(websocket.PingMessage, nil) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
for {
|
||||
if _, _, err := conn.ReadMessage(); err != nil {
|
||||
break
|
||||
}
|
||||
}
|
||||
cancel() // 先关闭订阅频道,让写协程退出,避免 <-writeDone 永久阻塞
|
||||
<-writeDone
|
||||
}
|
||||
Reference in New Issue
Block a user