fix organize trigger task flow

internal/handler/organizer.go

@@ -21,7 +21,7 @@ type organizeReq struct {
 	TransferMode  string `json:"transfer_mode"`
 	MediaType     string `json:"media_type"`
 	MediaCategory string `json:"media_category"`
-	ScanAfter     bool   `json:"scan_after"`
+	ScanAfter     *bool  `json:"scan_after"`
 	ScrapeAfter   *bool  `json:"scrape_after"`
 	LibraryID     string `json:"library_id"`
 	DryRun        bool   `json:"dry_run"`
@@ -66,7 +66,7 @@ func organizeMediaHandler(svc *service.Container) gin.HandlerFunc {
 			return
 		}
 		payload := gin.H{"path": dst}
-		if req.ScanAfter && !req.DryRun && svc.Scan != nil {
+		if organizeScanAfter(req.ScanAfter) && !req.DryRun && svc.Scan != nil {
 			updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", nil)
 			scans, scrapes := scanAndScrapeAfterOrganize(c, svc, dst, strings.TrimSpace(req.LibraryID), req.ScrapeAfter)
 			payload["scans"] = scans
@@ -89,7 +89,7 @@ func organizeLibraryHandler(svc *service.Container) gin.HandlerFunc {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
-		if req.ScanAfter && !req.DryRun && svc.Scan != nil {
+		if organizeScanAfter(req.ScanAfter) && !req.DryRun && svc.Scan != nil {
 			updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", nil)
 			res.Scans, res.Scrapes = scanAndScrapeAfterOrganize(c, svc, res.DestPath, c.Param("id"), req.ScrapeAfter)
 		}
@@ -121,7 +121,7 @@ func organizeDirectoryHandler(svc *service.Container) gin.HandlerFunc {
 			return
 		}
 		updateHTTPTask(task, "organize", "手动整理完成，准备扫描入库", service.OrganizeTaskMetrics(res))
-		if req.ScanAfter && !req.DryRun && svc.Scan != nil {
+		if organizeScanAfter(req.ScanAfter) && !req.DryRun && svc.Scan != nil {
 			updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", service.OrganizeTaskMetrics(res))
 			res.Scans, res.Scrapes = scanAndScrapeAfterOrganize(c, svc, res.DestPath, strings.TrimSpace(req.LibraryID), req.ScrapeAfter)
 		}
@@ -167,3 +167,7 @@ func scanAndScrapeAfterOrganize(c *gin.Context, svc *service.Container, destRoot
 	}
 	return svc.Scan.ScanAndScrapeLibrariesForPath(c.Request.Context(), destRoot, preferredLibraryID, scrapeAfter)
 }
+
+func organizeScanAfter(value *bool) bool {
+	return value == nil || *value
+}

internal/handler/scheduler.go

@@ -2,6 +2,7 @@
 package handler
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -18,10 +19,24 @@ func schedulerStatusHandler(svc *service.Container) gin.HandlerFunc {
 func schedulerRunHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		name := c.Param("name")
-		if err := svc.Scheduler.RunNow(c.Request.Context(), name); err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		if !triggerSchedulerJob(c, svc, name) {
 			return
 		}
-		c.Status(http.StatusNoContent)
+		c.JSON(http.StatusAccepted, gin.H{"ok": true, "message": "任务已在后台触发"})
 	}
 }
+
+func triggerSchedulerJob(c *gin.Context, svc *service.Container, name string) bool {
+	if err := svc.Scheduler.RunNowAsync(c.Request.Context(), name); err != nil {
+		switch {
+		case errors.Is(err, service.ErrSchedulerJobAlreadyRunning):
+			c.JSON(http.StatusConflict, gin.H{"error": "任务正在运行，请稍后到实时任务查看进度"})
+		case errors.Is(err, service.ErrSchedulerJobNotFound):
+			c.JSON(http.StatusNotFound, gin.H{"error": "任务不存在"})
+		default:
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		}
+		return false
+	}
+	return true
+}

internal/handler/scheduler_handler.go

@@ -2,8 +2,6 @@
 package handler
 
 import (
-	"net/http"
-
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 
@@ -30,14 +28,11 @@ func (h *SchedulerHandler) ListTasks(c *gin.Context) {
 // RunTask 手动触发指定任务。
 func (h *SchedulerHandler) RunTask(c *gin.Context) {
 	name := c.Param("id")
-	ctx := c.Request.Context()
-
-	if err := h.svc.Scheduler.RunNow(ctx, name); err != nil {
-		Error(c, http.StatusInternalServerError, ErrInternal, "任务执行失败: "+err.Error())
+	if !triggerSchedulerJob(c, h.svc, name) {
 		return
 	}
 
-	SuccessWithMessage(c, "任务已触发执行", nil)
+	SuccessWithMessage(c, "任务已触发后台执行", nil)
 }
 
 // GetStatus 返回调度器运行状态。

internal/handler/system_extra.go

@@ -159,11 +159,10 @@ func schemaHandler(_ *service.Container) gin.HandlerFunc {
 // schedulerTriggerHandler is the alternate path for /admin/scheduler/:name/run.
 func schedulerTriggerHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		if err := svc.Scheduler.RunNow(c.Request.Context(), c.Param("name")); err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		if !triggerSchedulerJob(c, svc, c.Param("name")) {
 			return
 		}
-		c.JSON(http.StatusOK, gin.H{"ok": true})
+		c.JSON(http.StatusAccepted, gin.H{"ok": true, "message": "任务已在后台触发"})
 	}
 }