From 87bb94d4df77e5ed495ed21fe588820a75bc0405 Mon Sep 17 00:00:00 2001 From: ShukeBta <272197458+ShukeBta@users.noreply.github.com> Date: Fri, 19 Jun 2026 11:41:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(repair):=20=E6=96=B0=E5=A2=9E=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E5=A4=8D+=E9=87=8D=E5=88=AE=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=89=A7=E9=9B=86=E7=B1=BB=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=BD=92=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 服务层 RepairAndRescrapeAllLibraries：先从路径占位符回填缺失/错误外部ID，再逐库重刮(含 no_match 重试) - 新增 handler 与路由 POST /api/admin/media/repair-rescrape，异步执行经 WS 推送进度 - 前端媒体库页新增「全库修复+重刮」按钮调用该接口 - groupSeries：路径落在剧集类目录(电视剧/动漫/特别篇等)时按剧集卡处理，跳转分类视图 --- internal/handler/repair_rescrape.go | 38 +++++++++++++++++ internal/handler/routes_admin.go | 3 ++ internal/service/cloud_path_repair.go | 60 +++++++++++++++++++++++++++ web/src/api/tools.ts | 8 ++++ web/src/pages/LibrariesPage.tsx | 40 +++++++++++++++--- web/src/utils/groupSeries.ts | 18 +++++++- 6 files changed, 161 insertions(+), 6 deletions(-) create mode 100644 internal/handler/repair_rescrape.go diff --git a/internal/handler/repair_rescrape.go b/internal/handler/repair_rescrape.go new file mode 100644 index 0000000..9187860 --- /dev/null +++ b/internal/handler/repair_rescrape.go @@ -0,0 +1,38 @@ +// Package handler — batch repair+rescrape endpoint. +package handler + +import ( + "context" + "net/http" + + "github.com/gin-gonic/gin" + + "github.com/ShukeBta/MediaStationGo/internal/service" +) + +// repairAndRescrapeAllHandler 触发"全库修复+重刮"流程:先从媒体路径中的 +// {tmdb-N}/{bangumi-N} 等占位符回填缺失的外部 ID, 再对所有媒体库重刮一遍。 +// +// 路由: POST /api/admin/media/repair-rescrape (需 admin) +// 异步执行, 立即返回 202;通过 WS hub "scrape" topic 推送进度。 +func repairAndRescrapeAllHandler(svc *service.Container) gin.HandlerFunc { + return func(c *gin.Context) { + task := startScrapeHTTPTask(svc, "全库修复并重刮", "", "") + go func() { + result, err := svc.RepairAndRescrapeAllLibraries(context.Background()) + metrics := map[string]int64{ + "repaired": int64(result.Repaired), + "libraries": int64(result.Libraries), + "matched": int64(result.Matched), + } + stage := "completed" + message := "全库修复并重刮完成" + if err != nil { + stage = "scrape" + message = "全库修复并重刮失败" + } + finishHTTPTask(task, err, stage, message, metrics, nil) + }() + c.JSON(http.StatusAccepted, gin.H{"status": "started"}) + } +} diff --git a/internal/handler/routes_admin.go b/internal/handler/routes_admin.go index 9850812..6984fd9 100644 --- a/internal/handler/routes_admin.go +++ b/internal/handler/routes_admin.go @@ -87,6 +87,9 @@ func registerAdminRoutes(api *gin.RouterGroup, cfg *config.Config, svc *service. admin.GET("/organize/sources", organizeSourcesHandler(svc)) admin.POST("/organize/source", organizeDirectoryHandler(svc)) + // 全库修复+重刮:从路径占位符回填缺失外部 ID,然后批量重刮整库。 + admin.POST("/media/repair-rescrape", repairAndRescrapeAllHandler(svc)) + // API key management (encrypted at rest). admin.GET("/api-configs", listAPIConfigsHandler(svc)) admin.GET("/api-configs/:provider", getAPIConfigHandler(svc)) diff --git a/internal/service/cloud_path_repair.go b/internal/service/cloud_path_repair.go index 0abd04d..ca4ca14 100644 --- a/internal/service/cloud_path_repair.go +++ b/internal/service/cloud_path_repair.go @@ -106,3 +106,63 @@ func cloudPathRepairShouldReplaceTitle(current, hinted string) bool { } return len([]rune(current)) > len([]rune(hinted))*2 } + + +// RepairAndRescrapeResult 汇总一次「全库修复+重刮」的结果。 +type RepairAndRescrapeResult struct { + Repaired int `json:"repaired"` // 从路径占位符回填外部 ID 的媒体数 + Libraries int `json:"libraries"` // 参与重刮的媒体库数 + Matched int `json:"matched"` // 重刮后成功匹配的媒体数 +} + +// RepairAndRescrapeAllLibraries 修复并重刮所有媒体库:先从媒体路径中的 +// {tmdb-123}/{bangumi-456} 等占位符回填缺失或错误的外部 ID(回填后会把相关 +// 行的 scrape_status 重置为 pending),随后逐个媒体库重刮(含 no_match 重试), +// 让此前因空 ID / 脏 ID 无法刮削的媒体重新匹配到正确数据。 +func (c *Container) RepairAndRescrapeAllLibraries(ctx context.Context) (RepairAndRescrapeResult, error) { + var result RepairAndRescrapeResult + if c == nil || c.Repo == nil || c.Repo.DB == nil { + return result, nil + } + repaired, err := c.RepairCloudPathMetadata(ctx) + if err != nil { + return result, err + } + result.Repaired = repaired + + if c.Scraper == nil || c.Repo.Library == nil { + return result, nil + } + libraries, err := c.Repo.Library.List(ctx) + if err != nil { + return result, err + } + for i := range libraries { + select { + case <-ctx.Done(): + return result, ctx.Err() + default: + } + lib := libraries[i] + if !lib.Enabled { + continue + } + result.Libraries++ + // retryNoMatch=true:连之前匹配失败的也再试一次,因为这次可能已回填到正确 ID。 + matched, err := c.Scraper.EnrichLibrary(ctx, lib.ID, true) + if err != nil { + if c.Log != nil { + c.Log.Warn("repair rescrape library failed", zap.String("library", lib.ID), zap.Error(err)) + } + continue + } + result.Matched += matched + } + if c.Log != nil { + c.Log.Info("repair and rescrape all libraries done", + zap.Int("repaired", result.Repaired), + zap.Int("libraries", result.Libraries), + zap.Int("matched", result.Matched)) + } + return result, nil +} diff --git a/web/src/api/tools.ts b/web/src/api/tools.ts index 297e83e..31eeba0 100644 --- a/web/src/api/tools.ts +++ b/web/src/api/tools.ts @@ -96,4 +96,12 @@ export const toolsAPI = { api .post<{ message: string }>('/admin/notify/test', { title, body }) .then((r) => r.data), + + // repairAndRescrapeAll 触发「全库修复+重刮」：先从媒体路径中的 + // {tmdb-N}/{bangumi-N} 占位符回填缺失/错误的外部 ID，再批量重刮整库。 + // 后端异步执行，立即返回；进度通过 WS "scrape" topic 推送。 + repairAndRescrapeAll: () => + api + .post<{ status: string }>('/admin/media/repair-rescrape', {}) + .then((r) => r.data), } diff --git a/web/src/pages/LibrariesPage.tsx b/web/src/pages/LibrariesPage.tsx index 58b5f94..ffa6d18 100644 --- a/web/src/pages/LibrariesPage.tsx +++ b/web/src/pages/LibrariesPage.tsx @@ -1,10 +1,11 @@ import { useEffect, useMemo, useState, type ReactNode } from 'react' import { Link } from 'react-router-dom' import { motion } from 'framer-motion' -import { ArrowRight, Film, FolderOpen, Library as LibraryIcon, Music, PlayCircle, Tv } from 'lucide-react' +import { ArrowRight, Film, FolderOpen, Library as LibraryIcon, Music, PlayCircle, RefreshCw, Tv } from 'lucide-react' import { imageURL } from '../api/client' import { libraryAPI } from '../api/library' +import { toolsAPI } from '../api/tools' import { MediaCard } from '../components/MediaCard' import type { Library, Media } from '../types' import { artworkScore, groupSeries, seriesCardLink, type SeriesCard } from '../utils/groupSeries' @@ -35,6 +36,22 @@ const TYPE_LABELS: Record = { export function LibrariesPage() { const [previews, setPreviews] = useState([]) const [loading, setLoading] = useState(true) + const [repairing, setRepairing] = useState(false) + const [repairMsg, setRepairMsg] = useState('') + + async function handleRepairRescrape() { + if (repairing) return + setRepairing(true) + setRepairMsg('') + try { + await toolsAPI.repairAndRescrapeAll() + setRepairMsg('已开始全库修复+重刮，进度可在任务中查看。') + } catch { + setRepairMsg('启动失败，请稍后重试。') + } finally { + setRepairing(false) + } + } useEffect(() => { let cancelled = false @@ -75,10 +92,23 @@ export function LibrariesPage() { 共 {previews.length} 个目录 · {total.toLocaleString()} 个条目。每个目录直接展示最新入库内容。

- - 管理媒体库 - - +
+ {repairMsg && {repairMsg}} + + + 管理媒体库 + + +
{previews.length === 0 ? ( diff --git a/web/src/utils/groupSeries.ts b/web/src/utils/groupSeries.ts index 6a0b886..e70fe3c 100644 --- a/web/src/utils/groupSeries.ts +++ b/web/src/utils/groupSeries.ts @@ -38,8 +38,24 @@ export function isEpisodeLike(media: Media): boolean { return (media.season_num ?? 0) > 0 || (media.episode_num ?? 0) > 0 } +// 剧集类目录名(电视剧/动漫及其二级分类)。媒体路径落在这些目录下时, 即便 +// 季集号未识别出来, 也应按剧集对待, 跳转到 /library 分类视图而非 /media 单页。 +const EPISODIC_PATH_RE = + /[\\/](?:电视剧|剧集|国产剧|欧美剧|日韩剧|日剧|韩剧|综艺|纪录片|动漫|番剧|国漫|日番|儿童|tv|series|shows?|season[\s._-]*\d|s\d{1,2}(?:[\s._-]|[\\/])|specials?|sp|ova|oad|特别篇|特別篇|番外|特典)[\\/]/i + +function pathLooksEpisodic(media: Media): boolean { + const path = (media.path || media.display_library_path || media.library_path || '') + return EPISODIC_PATH_RE.test(path) +} + export function isSeriesCard(card: SeriesCard): boolean { - return card.count > 1 || isEpisodeLike(card.rep) || isEpisodeLike(card.linkMedia) + return ( + card.count > 1 || + isEpisodeLike(card.rep) || + isEpisodeLike(card.linkMedia) || + pathLooksEpisodic(card.rep) || + pathLooksEpisodic(card.linkMedia) + ) } export function seriesTitle(media: Media): string {