From 99eb6c2aed1d50abf72f0eec8c708fd0d76370a3 Mon Sep 17 00:00:00 2001
From: wuko233 <wuko233@gmail.com>
Date: Fri, 3 Apr 2026 08:42:05 +0800
Subject: [PATCH] =?UTF-8?q?[monitor]=20=E8=A7=84=E8=8C=83watcher=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/start/start.go                  |  2 +-
 internal/monitor/watcher/watcher.go | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmd/start/start.go b/cmd/start/start.go
index 3c4aeff..75c2a85 100644
--- a/cmd/start/start.go
+++ b/cmd/start/start.go
@@ -87,7 +87,7 @@ var StartCmd = &cobra.Command{
 		// ====== 启动文件监听 ======
 		logger.Log.Info("正在启动文件监听...")
 
-		mon, err := watcher.NewWatcher(cfg.Scanner.File.IncludePaths, cfg.Scanner.File.ExcludePaths)
+		mon, err := watcher.NewWatcher(cfg)
 		if err != nil {
 			logger.Log.Error("启动文件监听失败", zap.Error(err))
 			os.Exit(1)
diff --git a/internal/monitor/watcher/watcher.go b/internal/monitor/watcher/watcher.go
index 4cd034a..02e8fde 100644
--- a/internal/monitor/watcher/watcher.go
+++ b/internal/monitor/watcher/watcher.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sysmonitord/internal/config"
 	"sysmonitord/pkg/logger"
 
 	"github.com/fsnotify/fsnotify"
@@ -13,8 +14,7 @@ import (
 
 type Watcher struct {
 	fsnWatcher *fsnotify.Watcher
-	paths      []string
-	ignore     []string
+	cfg        *config.Config
 	eventChan  chan EventMsg
 }
 
@@ -24,7 +24,7 @@ type EventMsg struct {
 	FileInfo os.FileInfo
 }
 
-func NewWatcher(paths []string, ignore []string) (*Watcher, error) {
+func NewWatcher(cfg *config.Config) (*Watcher, error) {
 	fsnW, err := fsnotify.NewWatcher()
 	if err != nil {
 		return nil, fmt.Errorf("[monitor] 创建文件监听失败: %w", err)
@@ -32,14 +32,15 @@ func NewWatcher(paths []string, ignore []string) (*Watcher, error) {
 
 	return &Watcher{
 		fsnWatcher: fsnW,
-		paths:      paths,
-		ignore:     ignore,
+		cfg:        cfg,
 		eventChan:  make(chan EventMsg, 100),
 	}, nil
 }
 
 func (w *Watcher) Start() {
-	for _, path := range w.paths {
+	paths := w.cfg.Scanner.File.IncludePaths
+
+	for _, path := range paths {
 		if _, err := os.Stat(path); os.IsNotExist(err) {
 			fmt.Printf("[monitor] 路径不存在: %s\n", path)
 			continue
@@ -48,7 +49,7 @@ func (w *Watcher) Start() {
 		w.addPath(path)
 	}
 
-	logger.Log.Info("[monitor] 已启用文件监听", zap.Strings("paths", w.paths))
+	logger.Log.Info("[monitor] 已启用文件监听", zap.Strings("paths", paths))
 
 	go w.eventLoop()
 }
@@ -113,7 +114,7 @@ func (w *Watcher) addPath(path string) {
 		}
 
 		if d.IsDir() {
-			for _, ignorePath := range w.ignore {
+			for _, ignorePath := range w.cfg.Scanner.File.ExcludePaths {
 				if strings.HasPrefix(subPath, ignorePath) {
 					return filepath.SkipDir
 				}