Changeset 32 in code for trunk/zs_util.go

Timestamp:

Sep 2, 2015, 2:54:16 PM (10 years ago)

Author:

zaitsev.serge

Message:

dead end with template functions

File:

• trunk/zs_util.go (modified) (4 diffs)

trunk/zs_util.go

@@ -4 +4 @@
         "bytes"
         "io"
+        "io/ioutil"
         "log"
         "os"
@@ -10 +11 @@
         "strings"
 )
+
+func makeFuncs(funcs Funcs, vars Vars) Funcs {
+        f := Funcs{}
+        for k, v := range funcs {
+                f[k] = v
+        }
+        for k, v := range vars {
+                f[k] = varFunc(v)
+        }
+        // Plugin functions
+        files, _ := ioutil.ReadDir(ZSDIR)
+        for _, file := range files {
+                if !file.IsDir() {
+                        name := file.Name()
+                        if !strings.HasSuffix(name, ".html") && !strings.HasSuffix(name, ".amber") {
+                                f[renameExt(name, "", "")] = pluginFunc(name, vars)
+                        } else {
+                                f[renameExt(name, "", "")] = partialFunc(name, f, vars)
+                        }
+                }
+        }
+        return f
+}
 
 func varFunc(s string) func() string {
@@ -28 +52 @@
 }
 
+func partialFunc(name string, funcs Funcs, vars Vars) func() string {
+        return func() string {
+                var err error
+                w := bytes.NewBuffer(nil)
+                if strings.HasSuffix(name, ".amber") {
+                        err = buildAmber(filepath.Join(ZSDIR, name), w, funcs, vars)
+                } else {
+                        err = buildHTML(filepath.Join(ZSDIR, name), w, funcs, vars)
+                }
+                if err != nil {
+                        return name + ":" + err.Error()
+                }
+                return string(w.Bytes())
+        }
+}
+
 func builtins() Funcs {
         exec := func(cmd string, args ...string) string {
@@ -39 +79 @@
         }
         return Funcs{
-                "exec": exec,
-                "zs": func(args ...string) string {
-                        return exec(os.Args[0], args...)
+                "exec":      exec,
+                "var":       Var,
+                "lorem":     Lorem,
+                "dateparse": DateParse,
+                "datefmt":   DateFmt,
+                "wc":        WordCount,
+                "ttr":       TimeToRead,
+                "ls":        List,
+                "...": func(args ...string) []string {
+                        return append([]string{"..."}, args...)
+                },
+                "sort": func(args ...string) []string {
+
+                        return Sort(args...)
                 },
         }