actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-05-01 21:02:33 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add subdirectories related templates (#158)

Browse Source
This commit is contained in:
Dreampuf
2022-02-02 18:02:01 +08:00
committed by GitHub
parent 2251e8ad8a
commit 9a4f9ff32d
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/mark/includes/templates.go
View File

@@ -21,6 +21,7 @@ var reIncludeDirective = regexp.MustCompile(
`(?s)<!--\s*Include:\s*(?P<template>\S+)\s*(\n(?P<config>.*?))?-->`)
func LoadTemplate(
base string,
path string,
templates *template.Template,
) (*template.Template, error) {
@@ -35,7 +36,7 @@ func LoadTemplate(
var body []byte
body, err := ioutil.ReadFile(path)
body, err := ioutil.ReadFile(filepath.Join(base, path))
if err != nil {
err = facts.Format(
err,
@@ -65,6 +66,7 @@ func LoadTemplate(
}
func ProcessIncludes(
base string,
contents []byte,
templates *template.Template,
) (*template.Template, []byte, bool, error) {
@@ -122,7 +124,7 @@ func ProcessIncludes(
log.Tracef(vardump(facts, data), "including template %q", path)
templates, err = LoadTemplate(path, templates)
templates, err = LoadTemplate(base, path, templates)
if err != nil {
err = facts.Format(err, "unable to load template")