Allow whitespace in parameterized output paths #102

glaciers-in-archives · Apr 5, 2024 · a79c6de · despens · Apr 6, 2024 · Abbe98
1 parent be7fb63
commit a79c6de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/build.go b/cmd/build.go
@@ -5,6 +5,7 @@ import (
 	"io/fs"
 	"io/ioutil"
 	"os"
+	"regexp"
 	"strings"
 
 	"github.com/glaciers-in-archives/snowman/internal/config"
@@ -141,7 +142,8 @@ var buildCmd = &cobra.Command{
 						return utils.ErrorExit("Failed to validate path section.", err)
 					}
 
-					outputPath := "site/" + strings.Replace(view.ViewConfig.Output, "{{"+*view.MultipageVariableHook+"}}", pathSection, 1)
+					outputVariablePattern := regexp.MustCompile(`{{ *` + *view.MultipageVariableHook + ` *}}`)
+					outputPath := "site/" + outputVariablePattern.ReplaceAllString(view.ViewConfig.Output, pathSection)
 
 					if renderedPaths[outputPath] {
 						fmt.Println("Warning: Writing to " + outputPath + " for the second time.")

diff --git a/internal/views/views.go b/internal/views/views.go
@@ -89,7 +89,7 @@ func DiscoverViews(layouts []string) ([]View, error) {
 
 	for _, viewConf := range vConfigs.Views {
 		var multipageVariableHook *string
-		re := regexp.MustCompile(`{{([\w\d_]+)}}`)
+		re := regexp.MustCompile(`{{ *([\w\d_]+) *}}`)
 		if re.Match([]byte(viewConf.Output)) {
 			multipageVariableHook = &re.FindAllStringSubmatch(viewConf.Output, 1)[0][1]
 		}