Fix outdir and recursive, issue #41

cbconvert_test.go

@@ -29,7 +29,7 @@ func TestConvert(t *testing.T) {
 		for _, file := range files {
 			conv.Opts.Suffix = fmt.Sprintf("_%s%s", format, filepath.Ext(file.Path))
 
-			err = conv.Convert(file.Path, file.Stat)
+			err = conv.Convert(file)
 			if err != nil {
 				t.Errorf("format %s: file %s: %v", format, file.Name, err)
 			}
@@ -59,7 +59,7 @@ func TestCover(t *testing.T) {
 	}
 
 	for _, file := range files {
-		err = conv.Cover(file.Path, file.Stat)
+		err = conv.Cover(file)
 		if err != nil {
 			t.Error(err)
 		}
@@ -88,7 +88,7 @@ func TestThumbnail(t *testing.T) {
 	}
 
 	for _, file := range files {
-		err = conv.Thumbnail(file.Path, file.Stat)
+		err = conv.Thumbnail(file)
 		if err != nil {
 			t.Error(err)
 		}
@@ -99,3 +99,56 @@ func TestThumbnail(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestRecursive(t *testing.T) {
+	inDir, err := os.MkdirTemp(os.TempDir(), "cbc-in")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(inDir)
+
+	sub := filepath.Join(inDir, "chapter1")
+	if err := os.MkdirAll(sub, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	src, err := os.ReadFile("testdata/test.cbz")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(sub, "test.cbz"), src, 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	outDir, err := os.MkdirTemp(os.TempDir(), "cbc-out")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(outDir)
+
+	opts := NewOptions()
+	opts.OutDir = outDir
+	opts.Recursive = true
+
+	conv := New(opts)
+
+	files, err := conv.Files([]string{inDir})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(files) != 1 {
+		t.Fatalf("expected 1 file, got %d", len(files))
+	}
+
+	for _, file := range files {
+		if err := conv.Convert(file); err != nil {
+			t.Error(err)
+		}
+	}
+
+	// output must mirror the input subtree relative to the input root, not the absolute path
+	want := filepath.Join(outDir, "chapter1", "test.cbz")
+	if _, err := os.Stat(want); err != nil {
+		t.Errorf("expected output relative to input root at %s: %v", want, err)
+	}
+}