feat(organize): use server metadata for file organization and subtitle handling
This commit is contained in:
Deivid Soto
parent
48e4fb9f7b
commit
819c727bf5
6 changed files with 657 additions and 31 deletions
|
|
@ -158,6 +158,385 @@ func TestOrganizeSeasonOnly(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// --- Tests for server metadata organize path ---
|
||||
|
||||
func intPtr(v int) *int { return &v }
|
||||
|
||||
func TestOrganizeShowWithMetadata(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
srcFile := filepath.Join(tmp, "Frieren.Beyond.Journeys.End.S01E03.1080p.WEB-DL.mkv")
|
||||
os.WriteFile(srcFile, []byte("data"), 0o644)
|
||||
|
||||
tvDir := filepath.Join(tmp, "TV Shows")
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: "Frieren.Beyond.Journeys.End.S01E03.1080p.WEB-DL.mkv"}
|
||||
task := &Task{
|
||||
Title: "Frieren.Beyond.Journeys.End.S01E03.1080p.WEB-DL",
|
||||
ContentType: "show",
|
||||
ContentTitle: "Frieren: Beyond Journey's End",
|
||||
Season: intPtr(1),
|
||||
Episode: intPtr(3),
|
||||
}
|
||||
|
||||
path, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
TVShowsDir: tvDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Should be: TV Shows/Frieren - Beyond Journey's End/Season 01/Frieren - Beyond Journey's End - S01E03.mkv
|
||||
dir := filepath.Dir(path)
|
||||
if filepath.Base(dir) != "Season 01" {
|
||||
t.Errorf("expected Season 01 directory, got %q", filepath.Base(dir))
|
||||
}
|
||||
showDir := filepath.Dir(dir)
|
||||
if filepath.Base(showDir) != "Frieren - Beyond Journey's End" {
|
||||
t.Errorf("expected show dir 'Frieren - Beyond Journey's End', got %q", filepath.Base(showDir))
|
||||
}
|
||||
// Filename should be clean
|
||||
base := filepath.Base(path)
|
||||
if base != "Frieren - Beyond Journey's End - S01E03.mkv" {
|
||||
t.Errorf("filename = %q, want 'Frieren - Beyond Journey's End - S01E03.mkv'", base)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeCollectionMovieWithMetadata(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
srcFile := filepath.Join(tmp, "Knives.Out.2019.1080p.BluRay.mkv")
|
||||
os.WriteFile(srcFile, []byte("data"), 0o644)
|
||||
|
||||
moviesDir := filepath.Join(tmp, "Movies")
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: "Knives.Out.2019.1080p.BluRay.mkv"}
|
||||
task := &Task{
|
||||
Title: "Knives.Out.2019.1080p.BluRay",
|
||||
ContentType: "movie",
|
||||
ContentTitle: "Knives Out",
|
||||
CollectionName: "Knives Out Collection",
|
||||
}
|
||||
|
||||
path, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
MoviesDir: moviesDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Should be: Movies/Knives Out Collection/Knives Out (2019)/Knives Out (2019).mkv
|
||||
movieDir := filepath.Dir(path)
|
||||
if filepath.Base(movieDir) != "Knives Out (2019)" {
|
||||
t.Errorf("expected movie dir 'Knives Out (2019)', got %q", filepath.Base(movieDir))
|
||||
}
|
||||
collDir := filepath.Dir(movieDir)
|
||||
if filepath.Base(collDir) != "Knives Out Collection" {
|
||||
t.Errorf("expected collection dir 'Knives Out Collection', got %q", filepath.Base(collDir))
|
||||
}
|
||||
base := filepath.Base(path)
|
||||
if base != "Knives Out (2019).mkv" {
|
||||
t.Errorf("filename = %q, want 'Knives Out (2019).mkv'", base)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeMovieWithMetadata(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
srcFile := filepath.Join(tmp, "Oppenheimer.2023.2160p.UHD.BluRay.mkv")
|
||||
os.WriteFile(srcFile, []byte("data"), 0o644)
|
||||
|
||||
moviesDir := filepath.Join(tmp, "Movies")
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: "Oppenheimer.2023.2160p.UHD.BluRay.mkv"}
|
||||
task := &Task{
|
||||
Title: "Oppenheimer.2023.2160p.UHD.BluRay",
|
||||
ContentType: "movie",
|
||||
ContentTitle: "Oppenheimer",
|
||||
}
|
||||
|
||||
path, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
MoviesDir: moviesDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Should be: Movies/Oppenheimer (2023)/Oppenheimer (2023).mkv
|
||||
movieDir := filepath.Dir(path)
|
||||
if filepath.Base(movieDir) != "Oppenheimer (2023)" {
|
||||
t.Errorf("expected movie dir 'Oppenheimer (2023)', got %q", filepath.Base(movieDir))
|
||||
}
|
||||
base := filepath.Base(path)
|
||||
if base != "Oppenheimer (2023).mkv" {
|
||||
t.Errorf("filename = %q, want 'Oppenheimer (2023).mkv'", base)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeMultipleEpisodesSameFolder(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
tvDir := filepath.Join(tmp, "TV Shows")
|
||||
|
||||
// Simulate two episodes of the same show
|
||||
for _, ep := range []int{1, 2} {
|
||||
srcFile := filepath.Join(tmp, filepath.Base(t.TempDir())+".mkv")
|
||||
os.WriteFile(srcFile, []byte("data"), 0o644)
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: filepath.Base(srcFile)}
|
||||
task := &Task{
|
||||
Title: "Frieren.S01E0" + string(rune('0'+ep)) + ".1080p",
|
||||
ContentType: "show",
|
||||
ContentTitle: "Frieren",
|
||||
Season: intPtr(1),
|
||||
Episode: intPtr(ep),
|
||||
}
|
||||
|
||||
_, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
TVShowsDir: tvDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("episode %d: %v", ep, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Both episodes should be in the same directory
|
||||
seasonDir := filepath.Join(tvDir, "Frieren", "Season 01")
|
||||
entries, err := os.ReadDir(seasonDir)
|
||||
if err != nil {
|
||||
t.Fatalf("read season dir: %v", err)
|
||||
}
|
||||
if len(entries) != 2 {
|
||||
t.Errorf("expected 2 files in Season 01, got %d", len(entries))
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeCleanupSourceDir(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
// Simulate: outputDir/TorrentName/video.mkv + junk files
|
||||
outputDir := filepath.Join(tmp, "downloads")
|
||||
torrentDir := filepath.Join(outputDir, "Frieren.S01E03.1080p.WEB-DL")
|
||||
os.MkdirAll(torrentDir, 0o755)
|
||||
|
||||
srcFile := filepath.Join(torrentDir, "Frieren.S01E03.1080p.WEB-DL.mkv")
|
||||
os.WriteFile(srcFile, []byte("video"), 0o644)
|
||||
os.WriteFile(filepath.Join(torrentDir, "info.nfo"), []byte("nfo"), 0o644)
|
||||
os.WriteFile(filepath.Join(torrentDir, "readme.txt"), []byte("txt"), 0o644)
|
||||
os.WriteFile(filepath.Join(torrentDir, "website.url"), []byte("url"), 0o644)
|
||||
|
||||
tvDir := filepath.Join(tmp, "TV Shows")
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: "Frieren.S01E03.1080p.WEB-DL.mkv"}
|
||||
task := &Task{
|
||||
Title: "Frieren.S01E03.1080p.WEB-DL",
|
||||
ContentType: "show",
|
||||
ContentTitle: "Frieren",
|
||||
Season: intPtr(1),
|
||||
Episode: intPtr(3),
|
||||
}
|
||||
|
||||
path, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
TVShowsDir: tvDir,
|
||||
OutputDir: outputDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Video should be in organized location
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
t.Errorf("organized file should exist at %s", path)
|
||||
}
|
||||
|
||||
// Source torrent directory should be gone (only had junk left)
|
||||
if _, err := os.Stat(torrentDir); !os.IsNotExist(err) {
|
||||
t.Errorf("torrent dir should have been cleaned up: %s", torrentDir)
|
||||
}
|
||||
|
||||
// OutputDir itself should still exist
|
||||
if _, err := os.Stat(outputDir); err != nil {
|
||||
t.Errorf("outputDir should still exist")
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeNoCleanupWhenVideoRemains(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
outputDir := filepath.Join(tmp, "downloads")
|
||||
torrentDir := filepath.Join(outputDir, "MultiVideoTorrent")
|
||||
os.MkdirAll(torrentDir, 0o755)
|
||||
|
||||
srcFile := filepath.Join(torrentDir, "episode1.mkv")
|
||||
os.WriteFile(srcFile, []byte("video1"), 0o644)
|
||||
// Another video file remains
|
||||
os.WriteFile(filepath.Join(torrentDir, "episode2.mkv"), []byte("video2"), 0o644)
|
||||
|
||||
tvDir := filepath.Join(tmp, "TV Shows")
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: "episode1.mkv"}
|
||||
task := &Task{
|
||||
Title: "Show S01E01",
|
||||
ContentType: "show",
|
||||
ContentTitle: "Show",
|
||||
Season: intPtr(1),
|
||||
Episode: intPtr(1),
|
||||
}
|
||||
|
||||
_, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
TVShowsDir: tvDir,
|
||||
OutputDir: outputDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Torrent dir should still exist because episode2.mkv is still there
|
||||
if _, err := os.Stat(torrentDir); err != nil {
|
||||
t.Errorf("torrent dir should NOT be cleaned up when video files remain")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSanitizePath(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
want string
|
||||
}{
|
||||
{"Normal Title", "Normal Title"},
|
||||
{"Title: Subtitle", "Title - Subtitle"},
|
||||
{"Title/Subtitle", "Title-Subtitle"},
|
||||
{"What?", "What"},
|
||||
{"A*B<C>D|E", "ABCD-E"},
|
||||
{" Spaces ", "Spaces"},
|
||||
{"Trailing...", "Trailing"},
|
||||
{"", "Unknown"},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.input, func(t *testing.T) {
|
||||
got := sanitizePath(tt.input)
|
||||
if got != tt.want {
|
||||
t.Errorf("sanitizePath(%q) = %q, want %q", tt.input, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveYear(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
task *Task
|
||||
want string
|
||||
}{
|
||||
{"from ContentYear", &Task{ContentYear: intPtr(2023), Title: "Movie.2020.1080p"}, "2023"},
|
||||
{"fallback to regex", &Task{Title: "Movie.2020.1080p"}, "2020"},
|
||||
{"no year", &Task{Title: "Movie.1080p"}, ""},
|
||||
{"zero year fallback", &Task{ContentYear: intPtr(0), Title: "Movie.2019.mkv"}, "2019"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := resolveYear(tt.task)
|
||||
if got != tt.want {
|
||||
t.Errorf("resolveYear() = %q, want %q", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsSubtitleFile(t *testing.T) {
|
||||
for _, ext := range []string{".srt", ".sub", ".ass", ".ssa", ".vtt", ".idx"} {
|
||||
if !isSubtitleFile("file" + ext) {
|
||||
t.Errorf("expected %s to be subtitle", ext)
|
||||
}
|
||||
}
|
||||
for _, ext := range []string{".mkv", ".txt", ".nfo", ".jpg"} {
|
||||
if isSubtitleFile("file" + ext) {
|
||||
t.Errorf("expected %s to NOT be subtitle", ext)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMoveSubtitles(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
srcDir := filepath.Join(tmp, "torrent")
|
||||
destDir := filepath.Join(tmp, "dest")
|
||||
os.MkdirAll(srcDir, 0o755)
|
||||
os.MkdirAll(destDir, 0o755)
|
||||
|
||||
// Create video + subtitles in source
|
||||
videoPath := filepath.Join(srcDir, "Movie.2023.1080p.mkv")
|
||||
os.WriteFile(videoPath, []byte("video"), 0o644)
|
||||
os.WriteFile(filepath.Join(srcDir, "Movie.2023.1080p.srt"), []byte("srt"), 0o644)
|
||||
os.WriteFile(filepath.Join(srcDir, "Movie.2023.1080p.en.srt"), []byte("en srt"), 0o644)
|
||||
os.WriteFile(filepath.Join(srcDir, "Other.srt"), []byte("other"), 0o644) // should NOT move
|
||||
|
||||
moveSubtitles(videoPath, destDir, "Oppenheimer (2023).mkv")
|
||||
|
||||
// Renamed subtitles should be in dest
|
||||
if _, err := os.Stat(filepath.Join(destDir, "Oppenheimer (2023).srt")); err != nil {
|
||||
t.Error("expected Oppenheimer (2023).srt in dest")
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(destDir, "Oppenheimer (2023).en.srt")); err != nil {
|
||||
t.Error("expected Oppenheimer (2023).en.srt in dest")
|
||||
}
|
||||
// Other.srt should NOT have moved
|
||||
if _, err := os.Stat(filepath.Join(srcDir, "Other.srt")); err != nil {
|
||||
t.Error("Other.srt should remain in source")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMoveSubtitlesNoRename(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
srcDir := filepath.Join(tmp, "torrent")
|
||||
destDir := filepath.Join(tmp, "dest")
|
||||
os.MkdirAll(srcDir, 0o755)
|
||||
os.MkdirAll(destDir, 0o755)
|
||||
|
||||
videoPath := filepath.Join(srcDir, "Movie.mkv")
|
||||
os.WriteFile(videoPath, []byte("video"), 0o644)
|
||||
os.WriteFile(filepath.Join(srcDir, "Movie.srt"), []byte("srt"), 0o644)
|
||||
|
||||
moveSubtitles(videoPath, destDir, "") // no rename
|
||||
|
||||
if _, err := os.Stat(filepath.Join(destDir, "Movie.srt")); err != nil {
|
||||
t.Error("expected Movie.srt in dest (no rename)")
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrganizeMovieWithContentYear(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
srcFile := filepath.Join(tmp, "Oppenheimer.UHD.BluRay.mkv")
|
||||
os.WriteFile(srcFile, []byte("data"), 0o644)
|
||||
|
||||
moviesDir := filepath.Join(tmp, "Movies")
|
||||
|
||||
r := &Result{FilePath: srcFile, FileName: "Oppenheimer.UHD.BluRay.mkv"}
|
||||
task := &Task{
|
||||
Title: "Oppenheimer.UHD.BluRay", // no year in title!
|
||||
ContentType: "movie",
|
||||
ContentTitle: "Oppenheimer",
|
||||
ContentYear: intPtr(2023),
|
||||
}
|
||||
|
||||
path, err := organize(r, task, OrganizeConfig{
|
||||
Enabled: true,
|
||||
MoviesDir: moviesDir,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Should use ContentYear even though title has no year
|
||||
movieDir := filepath.Dir(path)
|
||||
if filepath.Base(movieDir) != "Oppenheimer (2023)" {
|
||||
t.Errorf("expected movie dir 'Oppenheimer (2023)', got %q", filepath.Base(movieDir))
|
||||
}
|
||||
base := filepath.Base(path)
|
||||
if base != "Oppenheimer (2023).mkv" {
|
||||
t.Errorf("filename = %q, want 'Oppenheimer (2023).mkv'", base)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCleanTitleEdgeCases(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue