tcjlj/MeBox
1
0
Fork 0
mirror of https://github.com/truewhile/MeBox.git synced 2026-10-01 03:56:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix organize targets and cloud transfer controls

Browse Source
This commit is contained in:
ShukeBta
2026-06-14 00:27:39 +08:00
parent 22b76c5e1d
commit c76c72966a
22 changed files with 512 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/media.go
+3 -3
View File
@@ -109,7 +109,7 @@ func scanLibraryHandler(svc *service.Container) gin.HandlerFunc {
})
}
_, _, _ = svc.Scan.StartCloudLibraryScan(id, false)
finishHTTPTask(task, nil, "queued", "云盘扫描已加入后台队列", map[string]int64{"queued": 1})
finishHTTPTask(task, nil, "queued", "云盘扫描已加入后台队列", map[string]int64{"queued": 1}, nil)
c.JSON(http.StatusAccepted, gin.H{
"library_id": id,
"visited": 0,
@@ -126,11 +126,11 @@ func scanLibraryHandler(svc *service.Container) gin.HandlerFunc {
task := startScanHTTPTask(svc, "手动扫描入库", lib.Name, lib.Path)
res, err := svc.Scan.ScanLibrary(c.Request.Context(), id)
if err != nil {
finishHTTPTask(task, err, "scan", "手动扫描入库失败", nil)
finishHTTPTask(task, err, "scan", "手动扫描入库失败", nil, nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
finishHTTPTask(task, nil, "completed", "手动扫描入库结束", scanTaskMetrics(res))
finishHTTPTask(task, nil, "completed", "手动扫描入库结束", scanTaskMetrics(res), nil)
c.JSON(http.StatusOK, res)
}
}
internal/handler/organizer.go
+16 -14
View File
@@ -61,18 +61,18 @@ func organizeMediaHandler(svc *service.Container) gin.HandlerFunc {
task := startOrganizeHTTPTask(svc, "手动整理媒体", opts)
dst, err := svc.Organizer.OrganizeMediaWithOptions(c.Request.Context(), c.Param("id"), opts)
if err != nil {
finishHTTPTask(task, err, "organize", "手动整理媒体失败", nil)
finishHTTPTask(task, err, "organize", "手动整理媒体失败", nil, nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
payload := gin.H{"path": dst}
if organizeScanAfter(req.ScanAfter) && !req.DryRun && svc.Scan != nil {
updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", nil)
updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", nil, nil)
scans, scrapes := scanAndScrapeAfterOrganize(c, svc, dst, strings.TrimSpace(req.LibraryID), req.ScrapeAfter)
payload["scans"] = scans
payload["scrapes"] = scrapes
}
finishHTTPTask(task, nil, "completed", "手动整理媒体结束", nil)
finishHTTPTask(task, nil, "completed", "手动整理媒体结束", nil, nil)
c.JSON(http.StatusOK, payload)
}
}
@@ -85,15 +85,16 @@ func organizeLibraryHandler(svc *service.Container) gin.HandlerFunc {
task := startOrganizeHTTPTask(svc, "手动整理媒体库", opts)
res, err := svc.Organizer.OrganizeLibraryWithOptions(c.Request.Context(), c.Param("id"), opts)
if err != nil {
finishHTTPTask(task, err, "organize", "手动整理媒体库失败", nil)
finishHTTPTask(task, err, "organize", "手动整理媒体库失败", nil, nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
details := service.OrganizeTaskDetails(res, 8)
if organizeScanAfter(req.ScanAfter) && !req.DryRun && svc.Scan != nil {
updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", nil)
updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", service.OrganizeTaskMetrics(res), details)
res.Scans, res.Scrapes = scanAndScrapeAfterOrganize(c, svc, res.DestPath, c.Param("id"), req.ScrapeAfter)
}
finishHTTPTask(task, nil, "completed", "手动整理媒体库结束", service.OrganizeTaskMetrics(res))
finishHTTPTask(task, nil, "completed", "手动整理媒体库结束", service.OrganizeTaskMetrics(res), details)
c.JSON(http.StatusOK, res)
}
}
@@ -116,16 +117,17 @@ func organizeDirectoryHandler(svc *service.Container) gin.HandlerFunc {
task := startOrganizeHTTPTask(svc, "手动整理入库", opts)
res, err := svc.Organizer.OrganizeDirectory(c.Request.Context(), opts)
if err != nil {
finishHTTPTask(task, err, "organize", "手动整理入库失败", nil)
finishHTTPTask(task, err, "organize", "手动整理入库失败", nil, nil)
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
updateHTTPTask(task, "organize", "手动整理完成，准备扫描入库", service.OrganizeTaskMetrics(res))
details := service.OrganizeTaskDetails(res, 8)
updateHTTPTask(task, "organize", "手动整理完成，准备扫描入库", service.OrganizeTaskMetrics(res), details)
if organizeScanAfter(req.ScanAfter) && !req.DryRun && svc.Scan != nil {
updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", service.OrganizeTaskMetrics(res))
updateHTTPTask(task, "scan_scrape", "正在扫描入库并按设置刮削", service.OrganizeTaskMetrics(res), details)
res.Scans, res.Scrapes = scanAndScrapeAfterOrganize(c, svc, res.DestPath, strings.TrimSpace(req.LibraryID), req.ScrapeAfter)
}
finishHTTPTask(task, nil, "completed", "手动整理入库结束", service.OrganizeTaskMetrics(res))
finishHTTPTask(task, nil, "completed", "手动整理入库结束", service.OrganizeTaskMetrics(res), details)
c.JSON(http.StatusOK, res)
}
}
@@ -146,18 +148,18 @@ func startOrganizeHTTPTask(svc *service.Container, name string, opts service.Org
})
}
func updateHTTPTask(task *service.TaskHandle, stage, message string, metrics map[string]int64) {
func updateHTTPTask(task *service.TaskHandle, stage, message string, metrics map[string]int64, details []string) {
if task == nil {
return
}
task.Update(service.TaskUpdate{Stage: stage, Message: message, Metrics: metrics})
task.Update(service.TaskUpdate{Stage: stage, Message: message, Metrics: metrics, Details: details})
}
func finishHTTPTask(task *service.TaskHandle, err error, stage, message string, metrics map[string]int64) {
func finishHTTPTask(task *service.TaskHandle, err error, stage, message string, metrics map[string]int64, details []string) {
if task == nil {
return
}
task.Finish(err, service.TaskUpdate{Stage: stage, Message: message, Metrics: metrics})
task.Finish(err, service.TaskUpdate{Stage: stage, Message: message, Metrics: metrics, Details: details})
}
func scanAndScrapeAfterOrganize(c *gin.Context, svc *service.Container, destRoot, preferredLibraryID string, scrapeOverride *bool) ([]service.OrganizeScanSummary, []service.OrganizeScrapeSummary) {
internal/handler/streaming.go
+3 -3
View File
@@ -83,7 +83,7 @@ func scrapeOneHandler(svc *service.Container) gin.HandlerFunc {
}
task := startScrapeHTTPTask(svc, "手动刮削媒体", m.Title, m.Path)
if err := svc.Scraper.EnrichOne(c.Request.Context(), m); err != nil {
finishHTTPTask(task, err, "scrape", "手动刮削媒体失败", nil)
finishHTTPTask(task, err, "scrape", "手动刮削媒体失败", nil, nil)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
@@ -92,7 +92,7 @@ func scrapeOneHandler(svc *service.Container) gin.HandlerFunc {
if refreshed != nil && refreshed.ScrapeStatus == "matched" {
metrics["matched"] = 1
}
finishHTTPTask(task, nil, "completed", "手动刮削媒体结束", metrics)
finishHTTPTask(task, nil, "completed", "手动刮削媒体结束", metrics, nil)
c.JSON(http.StatusOK, refreshed)
}
}
@@ -118,7 +118,7 @@ func scrapeLibraryHandler(svc *service.Container) gin.HandlerFunc {
stage = "scrape"
message = "手动刮削媒体库失败"
}
finishHTTPTask(task, err, stage, message, metrics)
finishHTTPTask(task, err, stage, message, metrics, nil)
}(libID, task)
c.JSON(http.StatusAccepted, gin.H{"status": "scraping"})
}
internal/handler/system_extra.go
+4
View File
@@ -121,6 +121,10 @@ func schemaHandler(_ *service.Container) gin.HandlerFunc {
{"key": "cloud.upload_recursive", "type": "toggle", "label": "递归扫描源目录"},
{"key": "cloud.upload_sidecars", "type": "toggle", "label": "同步 NFO / 海报 / 字幕"},
{"key": "cloud.upload_overwrite", "type": "toggle", "label": "覆盖远端同名文件"},
{"key": "cloud.upload_transfer_mode", "type": "select", "label": "自动转存方式", "options": []gin.H{
{"value": "copy", "label": "复制"},
{"value": "move", "label": "移动"},
}},
{"key": "cloud.upload_interval_seconds", "type": "number", "label": "自动转存间隔秒数"},
},
},