fix: improve media file organization workflow

2026-10-07 22:06:38 +08:00 · 2026-06-09 13:57:34 +08:00
parent 76d6e0c8ff
commit fe0e7a09ce
28 changed files with 2054 additions and 859 deletions
@@ -42,12 +42,199 @@ func TestOrganizeDirectoryNewMedia(t *testing.T) {
 	if res.Organized != 1 || res.Replaced != 0 || res.Skipped != 0 {
 		t.Fatalf("expected organized=1 replaced=0 skipped=0, got %+v", res)
 	}
-	want := filepath.Join(dest, "Dune (2021)", "Dune (2021).mkv")
+	want := filepath.Join(dest, "电影", "Dune (2021)", "Dune (2021).mkv")
 	if _, err := os.Stat(want); err != nil {
 		t.Fatalf("expected organized file at %q: %v", want, err)
 	}
 }

+func TestOrganizeDirectoryDryRunReturnsPreviewWithoutWriting(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "downloads")
+	dest := filepath.Join(root, "media")
+	sourceFile := filepath.Join(src, "Dune 2021 2160p WEB-DL.mkv")
+	writeOrgFile(t, sourceFile, "dune-uhd")
+
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), newOrganizerTestRepo(t))
+	res, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		SourcePath:   src,
+		DestPath:     dest,
+		TransferMode: TransferCopy,
+		DryRun:       true,
+	})
+	if err != nil {
+		t.Fatalf("organize directory dry-run: %v", err)
+	}
+	if !res.DryRun || res.Organized != 1 || len(res.Items) != 1 {
+		t.Fatalf("unexpected dry-run result: %+v", res)
+	}
+	want := filepath.Join(dest, "电影", "Dune (2021)", "Dune (2021).mkv")
+	if res.Items[0].Source != sourceFile || res.Items[0].Target != want || res.Items[0].Action != "organize" {
+		t.Fatalf("preview item = %#v, want source=%q target=%q action=organize", res.Items[0], sourceFile, want)
+	}
+	if _, err := os.Stat(want); !os.IsNotExist(err) {
+		t.Fatalf("dry-run should not create %q, stat err=%v", want, err)
+	}
+}
+
+func TestOrganizeDirectoryUsesConfiguredSourceWhenRequestSourceEmpty(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "downloads")
+	dest := filepath.Join(root, "media")
+	writeOrgFile(t, filepath.Join(src, "Dune 2021 2160p WEB-DL.mkv"), "dune-uhd")
+
+	repos := newOrganizerTestRepo(t)
+	if err := repos.Setting.Set(t.Context(), "organize.source_dir", src); err != nil {
+		t.Fatal(err)
+	}
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), repos)
+	res, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		DestPath:     dest,
+		TransferMode: TransferCopy,
+	})
+	if err != nil {
+		t.Fatalf("organize directory with configured source: %v", err)
+	}
+	if res.SourcePath != filepath.Clean(src) || res.Organized != 1 {
+		t.Fatalf("result = %+v, want source=%q organized=1", res, src)
+	}
+}
+
+func TestOrganizeDirectoryAcceptsSingleVideoFileSource(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "downloads", "Dune 2021 2160p WEB-DL.mkv")
+	dest := filepath.Join(root, "media")
+	writeOrgFile(t, src, "dune-uhd")
+
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), newOrganizerTestRepo(t))
+	res, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		SourcePath:   src,
+		DestPath:     dest,
+		TransferMode: TransferCopy,
+	})
+	if err != nil {
+		t.Fatalf("organize single file: %v", err)
+	}
+	if res.Organized != 1 {
+		t.Fatalf("result = %+v, want organized=1", res)
+	}
+	want := filepath.Join(dest, "电影", "Dune (2021)", "Dune (2021).mkv")
+	if _, err := os.Stat(want); err != nil {
+		t.Fatalf("expected organized file at %q: %v", want, err)
+	}
+}
+
+func TestOrganizeDirectoryHonorsManualMediaType(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "downloads")
+	dest := filepath.Join(root, "media")
+	writeOrgFile(t, filepath.Join(src, "Some Show S01E01 2024 1080p.mkv"), "show-e01")
+	writeOrgFile(t, filepath.Join(src, "Some Movie 2024 1080p.mkv"), "movie")
+
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), newOrganizerTestRepo(t))
+	tvRes, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		SourcePath:   filepath.Join(src, "Some Show S01E01 2024 1080p.mkv"),
+		DestPath:     dest,
+		MediaType:    "tv",
+		TransferMode: TransferCopy,
+	})
+	if err != nil {
+		t.Fatalf("organize manual tv type: %v", err)
+	}
+	if tvRes.Organized != 1 {
+		t.Fatalf("tv result = %+v, want organized=1", tvRes)
+	}
+	tvWant := filepath.Join(dest, "电视剧", "Some Show", "Season 01", "Some Show - S01E01.mkv")
+	if _, err := os.Stat(tvWant); err != nil {
+		t.Fatalf("expected tv file at %q: %v", tvWant, err)
+	}
+
+	movieRes, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		SourcePath:   filepath.Join(src, "Some Movie 2024 1080p.mkv"),
+		DestPath:     dest,
+		MediaType:    "movie",
+		TransferMode: TransferCopy,
+	})
+	if err != nil {
+		t.Fatalf("organize manual movie type: %v", err)
+	}
+	if movieRes.Organized != 1 {
+		t.Fatalf("movie result = %+v, want organized=1", movieRes)
+	}
+	movieWant := filepath.Join(dest, "电影", "Some Movie (2024)", "Some Movie (2024).mkv")
+	if _, err := os.Stat(movieWant); err != nil {
+		t.Fatalf("expected movie file at %q: %v", movieWant, err)
+	}
+}
+
+func TestOrganizeDirectoryHonorsAdultMediaTypeRoot(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "downloads", "ABP-123.mkv")
+	dest := filepath.Join(root, "media")
+	writeOrgFile(t, src, "adult")
+
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), newOrganizerTestRepo(t))
+	res, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		SourcePath:   src,
+		DestPath:     dest,
+		MediaType:    "adult",
+		TransferMode: TransferCopy,
+		DryRun:       true,
+	})
+	if err != nil {
+		t.Fatalf("organize adult type: %v", err)
+	}
+	if res.Organized != 1 || len(res.Items) != 1 {
+		t.Fatalf("result = %+v, want one preview item", res)
+	}
+	if !pathWithin(res.Items[0].Target, filepath.Join(dest, "成人")) {
+		t.Fatalf("adult target = %q, want under %q", res.Items[0].Target, filepath.Join(dest, "成人"))
+	}
+	if res.Items[0].MediaType != "adult" {
+		t.Fatalf("media type = %q, want adult", res.Items[0].MediaType)
+	}
+}
+
+func TestOrganizeSourceCandidatesOnlyReturnAccessibleDirectories(t *testing.T) {
+	root := t.TempDir()
+	configuredDir := filepath.Join(root, "configured-downloads")
+	downloadDir := filepath.Join(root, "downloads")
+	mediaDir := filepath.Join(root, "media")
+	if err := os.MkdirAll(configuredDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.MkdirAll(downloadDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	t.Setenv("MEDIASTATION_DOWNLOAD_CONTAINER_DIR", downloadDir)
+	t.Setenv("MEDIASTATION_MEDIA_CONTAINER_DIR", filepath.Join(root, "missing-media"))
+
+	repos := newOrganizerTestRepo(t)
+	if err := repos.Setting.Set(t.Context(), "organize.source_dir", configuredDir); err != nil {
+		t.Fatal(err)
+	}
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), repos)
+	candidates := org.OrganizeSourceCandidates(t.Context())
+	if len(candidates) != 2 {
+		t.Fatalf("candidates = %#v, want configured source + accessible download dir", candidates)
+	}
+	if candidates[0].Path != filepath.Clean(configuredDir) || candidates[0].Kind != "source" {
+		t.Fatalf("first candidate = %#v, want configured source %q", candidates[0], configuredDir)
+	}
+	if candidates[1].Path != filepath.Clean(downloadDir) || candidates[1].Kind != "download" {
+		t.Fatalf("second candidate = %#v, want accessible download dir %q", candidates[1], downloadDir)
+	}
+
+	if err := os.MkdirAll(mediaDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	t.Setenv("MEDIASTATION_MEDIA_CONTAINER_DIR", mediaDir)
+	candidates = org.OrganizeSourceCandidates(t.Context())
+	if len(candidates) != 3 {
+		t.Fatalf("candidates = %#v, want configured source, download and media dirs", candidates)
+	}
+}
+
 // TestOrganizeDirectoryDedup verifies that media already present in the
 // destination is NOT organized again from the source (去重), and the existing
 // file is left untouched.
@@ -59,7 +246,7 @@ func TestOrganizeDirectoryDedup(t *testing.T) {
 	// Source release at 1080p.
 	writeOrgFile(t, filepath.Join(src, "The Matrix 1999 1080p BluRay.mkv"), "matrix-source")
 	// Destination already holds the organized 1080p version.
-	existing := filepath.Join(dest, "The Matrix (1999)", "The Matrix (1999).mkv")
+	existing := filepath.Join(dest, "电影", "The Matrix (1999)", "The Matrix (1999).mkv")
 	writeOrgFile(t, existing, "matrix-existing")

 	repos := newOrganizerTestRepo(t)
@@ -98,7 +285,7 @@ func TestOrganizeDirectoryReplaceHigherResolution(t *testing.T) {
 	// Source is 2160p; filename token drives resolutionArea when no DB row.
 	writeOrgFile(t, filepath.Join(src, "Inception 2010 2160p BluRay.mkv"), "inception-uhd")
 	// Destination already holds an organized 1080p version (scanned dims).
-	existing := filepath.Join(dest, "Inception (2010)", "Inception (2010).mkv")
+	existing := filepath.Join(dest, "电影", "Inception (2010)", "Inception (2010).mkv")
 	writeOrgFile(t, existing, "inception-1080p")

 	repos := newOrganizerTestRepo(t)
@@ -143,7 +330,7 @@ func TestOrganizeDirectoryKeepsHigherResolutionExisting(t *testing.T) {
 	dest := filepath.Join(root, "media")

 	writeOrgFile(t, filepath.Join(src, "Inception 2010 720p.mkv"), "inception-720p")
-	existing := filepath.Join(dest, "Inception (2010)", "Inception (2010).mkv")
+	existing := filepath.Join(dest, "电影", "Inception (2010)", "Inception (2010).mkv")
 	writeOrgFile(t, existing, "inception-2160p")

 	repos := newOrganizerTestRepo(t)
@@ -177,7 +364,7 @@ func TestOrganizeDirectoryTVEpisodeDedup(t *testing.T) {
 	dest := filepath.Join(root, "media")

 	writeOrgFile(t, filepath.Join(src, "Friends S01E01 1080p.mkv"), "friends-s01e01-src")
-	existing := filepath.Join(dest, "Friends", "Season 01", "Friends - S01E01.mkv")
+	existing := filepath.Join(dest, "电视剧", "Friends", "Season 01", "Friends - S01E01.mkv")
 	writeOrgFile(t, existing, "friends-s01e01-existing")
 	// A different episode that should still be organized fresh.
 	writeOrgFile(t, filepath.Join(src, "Friends S01E02 1080p.mkv"), "friends-s01e02-src")
@@ -204,7 +391,7 @@ func TestOrganizeDirectoryTVEpisodeDedup(t *testing.T) {
 	if got, err := os.ReadFile(existing); err != nil || string(got) != "friends-s01e01-existing" {
 		t.Fatalf("existing E01 must be untouched, got %q err=%v", string(got), err)
 	}
-	e02 := filepath.Join(dest, "Friends", "Season 01", "Friends - S01E02.mkv")
+	e02 := filepath.Join(dest, "电视剧", "Friends", "Season 01", "Friends - S01E02.mkv")
 	if _, err := os.Stat(e02); err != nil {
 		t.Fatalf("expected E02 organized at %q: %v", e02, err)
 	}
@@ -239,3 +426,57 @@ func TestOrganizeDirectoryUsesDownloadCategoryLayout(t *testing.T) {
 		t.Fatalf("expected movie organized at %q: %v", movie, err)
 	}
 }
+
+func TestOrganizeDirectoryScanAfterRecursesNestedDownloadFolders(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "downloads")
+	dest := filepath.Join(root, "media")
+	writeOrgFile(t, filepath.Join(src, "国产剧", "子目录", "狂飙.S01E01.2023.1080p.WEB-DL.mkv"), "kuangbiao-e01")
+	writeOrgFile(t, filepath.Join(src, "华语电影", "更深", "流浪地球2.2023.2160p.WEB-DL.H265.mkv"), "wandering-earth-2")
+
+	repos := newOrganizerTestRepo(t)
+	tvLib := model.Library{Name: "国产剧", Path: filepath.Join(dest, "电视剧", "国产剧"), Type: "tv", Enabled: true}
+	movieLib := model.Library{Name: "华语电影", Path: filepath.Join(dest, "电影", "华语电影"), Type: "movie", Enabled: true}
+	if err := repos.Library.Create(t.Context(), &tvLib); err != nil {
+		t.Fatal(err)
+	}
+	if err := repos.Library.Create(t.Context(), &movieLib); err != nil {
+		t.Fatal(err)
+	}
+
+	org := NewOrganizerService(&config.Config{}, zap.NewNop(), repos)
+	res, err := org.OrganizeDirectory(t.Context(), OrganizeOptions{
+		SourcePath:   src,
+		DestPath:     dest,
+		TransferMode: TransferCopy,
+	})
+	if err != nil {
+		t.Fatalf("organize directory: %v", err)
+	}
+	if res.Organized != 2 {
+		t.Fatalf("organized = %d, want 2", res.Organized)
+	}
+
+	scanner := NewScannerService(&config.Config{}, zap.NewNop(), repos, NewHub(zap.NewNop()), nil, nil)
+	scans := scanner.ScanLibrariesForPath(t.Context(), res.DestPath, "")
+	if len(scans) != 2 {
+		t.Fatalf("scans = %#v, want two matching libraries", scans)
+	}
+	added := 0
+	for _, scan := range scans {
+		if scan.Error != "" {
+			t.Fatalf("scan failed: %#v", scan)
+		}
+		added += scan.Added
+	}
+	if added != 2 {
+		t.Fatalf("scan added = %d, want 2", added)
+	}
+	var count int64
+	if err := repos.DB.Model(&model.Media{}).Count(&count).Error; err != nil {
+		t.Fatal(err)
+	}
+	if count != 2 {
+		t.Fatalf("media rows = %d, want 2", count)
+	}
+}