make audiobook organization recursive

Author: sgerner

internal/organize/audio_test.go

@@ -1,7 +1,11 @@
 package organize
 
 import (
+	"os"
+	"path/filepath"
 	"testing"
+
+	"github.com/JeremiahM37/librarr/internal/config"
 )
 
 func TestParseAudioFilename(t *testing.T) {
@@ -95,3 +99,69 @@ func TestExtractAudioMetaFromDir_NonexistentDir(t *testing.T) {
 		t.Error("expected nil for nonexistent directory")
 	}
 }
+
+func TestOrganizeAudiobookMissingSourceDoesNotCreateDestDir(t *testing.T) {
+	root := t.TempDir()
+	cfg := &config.Config{
+		FileOrgEnabled: true,
+		AudiobookDir:   filepath.Join(root, "audiobooks"),
+	}
+	o := NewOrganizer(cfg)
+
+	missing := filepath.Join(root, "incoming", "missing.m4b")
+	_, err := o.OrganizeAudiobook(missing, "Missing Book", "Missing Author")
+	if err == nil {
+		t.Fatal("expected error")
+	}
+
+	destDir := filepath.Join(cfg.AudiobookDir, "Missing Author", "Missing Book")
+	if _, statErr := os.Stat(destDir); !os.IsNotExist(statErr) {
+		t.Fatalf("expected no dest dir on failure, stat err=%v", statErr)
+	}
+}
+
+func TestOrganizeAudiobookMovesNestedTreeRecursively(t *testing.T) {
+	root := t.TempDir()
+	src := filepath.Join(root, "incoming", "book")
+	cd1 := filepath.Join(src, "CD1")
+	cd2 := filepath.Join(src, "CD2", "Extras")
+
+	if err := os.MkdirAll(cd1, 0755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.MkdirAll(cd2, 0755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(cd1, "track01.m4b"), []byte("cd1"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(cd2, "track02.m4b"), []byte("cd2"), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	cfg := &config.Config{
+		FileOrgEnabled: true,
+		AudiobookDir:   filepath.Join(root, "audiobooks"),
+	}
+	o := NewOrganizer(cfg)
+
+	dest, err := o.OrganizeAudiobook(src, "Nested Book", "Recursive Author")
+	if err != nil {
+		t.Fatalf("organize failed: %v", err)
+	}
+
+	wantRoot := filepath.Join(cfg.AudiobookDir, "Recursive Author", "Nested Book")
+	if dest != wantRoot {
+		t.Fatalf("dest = %q, want %q", dest, wantRoot)
+	}
+
+	if _, err := os.Stat(filepath.Join(wantRoot, "CD1", "track01.m4b")); err != nil {
+		t.Fatalf("expected CD1 track at destination: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(wantRoot, "CD2", "Extras", "track02.m4b")); err != nil {
+		t.Fatalf("expected nested track at destination: %v", err)
+	}
+	if _, err := os.Stat(src); !os.IsNotExist(err) {
+		t.Fatalf("expected source tree removed, stat err=%v", err)
+	}
+}

internal/organize/pipeline.go

@@ -81,34 +81,27 @@ func (o *Organizer) OrganizeAudiobook(filePath, title, author string) (string, e
 		author = "Unknown"
 	}
 
-	safeAuthor := sanitizePath(author, 80)
-	safeTitle := sanitizePath(title, 80)
-
-	destDir := filepath.Join(o.cfg.AudiobookDir, safeAuthor, safeTitle)
-	if err := os.MkdirAll(destDir, 0755); err != nil {
-		return filePath, err
-	}
-
 	// If source is a directory, move its contents.
 	info, err := os.Stat(filePath)
 	if err != nil {
 		return filePath, err
 	}
 
+	safeAuthor := sanitizePath(author, 80)
+	safeTitle := sanitizePath(title, 80)
+
+	destDir := filepath.Join(o.cfg.AudiobookDir, safeAuthor, safeTitle)
 	if info.IsDir() {
-		entries, err := os.ReadDir(filePath)
-		if err != nil {
+		if err := moveDirTree(filePath, destDir); err != nil {
 			return filePath, err
 		}
-		for _, entry := range entries {
-			src := filepath.Join(filePath, entry.Name())
-			dst := filepath.Join(destDir, entry.Name())
-			_ = moveFile(src, dst)
-		}
-		_ = os.RemoveAll(filePath)
 		return destDir, nil
 	}
 
+	if err := os.MkdirAll(destDir, 0755); err != nil {
+		return filePath, err
+	}
+
 	destPath := filepath.Join(destDir, filepath.Base(filePath))
 	if err := moveFile(filePath, destPath); err != nil {
 		return filePath, err
@@ -238,6 +231,41 @@ func moveFile(src, dst string) error {
 	return os.Remove(src)
 }
 
+func moveDirTree(srcDir, dstDir string) error {
+	if err := os.MkdirAll(dstDir, 0755); err != nil {
+		return err
+	}
+
+	err := filepath.WalkDir(srcDir, func(path string, d os.DirEntry, walkErr error) error {
+		if walkErr != nil {
+			return walkErr
+		}
+		if path == srcDir {
+			return nil
+		}
+
+		rel, err := filepath.Rel(srcDir, path)
+		if err != nil {
+			return err
+		}
+
+		dstPath := filepath.Join(dstDir, rel)
+		if d.IsDir() {
+			return os.MkdirAll(dstPath, 0755)
+		}
+
+		if err := os.MkdirAll(filepath.Dir(dstPath), 0755); err != nil {
+			return err
+		}
+		return moveFile(path, dstPath)
+	})
+	if err != nil {
+		return err
+	}
+
+	return os.RemoveAll(srcDir)
+}
+
 // copyFileForOrg copies a file without removing the source.
 func copyFileForOrg(src, dst string) error {
 	srcFile, err := os.Open(src)