Changeset 25 in code

Timestamp:

Aug 30, 2015, 12:22:00 PM (10 years ago)

Author:

zaitsev.serge

Message:

fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions

Location:

trunk

Files:

• zs.go (modified) (4 diffs)
• zs_util.go (modified) (3 diffs)

trunk/zs.go

@@ -133 +133 @@
                 return err
         }
-        output := filepath.Join(PUBDIR, path)
-        if s, ok := vars["output"]; ok {
-                output = s
-        }
-        err = ioutil.WriteFile(output, []byte(content), 0666)
-        if err != nil {
-                return err
-        }
-        return nil
+        if w == nil {
+                f, err := os.Create(filepath.Join(PUBDIR, path))
+                if err != nil {
+                        return err
+                }
+                defer f.Close()
+                w = f
+        }
+        _, err = io.WriteString(w, content)
+        return err
 }
 
@@ -151 +152 @@
                 return err
         }
+
+        data := map[string]interface{}{}
+        for k, v := range vars {
+                data[k] = v
+        }
+        for k, v := range funcs {
+                data[k] = v
+        }
+
         t, err := a.Compile()
         if err != nil {
@@ -163 +173 @@
                 w = f
         }
-        return t.Execute(w, vars)
+        return t.Execute(w, data)
 }
 
@@ -276 +286 @@
         switch cmd {
         case "build":
-                buildAll(false)
+                if len(args) == 0 {
+                        buildAll(false)
+                } else if len(args) == 1 {
+                        if err := build(args[0], os.Stdout, builtins(), globals()); err != nil {
+                                fmt.Println("ERROR: " + err.Error())
+                        }
+                } else {
+                        fmt.Println("ERROR: too many arguments")
+                }
         case "watch":
                 buildAll(true)
-        case "print":
-                if len(args) != 1 {
-                        fmt.Println("ERROR: filename expected")
-                } else {
-                        build(args[0], os.Stdout, builtins(), globals())
-                }
         case "var":
                 fmt.Println(Var(args))

trunk/zs_util.go

@@ -20 +20 @@
         return func(args ...string) string {
                 out := bytes.NewBuffer(nil)
-                if err := run(cmd, args, vars, out); err != nil {
+                if err := run(filepath.Join(ZSDIR, cmd), args, vars, out); err != nil {
                         return cmd + ":" + err.Error()
                 } else {
@@ -29 +29 @@
 
 func builtins() Funcs {
-        exec := func(s ...string) string {
+        exec := func(cmd string, args ...string) string {
+                out := bytes.NewBuffer(nil)
+                if err := run(cmd, args, Vars{}, out); err != nil {
+                        return cmd + ":" + err.Error()
+                } else {
+                        return string(out.Bytes())
+                }
                 return ""
         }
@@ -35 +41 @@
                 "exec": exec,
                 "zs": func(args ...string) string {
-                        cmd := []string{"zs"}
-                        cmd = append(cmd, args...)
-                        return exec(cmd...)
+                        return exec(os.Args[0], args...)
                 },
         }