tcjlj/MeBox
1
0
Fork 0
mirror of https://github.com/truewhile/MeBox.git synced 2026-09-29 03:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix organize path mapping and task flow

Browse Source
This commit is contained in:
ShukeBta
2026-06-13 16:32:06 +08:00
parent 9070b4827c
commit 4e0929bbca
23 changed files with 1468 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/media.go
+34
View File
@@ -97,6 +97,7 @@ func scanLibraryHandler(svc *service.Container) gin.HandlerFunc {
return
}
if _, ok := service.ParseCloudLibraryMount(lib.Path); ok {
task := startScanHTTPTask(svc, "云盘扫描队列", lib.Name, lib.Path)
if svc.WSHub != nil {
svc.WSHub.Publish("scan", gin.H{
"library_id": id,
@@ -108,6 +109,7 @@ func scanLibraryHandler(svc *service.Container) gin.HandlerFunc {
})
}
_, _, _ = svc.Scan.StartCloudLibraryScan(id, false)
finishHTTPTask(task, nil, "queued", "云盘扫描已加入后台队列", map[string]int64{"queued": 1})
c.JSON(http.StatusAccepted, gin.H{
"library_id": id,
"visited": 0,
@@ -121,15 +123,47 @@ func scanLibraryHandler(svc *service.Container) gin.HandlerFunc {
})
return
}
task := startScanHTTPTask(svc, "手动扫描入库", lib.Name, lib.Path)
res, err := svc.Scan.ScanLibrary(c.Request.Context(), id)
if err != nil {
finishHTTPTask(task, err, "scan", "手动扫描入库失败", nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
finishHTTPTask(task, nil, "completed", "手动扫描入库结束", scanTaskMetrics(res))
c.JSON(http.StatusOK, res)
}
}
func startScanHTTPTask(svc *service.Container, name, libraryName, path string) *service.TaskHandle {
if svc == nil || svc.Tasks == nil {
return nil
}
if libraryName != "" {
name += "：" + libraryName
}
return svc.Tasks.Start(service.TaskKindScan, name, service.TaskUpdate{
Stage: "scan",
SourcePath: path,
Message: "正在扫描并入库",
})
}
func scanTaskMetrics(res *service.ScanResult) map[string]int64 {
if res == nil {
return nil
}
return map[string]int64{
"visited": int64(res.Visited),
"added": int64(res.Added),
"updated": int64(res.Updated),
"skipped": int64(res.Skipped),
"probed": int64(res.Probed),
"local_metadata": int64(res.LocalMetadata),
"removed": res.Removed,
}
}
func listMediaHandler(svc *service.Container) gin.HandlerFunc {
return func(c *gin.Context) {
id := c.Param("id")
internal/handler/organizer.go
+58 -13
View File
@@ -15,15 +15,16 @@ import (
// source_path = 源目录（待整理），dest_path = 目的地目录（整理输出）。
// target_path 为 dest_path 的向后兼容别名。
type organizeReq struct {
SourcePath string `json:"source_path"`
DestPath string `json:"dest_path"`
TargetPath string `json:"target_path"` // deprecated alias for dest_path
TransferMode string `json:"transfer_mode"`
MediaType string `json:"media_type"`
ScanAfter bool `json:"scan_after"`
ScrapeAfter *bool `json:"scrape_after"`
LibraryID string `json:"library_id"`
DryRun bool `json:"dry_run"`
SourcePath string `json:"source_path"`
DestPath string `json:"dest_path"`
TargetPath string `json:"target_path"` // deprecated alias for dest_path
TransferMode string `json:"transfer_mode"`
MediaType string `json:"media_type"`
MediaCategory string `json:"media_category"`
ScanAfter bool `json:"scan_after"`
ScrapeAfter *bool `json:"scrape_after"`
LibraryID string `json:"library_id"`
DryRun bool `json:"dry_run"`
}
// bindOrganizeOptions parses the optional JSON body into OrganizeOptions.
@@ -40,10 +41,11 @@ func organizeOptionsFromReq(req organizeReq) service.OrganizeOptions {
dest = strings.TrimSpace(req.TargetPath)
}
opts := service.OrganizeOptions{
SourcePath: strings.TrimSpace(req.SourcePath),
DestPath: dest,
MediaType: strings.TrimSpace(req.MediaType),
DryRun: req.DryRun,
SourcePath: strings.TrimSpace(req.SourcePath),
DestPath: dest,
MediaType: strings.TrimSpace(req.MediaType),
MediaCategory: strings.TrimSpace(req.MediaCategory),
DryRun: req.DryRun,
}
if m := strings.TrimSpace(req.TransferMode); m != "" {
opts.TransferMode = service.TransferMode(m)
@@ -56,17 +58,21 @@ func organizeMediaHandler(svc *service.Container) gin.HandlerFunc {
var req organizeReq
_ = c.ShouldBindJSON(&req)
opts := organizeOptionsFromReq(req)
task := startOrganizeHTTPTask(svc, "手动整理媒体", opts)
dst, err := svc.Organizer.OrganizeMediaWithOptions(c.Request.Context(), c.Param("id"), opts)
if err != nil {
finishHTTPTask(task, err, "organize", "手动整理媒体失败", nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
payload := gin.H{"path": dst}
if 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
payload["scrapes"] = scrapes
}
finishHTTPTask(task, nil, "completed", "手动整理媒体结束", nil)
c.JSON(http.StatusOK, payload)
}
}
@@ -76,14 +82,18 @@ func organizeLibraryHandler(svc *service.Container) gin.HandlerFunc {
var req organizeReq
_ = c.ShouldBindJSON(&req)
opts := organizeOptionsFromReq(req)
task := startOrganizeHTTPTask(svc, "手动整理媒体库", opts)
res, err := svc.Organizer.OrganizeLibraryWithOptions(c.Request.Context(), c.Param("id"), opts)
if err != nil {
finishHTTPTask(task, err, "organize", "手动整理媒体库失败", nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
if 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)
}
finishHTTPTask(task, nil, "completed", "手动整理媒体库结束", service.OrganizeTaskMetrics(res))
c.JSON(http.StatusOK, res)
}
}
@@ -103,18 +113,53 @@ func organizeDirectoryHandler(svc *service.Container) gin.HandlerFunc {
var req organizeReq
_ = c.ShouldBindJSON(&req)
opts := organizeOptionsFromReq(req)
task := startOrganizeHTTPTask(svc, "手动整理入库", opts)
res, err := svc.Organizer.OrganizeDirectory(c.Request.Context(), opts)
if err != nil {
finishHTTPTask(task, err, "organize", "手动整理入库失败", nil)
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
updateHTTPTask(task, "organize", "手动整理完成，准备扫描入库", service.OrganizeTaskMetrics(res))
if 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)
}
finishHTTPTask(task, nil, "completed", "手动整理入库结束", service.OrganizeTaskMetrics(res))
c.JSON(http.StatusOK, res)
}
}
func startOrganizeHTTPTask(svc *service.Container, name string, opts service.OrganizeOptions) *service.TaskHandle {
if svc == nil || svc.Tasks == nil {
return nil
}
message := "正在整理/重命名/入库"
if opts.DryRun {
message = "正在预览整理/重命名"
}
return svc.Tasks.Start(service.TaskKindOrganize, name, service.TaskUpdate{
Stage: "organize",
SourcePath: opts.SourcePath,
DestPath: opts.DestPath,
Message: message,
})
}
func updateHTTPTask(task *service.TaskHandle, stage, message string, metrics map[string]int64) {
if task == nil {
return
}
task.Update(service.TaskUpdate{Stage: stage, Message: message, Metrics: metrics})
}
func finishHTTPTask(task *service.TaskHandle, err error, stage, message string, metrics map[string]int64) {
if task == nil {
return
}
task.Finish(err, service.TaskUpdate{Stage: stage, Message: message, Metrics: metrics})
}
func scanAndScrapeAfterOrganize(c *gin.Context, svc *service.Container, destRoot, preferredLibraryID string, scrapeOverride *bool) ([]service.OrganizeScanSummary, []service.OrganizeScrapeSummary) {
scrapeAfter := service.OrganizeScrapeAfterEnabled(c.Request.Context(), svc.Repo)
if scrapeOverride != nil {
internal/handler/streaming.go
+39 -3
View File
@@ -81,11 +81,18 @@ func scrapeOneHandler(svc *service.Container) gin.HandlerFunc {
c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
return
}
task := startScrapeHTTPTask(svc, "手动刮削媒体", m.Title, m.Path)
if err := svc.Scraper.EnrichOne(c.Request.Context(), m); err != nil {
finishHTTPTask(task, err, "scrape", "手动刮削媒体失败", nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
refreshed, _ := svc.Repo.Media.FindByID(c.Request.Context(), m.ID)
metrics := map[string]int64{"processed": 1}
if refreshed != nil && refreshed.ScrapeStatus == "matched" {
metrics["matched"] = 1
}
finishHTTPTask(task, nil, "completed", "手动刮削媒体结束", metrics)
c.JSON(http.StatusOK, refreshed)
}
}
@@ -93,15 +100,44 @@ func scrapeOneHandler(svc *service.Container) gin.HandlerFunc {
// scrapeLibraryHandler retries every pending/no_match media in a library.
func scrapeLibraryHandler(svc *service.Container) gin.HandlerFunc {
return func(c *gin.Context) {
libID := c.Param("id")
var task *service.TaskHandle
if lib, err := svc.Repo.Library.FindByID(c.Request.Context(), libID); err == nil && lib != nil {
task = startScrapeHTTPTask(svc, "手动刮削媒体库", lib.Name, lib.Path)
} else {
task = startScrapeHTTPTask(svc, "手动刮削媒体库", libID, "")
}
// Run in the background so HTTP returns instantly; the WS hub
// pushes per-item progress on the "scrape" topic.
go func(libID string) {
_, _ = svc.Scraper.EnrichLibrary(context.Background(), libID, true)
}(c.Param("id"))
go func(libID string, task *service.TaskHandle) {
matched, err := svc.Scraper.EnrichLibrary(context.Background(), libID, true)
metrics := map[string]int64{"matched": int64(matched)}
stage := "completed"
message := "手动刮削媒体库结束"
if err != nil {
stage = "scrape"
message = "手动刮削媒体库失败"
}
finishHTTPTask(task, err, stage, message, metrics)
}(libID, task)
c.JSON(http.StatusAccepted, gin.H{"status": "scraping"})
}
}
func startScrapeHTTPTask(svc *service.Container, name, title, path string) *service.TaskHandle {
if svc == nil || svc.Tasks == nil {
return nil
}
if title != "" {
name += "：" + title
}
return svc.Tasks.Start(service.TaskKindScrape, name, service.TaskUpdate{
Stage: "scrape",
SourcePath: path,
Message: "正在刮削元数据",
})
}
// reprobeHandler re-runs ffprobe against a single media. Admin-only.
func reprobeHandler(svc *service.Container) gin.HandlerFunc {
return func(c *gin.Context) {
internal/handler/tasks.go
+7 -2
View File
@@ -18,9 +18,14 @@ func tasksHandler(svc *service.Container) gin.HandlerFunc {
return func(c *gin.Context) {
transcodes := svc.Transcoder.Active()
_, torrents, _ := svc.Downloads.List(c.Request.Context())
background := service.TaskSnapshot{}
if svc.Tasks != nil {
background = svc.Tasks.Snapshot()
}
c.JSON(http.StatusOK, gin.H{
"transcodes": transcodes,
"torrents": torrents,
"transcodes": transcodes,
"torrents": torrents,
"background_tasks": background,
})
}
}