From 97d5f483eade5c84c07180cb3be467c7974a39f9 Mon Sep 17 00:00:00 2001
From: Nicolas Paul <n@nc0.fr>
Date: Wed, 26 Apr 2023 04:08:17 +0200
Subject: Fix recursivity problem

The tool was not updating the output directory with nested directories' name, therefore everyhting was being generated at the root of the output directory
---
 crocc.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'crocc.go')

diff --git a/crocc.go b/crocc.go
index 52fbd10..20f03e5 100644
--- a/crocc.go
+++ b/crocc.go
@@ -96,13 +96,17 @@ func main() {
 	htmlTemplate = *template.Must(template.New("html-template").Parse(string(tp)))
 
 	// Logic
-	if err := Crocc(in); err != nil {
+	if err := Crocc(in, ""); err != nil {
 		log.Fatalf("unable to complete generation from %q: %v", in, err)
 	}
 }
 
 // Crocc is the function that applies to every file in a directory.
-func Crocc(root string) error {
+// child corresponds to the path of a nested subdirectory, relative to the root.
+// For example, if the root is "src" and the child is "foo/bar", the function
+// will be applied to "src/foo/bar".
+func Crocc(root string, child string) error {
+	outputPath := filepath.Join(*out, child)
 	files, err := os.ReadDir(root)
 	if err != nil {
 		return err
@@ -110,7 +114,6 @@ func Crocc(root string) error {
 
 	for _, file := range files {
 		filename := file.Name()
-		log.Printf("processing %q", filename)
 
 		// Ignore template file
 		if filename == ".crocc.html" {
@@ -119,11 +122,11 @@ func Crocc(root string) error {
 
 		// If the file is a directory, create it in the output directory
 		if file.IsDir() {
-			if err := TransformDirectory(root, filename, *out); err != nil {
+			if err := TransformDirectory(root, filename, outputPath); err != nil {
 				return err
 			}
 
-			if err := Crocc(filepath.Join(root, filename)); err != nil {
+			if err := Crocc(filepath.Join(root, filename), filename); err != nil {
 				return err
 			}
 
@@ -135,7 +138,7 @@ func Crocc(root string) error {
 			filepath.Ext(filename) != ".markdown" &&
 			filepath.Ext(filename) != ".mdown" &&
 			filepath.Ext(filename) != ".Markdown" {
-			if err := TransformNonMarkdownFile(root, filename, *out); err != nil {
+			if err := TransformNonMarkdownFile(root, filename, outputPath); err != nil {
 				return err
 			}
 
@@ -143,7 +146,7 @@ func Crocc(root string) error {
 		}
 
 		// Transform Markdown files into HTML
-		if err := TransformMarkdownFile(root, filename, *out); err != nil {
+		if err := TransformMarkdownFile(root, filename, outputPath); err != nil {
 			return err
 		}
 	}
-- 
cgit v1.2.3