Rework comic output layout

2 files changed, 44 insertions, 21 deletions

diff --git a/internal/comic/comic_test.go b/internal/comic/comic_test.go
index 0714769..c99bedd 100644
--- a/internal/comic/comic_test.go
+++ b/internal/comic/comic_test.go
@@ -183,17 +183,26 @@ func TestValidateGeneratedResultUsesExcelStylePanelLabels(t *testing.T) {
 	}
 }
 
-func TestComicOutputDirDoesNotDuplicateComicsSegment(t *testing.T) {
+func TestComicAssetAndPDFDirs(t *testing.T) {
 	t.Parallel()
 
-	if got, want := comicOutputDir("comics", "slug"), filepath.Join("comics", "slug"); got != want {
-		t.Fatalf("comicOutputDir() = %q, want %q", got, want)
+	if got, want := comicAssetsDir("comics", "slug"), filepath.Join("comics", "assets", "slug"); got != want {
+		t.Fatalf("comicAssetsDir() = %q, want %q", got, want)
 	}
-	if got, want := comicOutputDir(".", "slug"), filepath.Join(".", "comics", "slug"); got != want {
-		t.Fatalf("comicOutputDir() = %q, want %q", got, want)
+	if got, want := comicAssetsDir(".", "slug"), filepath.Join(".", "comics", "assets", "slug"); got != want {
+		t.Fatalf("comicAssetsDir() = %q, want %q", got, want)
 	}
-	if got, want := comicOutputDir("/tmp/out", "slug"), filepath.Join("/tmp/out", "comics", "slug"); got != want {
-		t.Fatalf("comicOutputDir() = %q, want %q", got, want)
+	if got, want := comicAssetsDir("/tmp/out", "slug"), filepath.Join("/tmp/out", "comics", "assets", "slug"); got != want {
+		t.Fatalf("comicAssetsDir() = %q, want %q", got, want)
+	}
+	if got, want := comicsPDFDir("comics"), filepath.Join("comics", "PDF"); got != want {
+		t.Fatalf("comicsPDFDir() = %q, want %q", got, want)
+	}
+	if got, want := comicsPDFDir("."), filepath.Join(".", "comics", "PDF"); got != want {
+		t.Fatalf("comicsPDFDir() = %q, want %q", got, want)
+	}
+	if got, want := comicsPDFDir("/tmp/out"), filepath.Join("/tmp/out", "comics", "PDF"); got != want {
+		t.Fatalf("comicsPDFDir() = %q, want %q", got, want)
 	}
 }
 
@@ -409,9 +418,12 @@ func TestArtistAndRunnerEndToEndWithFakes(t *testing.T) {
 	if err := runner.Run(context.Background(), filepath.Join(tmpDir, "vocab.txt")); err != nil {
 		t.Fatalf("Runner.Run() error = %v", err)
 	}
-	if _, err := os.Stat(filepath.Join(tmpDir, "comics", "forced-slug", "forced-slug.pdf")); err != nil {
+	if _, err := os.Stat(filepath.Join(tmpDir, "comics", "PDF", "forced-slug.pdf")); err != nil {
 		t.Fatalf("pdf missing: %v", err)
 	}
+	if _, err := os.Stat(filepath.Join(tmpDir, "comics", "assets", "forced-slug", "forced-slug_story.txt")); err != nil {
+		t.Fatalf("story missing: %v", err)
+	}
 }
 
 func TestNewRunnerUsesRealisticWeightWhenUltraRealisticUnset(t *testing.T) {
diff --git a/internal/comic/runner.go b/internal/comic/runner.go
index cc45e53..b1381fb 100644
--- a/internal/comic/runner.go
+++ b/internal/comic/runner.go
@@ -146,19 +146,22 @@ func (r *Runner) Run(ctx context.Context, batchFile string) error {
 		fmt.Printf("  Comic title: %q (slug: %s)\n", result.Title, slug)
 	}
 
-	comicsDir := comicOutputDir(dir, slug)
-	if err := os.MkdirAll(comicsDir, 0o755); err != nil {
-		return fmt.Errorf("create comics dir %s: %w", comicsDir, err)
+	assetsDir := comicAssetsDir(dir, slug)
+	if err := os.MkdirAll(assetsDir, 0o755); err != nil {
+		return fmt.Errorf("create comics assets dir %s: %w", assetsDir, err)
 	}
-	r.artist.outputDir = comicsDir
+	if err := os.MkdirAll(comicsPDFDir(dir), 0o755); err != nil {
+		return fmt.Errorf("create comics pdf dir %s: %w", comicsPDFDir(dir), err)
+	}
+	r.artist.outputDir = assetsDir
 
-	if err := r.saveStoryText(result.StoryText, slug, comicsDir); err != nil {
+	if err := r.saveStoryText(result.StoryText, slug, assetsDir); err != nil {
 		return err
 	}
-	if err := r.saveVocabularyFile(result.StoryText, entries, slug, comicsDir); err != nil {
+	if err := r.saveVocabularyFile(result.StoryText, entries, slug, assetsDir); err != nil {
 		fmt.Fprintf(os.Stderr, "Warning: could not write vocabulary file: %v\n", err)
 	}
-	if err := r.saveThemeFile(slug, comicsDir); err != nil {
+	if err := r.saveThemeFile(slug, assetsDir); err != nil {
 		fmt.Fprintf(os.Stderr, "Warning: could not write theme file: %v\n", err)
 	}
 
@@ -169,12 +172,12 @@ func (r *Runner) Run(ctx context.Context, batchFile string) error {
 	for _, path := range paths {
 		fmt.Printf("Comic page saved: %s\n", path)
 	}
-	rootDir := filepath.Dir(filepath.Dir(r.artist.outputDir))
+	rootDir := comicsRootDir(dir)
 	if err := copyGalleryPNGsToComicsGallery(rootDir, r.artist.outputDir); err != nil {
 		fmt.Fprintf(os.Stderr, "Warning: could not copy gallery images to comics/gallery: %v\n", err)
 	}
 	if len(paths) > 0 {
-		pdfPath, err := r.assemblePDF(r.artist.outputDir, slug, paths)
+		pdfPath, err := r.assemblePDF(comicsPDFDir(dir), slug, paths)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Warning: PDF assembly failed: %v\n", err)
 		} else {
@@ -186,15 +189,23 @@ func (r *Runner) Run(ctx context.Context, batchFile string) error {
 		fmt.Println("Narration skipped (enable narration in config to produce audio).")
 		return nil
 	}
-	return r.handleNarration(ctx, result.StoryText, slug, comicsDir)
+	return r.handleNarration(ctx, result.StoryText, slug, assetsDir)
 }
 
-func comicOutputDir(outputRoot, slug string) string {
+func comicsRootDir(outputRoot string) string {
 	root := orDefault(outputRoot, ".")
 	if filepath.Base(filepath.Clean(root)) == "comics" {
-		return filepath.Join(root, slug)
+		return root
 	}
-	return filepath.Join(root, "comics", slug)
+	return filepath.Join(root, "comics")
+}
+
+func comicAssetsDir(outputRoot, slug string) string {
+	return filepath.Join(comicsRootDir(outputRoot), "assets", slug)
+}
+
+func comicsPDFDir(outputRoot string) string {
+	return filepath.Join(comicsRootDir(outputRoot), "PDF")
 }
 
 var _ StoryRunner = (*Runner)(nil)