Bläddra i källkod

Update util/template dep

Andrea Fazzi 5 år sedan
förälder
incheckning
9ad62a3edd

+ 4 - 4
Godeps/Godeps.json

@@ -132,19 +132,19 @@
 		},
 		{
 			"ImportPath": "gogs.carducci-dante.gov.it/karmen/util/fileutil",
-			"Rev": "8dfeb3928544bfba6c19725bd78c186e54ff6b32"
+			"Rev": "cdb7cebddc349ce594f7e1578f86f6c49bffac23"
 		},
 		{
 			"ImportPath": "gogs.carducci-dante.gov.it/karmen/util/libreoffice",
-			"Rev": "8dfeb3928544bfba6c19725bd78c186e54ff6b32"
+			"Rev": "cdb7cebddc349ce594f7e1578f86f6c49bffac23"
 		},
 		{
 			"ImportPath": "gogs.carducci-dante.gov.it/karmen/util/pandoc",
-			"Rev": "8dfeb3928544bfba6c19725bd78c186e54ff6b32"
+			"Rev": "cdb7cebddc349ce594f7e1578f86f6c49bffac23"
 		},
 		{
 			"ImportPath": "gogs.carducci-dante.gov.it/karmen/util/template",
-			"Rev": "8dfeb3928544bfba6c19725bd78c186e54ff6b32"
+			"Rev": "cdb7cebddc349ce594f7e1578f86f6c49bffac23"
 		},
 		{
 			"ImportPath": "gopkg.in/asn1-ber.v1",

+ 27 - 0
vendor/gogs.carducci-dante.gov.it/karmen/util/template/template.go

@@ -1,6 +1,8 @@
 package template
 
 import (
+	"crypto/sha1"
+	"fmt"
 	"io/ioutil"
 	"text/template"
 )
@@ -27,3 +29,28 @@ func LoadTextTemplate(filename string, funcMap ...template.FuncMap) (*template.T
 	}
 	return tpl, nil
 }
+
+func LoadTextTemplateFromString(content string, funcMap ...template.FuncMap) (*template.Template, error) {
+	var (
+		tpl *template.Template
+		err error
+	)
+
+	h := sha1.New()
+	h.Write([]byte(content))
+
+	name := fmt.Sprintf("%x", h.Sum(nil))
+
+	if len(funcMap) > 0 {
+		tpl, err = template.New(name).Funcs(funcMap[0]).Parse(content)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		tpl, err = template.New(name).Parse(content)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return tpl, nil
+}