fix(media): 修复emby电影库混入剧集/特别篇识别/剧集合集 + 新增手动编辑元数据

emby 兼容层(hills/yamby 等客户端): - 电影库不再混入剧集:filterLikelyEpisodicPathsFromMovieQuery 按路径特征(Season/S0x/Specials/电视剧/日番/国漫等)剔除误入电影库的剧集 - itemPayload 改用 mediaShouldBeEpisode:有季集号且(属剧集库或路径像剧集) 才标记为 Episode,修正电影库里剧集被当成 Movie 特别篇识别: - episode_parser 新增 patSpecialSeason,识别 S0/Season 0/Specials/SP/OVA/ OAD/番外/特别篇/特典文件夹 → 第0季;seasonFromParents 返回 found 标志, 区分"明确第0季"与"未识别默认第1季" - emby seasonDir 正则同步支持 Specials/SP/OVA/特别篇等剧集合集: - groupSeries 抽出 isSeriesCard,卡片链接按是否剧集判定,修复剧集卡片跳转;每集分离的根因(季集号/分组key)随入库识别修复一并改善手动编辑元数据(自采集视频无TMDB信息时可自定义封面/标题/简介/分类): - 新增 MediaService.UpdateMetadata + PATCH /media/:id/metadata(需admin) - 前端 MetadataEditDialog 接入 LibraryPage 与 MediaDetailPage 其他:scanner/scraper/nfo/local+cloud_metadata/adult 元数据识别配套改进; .gitignore 忽略本地 .dev-cache/.dev-data 运行产物。
2026-10-12 08:16:37 +08:00 · 2026-06-18 21:56:25 +00:00
parent cce88ce3b0
commit b44c7f860b
34 changed files with 1601 additions and 207 deletions
@@ -235,17 +235,17 @@ func TestGroupMediaVersionsMergesEpisodeByExternalIDAcrossLibraries(t *testing.T
 		Path:       "/media/国产剧/折腰 (2025)/Season 1/折腰.S01E01.mkv",
 		SeasonNum:  1,
 		EpisodeNum: 1,
-		TMDbID:     220269,
+		TMDbID:     296753,
 		SizeBytes:  100,
 		PosterURL:  "https://image.tmdb.org/t/p/w500/poster.jpg",
 	}
 	cloud := model.Media{
 		LibraryID:  "cloud-tv",
 		Title:      "折腰",
-		Path:       "cloud://openlist/国产剧/折腰 (2025) {tmdb-220269}/Season 1/折腰.S01E01.mkv",
+		Path:       "cloud://openlist/国产剧/折腰 (2025) {tmdb-296753}/Season 1/折腰.S01E01.mkv",
 		SeasonNum:  1,
 		EpisodeNum: 1,
-		TMDbID:     220269,
+		TMDbID:     296753,
 		SizeBytes:  200,
 		STRMURL:    "/api/cloud/play/openlist?ref=/国产剧/折腰/01.mkv",
 	}
@@ -259,6 +259,49 @@ func TestGroupMediaVersionsMergesEpisodeByExternalIDAcrossLibraries(t *testing.T
 	}
 }

+func TestUpdateMediaMetadataMarksManualMatch(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.Library{}, &model.Media{}); err != nil {
+		t.Fatal(err)
+	}
+	repos := repository.New(db)
+	lib := model.Library{Name: "自采集", Path: "/media/custom", Type: "movie", Enabled: true}
+	if err := repos.Library.Create(t.Context(), &lib); err != nil {
+		t.Fatal(err)
+	}
+	media := model.Media{Base: model.Base{ID: "custom-media"}, LibraryID: lib.ID, Title: "raw", Path: "/media/custom/raw.mp4", ScrapeStatus: "no_match"}
+	if err := repos.DB.Create(&media).Error; err != nil {
+		t.Fatal(err)
+	}
+	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
+	title := "手动标题"
+	overview := "手动简介"
+	season := 0
+	episode := 1
+	tmdbID := 12345
+	nsfw := true
+	updated, err := svc.UpdateMetadata(t.Context(), media.ID, MediaMetadataUpdate{
+		Title:      &title,
+		Overview:   &overview,
+		SeasonNum:  &season,
+		EpisodeNum: &episode,
+		TMDbID:     &tmdbID,
+		NSFW:       &nsfw,
+	})
+	if err != nil {
+		t.Fatalf("update metadata: %v", err)
+	}
+	if updated.Title != title || updated.Overview != overview || updated.ScrapeStatus != "matched" {
+		t.Fatalf("metadata not saved: %#v", updated)
+	}
+	if updated.SeasonNum != 0 || updated.EpisodeNum != 1 || updated.TMDbID != tmdbID || !updated.NSFW {
+		t.Fatalf("ids/episode metadata not saved: %#v", updated)
+	}
+}
+
 func TestMediaUpsertBackfillsExternalIDsForPendingCloudRows(t *testing.T) {
 	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
 	if err != nil {
@@ -268,7 +311,7 @@ func TestMediaUpsertBackfillsExternalIDsForPendingCloudRows(t *testing.T) {
 		t.Fatal(err)
 	}
 	repos := repository.New(db)
-	path := "cloud://openlist/国漫/折腰 (2025) {tmdb-220269}/Season 1/折腰.S01E01.mkv"
+	path := "cloud://openlist/国漫/折腰 (2025) {tmdb-296753}/Season 1/折腰.S01E01.mkv"
 	if err := repos.DB.Create(&model.Media{
 		LibraryID:    "cloud-tv",
 		Title:        "折腰",
@@ -285,7 +328,7 @@ func TestMediaUpsertBackfillsExternalIDsForPendingCloudRows(t *testing.T) {
 		Path:         path,
 		SeasonNum:    1,
 		EpisodeNum:   1,
-		TMDbID:       220269,
+		TMDbID:       296753,
 		Year:         2025,
 		ScrapeStatus: "pending",
 	}); err != nil {
@@ -295,11 +338,53 @@ func TestMediaUpsertBackfillsExternalIDsForPendingCloudRows(t *testing.T) {
 	if err := repos.DB.First(&got, "path = ?", path).Error; err != nil {
 		t.Fatal(err)
 	}
-	if got.TMDbID != 220269 || got.Year != 2025 || got.ScrapeStatus != "pending" {
+	if got.TMDbID != 296753 || got.Year != 2025 || got.ScrapeStatus != "pending" {
 		t.Fatalf("pending cloud row was not backfilled correctly: tmdb=%d year=%d status=%q", got.TMDbID, got.Year, got.ScrapeStatus)
 	}
 }

+func TestMediaUpsertCorrectsCloudExternalIDConflicts(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.Media{}); err != nil {
+		t.Fatal(err)
+	}
+	repos := repository.New(db)
+	path := "cloud://openlist/国产剧/折腰 (2025) {tmdb-296753}/Season 1/折腰.S01E01.mkv"
+	if err := repos.DB.Create(&model.Media{
+		LibraryID:    "cloud-tv",
+		Title:        "折腰",
+		Path:         path,
+		SeasonNum:    1,
+		EpisodeNum:   1,
+		TMDbID:       220269,
+		ScrapeStatus: "matched",
+	}).Error; err != nil {
+		t.Fatal(err)
+	}
+	if err := repos.Media.Upsert(t.Context(), &model.Media{
+		LibraryID:    "cloud-tv",
+		Title:        "折腰",
+		Path:         path,
+		SeasonNum:    1,
+		EpisodeNum:   1,
+		TMDbID:       296753,
+		Year:         2025,
+		ScrapeStatus: "pending",
+	}); err != nil {
+		t.Fatal(err)
+	}
+	var got model.Media
+	if err := repos.DB.First(&got, "path = ?", path).Error; err != nil {
+		t.Fatal(err)
+	}
+	if got.TMDbID != 296753 || got.ScrapeStatus != "pending" {
+		t.Fatalf("cloud external id conflict was not corrected: tmdb=%d status=%q", got.TMDbID, got.ScrapeStatus)
+	}
+}
+
 func TestRepairCloudPathMetadataBackfillsExistingPlaceholders(t *testing.T) {
 	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
 	if err != nil {
@@ -335,6 +420,44 @@ func TestRepairCloudPathMetadataBackfillsExistingPlaceholders(t *testing.T) {
 	}
 }

+func TestRepairCloudPathMetadataCorrectsConflictingMatchedID(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.Media{}); err != nil {
+		t.Fatal(err)
+	}
+	repos := repository.New(db)
+	path := "cloud://openlist/国产剧/折腰 (2025) {tmdb-296753}/Season 1/折腰.S01E01.mkv"
+	if err := repos.DB.Create(&model.Media{
+		LibraryID:    "cloud-tv",
+		Title:        "折腰",
+		Path:         path,
+		SeasonNum:    1,
+		EpisodeNum:   1,
+		TMDbID:       220269,
+		ScrapeStatus: "matched",
+	}).Error; err != nil {
+		t.Fatal(err)
+	}
+	container := &Container{Repo: repos, Log: zap.NewNop()}
+	repaired, err := container.RepairCloudPathMetadata(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if repaired != 1 {
+		t.Fatalf("repaired = %d, want 1", repaired)
+	}
+	var got model.Media
+	if err := repos.DB.First(&got, "path = ?", path).Error; err != nil {
+		t.Fatal(err)
+	}
+	if got.TMDbID != 296753 || got.ScrapeStatus != "pending" {
+		t.Fatalf("conflicting matched id was not repaired: tmdb=%d status=%q", got.TMDbID, got.ScrapeStatus)
+	}
+}
+
 func TestSoftDeleteCloudMediaPurgesRecordWithoutRecycleBin(t *testing.T) {
 	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
 	if err != nil {