fix media workflows and download organization

2026-10-11 07:46:37 +08:00 · 2026-06-26 08:42:16 +08:00
parent 0da96f7e4e
commit 65adca04df
102 changed files with 4063 additions and 437 deletions
@@ -258,6 +258,177 @@ func TestGroupMediaVersionsMergesEpisodeByExternalIDAcrossLibraries(t *testing.T
 	}
 }

+func TestGroupMediaVersionsMergesMovieEncodingVariants(t *testing.T) {
+	hd := model.Media{
+		LibraryID:    "movies",
+		Title:        "Inception 2010 1080p BluRay x264",
+		Path:         "/media/Movies/Inception.2010.1080p.BluRay.x264.mkv",
+		Year:         2010,
+		SizeBytes:    100,
+		VideoCodec:   "h264",
+		ScrapeStatus: "pending",
+	}
+	uhd := model.Media{
+		LibraryID:    "movies",
+		Title:        "Inception 2010 2160p UHD BluRay x265",
+		Path:         "/media/Movies/Inception.2010.2160p.UHD.BluRay.x265.mkv",
+		Year:         2010,
+		SizeBytes:    200,
+		VideoCodec:   "hevc",
+		ScrapeStatus: "pending",
+	}
+
+	grouped := groupMediaVersions([]model.Media{hd, uhd})
+	if len(grouped) != 1 {
+		t.Fatalf("grouped len = %d, want 1: %#v", len(grouped), grouped)
+	}
+	if len(grouped[0].Versions) != 2 {
+		t.Fatalf("versions len = %d, want 2: %#v", len(grouped[0].Versions), grouped[0].Versions)
+	}
+	if grouped[0].Media.Path != uhd.Path {
+		t.Fatalf("larger 2160p version should be primary, got %q want %q", grouped[0].Media.Path, uhd.Path)
+	}
+}
+
+func TestGroupMediaVersionsCleansCodecPunctuation(t *testing.T) {
+	web := model.Media{
+		LibraryID:    "movies",
+		Title:        "Everything Everywhere All at Once 2022 WEB-DL H.265 DDP5.1",
+		Path:         "/media/Movies/Everything.Everywhere.All.At.Once.2022.2160p.WEB-DL.H.265.DDP5.1-GRP.mkv",
+		SizeBytes:    200,
+		VideoCodec:   "hevc",
+		ScrapeStatus: "pending",
+	}
+	bluray := model.Media{
+		LibraryID:    "movies",
+		Title:        "Everything Everywhere All at Once 2022 BluRay x264 DTS",
+		Path:         "/media/Movies/Everything.Everywhere.All.At.Once.2022.1080p.BluRay.x264.DTS-GRP.mkv",
+		SizeBytes:    100,
+		VideoCodec:   "h264",
+		ScrapeStatus: "pending",
+	}
+
+	grouped := groupMediaVersions([]model.Media{web, bluray})
+	if len(grouped) != 1 {
+		t.Fatalf("grouped len = %d, want 1: %#v", len(grouped), grouped)
+	}
+	if len(grouped[0].Versions) != 2 {
+		t.Fatalf("versions len = %d, want 2: %#v", len(grouped[0].Versions), grouped[0].Versions)
+	}
+	if grouped[0].Media.Path != web.Path {
+		t.Fatalf("larger WEB-DL version should be primary, got %q want %q", grouped[0].Media.Path, web.Path)
+	}
+}
+
+func TestListMediaVisibleGroupedPaginatesAfterVersionGrouping(t *testing.T) {
+	db := newServiceTestDB(t, &model.Library{}, &model.Media{})
+	repos := repository.New(db)
+	lib := model.Library{Name: "电影", Path: "/media/movies", Type: "movie", Enabled: true}
+	if err := repos.Library.Create(t.Context(), &lib); err != nil {
+		t.Fatal(err)
+	}
+	now := time.Now()
+	rows := []model.Media{
+		{
+			Base:      model.Base{CreatedAt: now.Add(2 * time.Hour), UpdatedAt: now.Add(2 * time.Hour)},
+			LibraryID: lib.ID,
+			Title:     "Inception 2010 2160p UHD BluRay x265",
+			Path:      "/media/movies/Inception.2010.2160p.UHD.BluRay.x265.mkv",
+			TMDbID:    27205,
+			Year:      2010,
+			Width:     3840,
+			Height:    2160,
+			SizeBytes: 200,
+		},
+		{
+			Base:      model.Base{CreatedAt: now.Add(time.Hour), UpdatedAt: now.Add(time.Hour)},
+			LibraryID: lib.ID,
+			Title:     "Inception 2010 1080p BluRay x264",
+			Path:      "/media/movies/Inception.2010.1080p.BluRay.x264.mkv",
+			TMDbID:    27205,
+			Year:      2010,
+			Width:     1920,
+			Height:    1080,
+			SizeBytes: 100,
+		},
+		{
+			Base:      model.Base{CreatedAt: now, UpdatedAt: now},
+			LibraryID: lib.ID,
+			Title:     "The Matrix 1999 1080p BluRay",
+			Path:      "/media/movies/The.Matrix.1999.1080p.BluRay.mkv",
+			TMDbID:    603,
+			Year:      1999,
+			SizeBytes: 90,
+		},
+	}
+	if err := db.Create(&rows).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
+	page, total, err := svc.ListMediaVisibleGrouped(t.Context(), lib.ID, 1, 1, MediaVisibility{IncludeNSFW: true})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if total != 2 {
+		t.Fatalf("grouped total = %d, want 2", total)
+	}
+	if len(page) != 1 || len(page[0].Versions) != 2 {
+		t.Fatalf("first page should contain merged Inception versions, got %#v", page)
+	}
+	if page[0].Media.Path != rows[0].Path {
+		t.Fatalf("primary version = %q, want %q", page[0].Media.Path, rows[0].Path)
+	}
+}
+
+func TestSearchMediaVisiblePageGroupedPaginatesAfterVersionGrouping(t *testing.T) {
+	db := newServiceTestDB(t, &model.Media{})
+	repos := repository.New(db)
+	now := time.Now()
+	rows := []model.Media{
+		{
+			Base:      model.Base{CreatedAt: now.Add(time.Hour), UpdatedAt: now.Add(time.Hour)},
+			LibraryID: "movies",
+			Title:     "Dune 2021 2160p WEB-DL H265",
+			Path:      "/media/movies/Dune.2021.2160p.WEB-DL.H265.mkv",
+			TMDbID:    438631,
+			Year:      2021,
+			Width:     3840,
+			Height:    2160,
+			SizeBytes: 220,
+		},
+		{
+			Base:      model.Base{CreatedAt: now, UpdatedAt: now},
+			LibraryID: "movies",
+			Title:     "Dune 2021 1080p BluRay x264",
+			Path:      "/media/movies/Dune.2021.1080p.BluRay.x264.mkv",
+			TMDbID:    438631,
+			Year:      2021,
+			Width:     1920,
+			Height:    1080,
+			SizeBytes: 120,
+		},
+	}
+	if err := db.Create(&rows).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
+	page, total, err := svc.SearchMediaVisiblePageGrouped(t.Context(), "Dune", 1, 1, MediaVisibility{IncludeNSFW: true})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if total != 1 {
+		t.Fatalf("grouped total = %d, want 1", total)
+	}
+	if len(page) != 1 || len(page[0].Versions) != 2 {
+		t.Fatalf("search page should contain merged Dune versions, got %#v", page)
+	}
+	if page[0].Media.Path != rows[0].Path {
+		t.Fatalf("primary version = %q, want %q", page[0].Media.Path, rows[0].Path)
+	}
+}
+
 func TestUpdateMediaMetadataMarksManualMatch(t *testing.T) {
 	db := newServiceTestDB(t, &model.Library{}, &model.Media{})
 	repos := repository.New(db)