Mercurial > yakumo_izuru > aya

annotate zs.go @ 34:ed40ca93db1e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added explicit yaml separator, fixed amber compilation sequence
author zaitsev.serge
date Wed, 02 Sep 2015 17:35:26 +0000
parents e3c902a7380d
children 0498cb3afc1d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
1 package main
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
2
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
3 import (
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
4 "bytes"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
5 "fmt"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
6 "io"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
7 "io/ioutil"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
8 "log"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
9 "os"
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
10 "os/exec"
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
11 "path/filepath"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
12 "strings"
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
13 "text/template"
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
14 "time"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
15
22
f5627d4212a3 restored the original amber since my issue has been fixed
zaitsev.serge
parents: 20
diff changeset
16 "github.com/eknkc/amber"
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
17 "github.com/russross/blackfriday"
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
18 "github.com/yosssi/gcss"
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
19 "gopkg.in/yaml.v2"
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
20 )
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
21
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
22 const (
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
23 ZSDIR = ".zs"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
24 PUBDIR = ".pub"
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
25 )
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
26
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
27 type Vars map[string]string
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
28
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
29 // renameExt renames extension (if any) from oldext to newext
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
30 // If oldext is an empty string - extension is extracted automatically.
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
31 // If path has no extension - new extension is appended
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
32 func renameExt(path, oldext, newext string) string {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
33 if oldext == "" {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
34 oldext = filepath.Ext(path)
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
35 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
36 if oldext == "" || strings.HasSuffix(path, oldext) {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
37 return strings.TrimSuffix(path, oldext) + newext
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
38 } else {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
39 return path
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
40 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
41 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
42
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
43 // globals returns list of global OS environment variables that start
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
44 // with ZS_ prefix as Vars, so the values can be used inside templates
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
45 func globals() Vars {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
46 vars := Vars{}
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
47 for _, e := range os.Environ() {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
48 pair := strings.Split(e, "=")
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
49 if strings.HasPrefix(pair[0], "ZS_") {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
50 vars[strings.ToLower(pair[0][3:])] = pair[1]
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
51 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
52 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
53 return vars
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
54 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
55
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
56 // run executes a command or a script. Vars define the command environment,
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
57 // each zs var is converted into OS environemnt variable with ZS_ prefix
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
58 // prepended. Additional variable $ZS contains path to the zs binary. Command
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
59 // stderr is printed to zs stderr, command output is returned as a string.
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
60 func run(vars Vars, cmd string, args ...string) (string, error) {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
61 // First check if partial exists (.amber or .html)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
62 if b, err := ioutil.ReadFile(filepath.Join(ZSDIR, cmd+".amber")); err == nil {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
63 return string(b), nil
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
64 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
65 if b, err := ioutil.ReadFile(filepath.Join(ZSDIR, cmd+".html")); err == nil {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
66 return string(b), nil
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
67 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
68
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
69 var errbuf, outbuf bytes.Buffer
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
70 c := exec.Command(cmd, args...)
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
71 env := []string{"ZS=" + os.Args[0], "ZS_OUTDIR=" + PUBDIR}
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
72 env = append(env, os.Environ()...)
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
73 for k, v := range vars {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
74 env = append(env, "ZS_"+strings.ToUpper(k)+"="+v)
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
75 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
76 c.Env = env
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
77 c.Stdout = &outbuf
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
78 c.Stderr = &errbuf
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
79
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
80 err := c.Run()
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
81
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
82 if errbuf.Len() > 0 {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
83 log.Println("ERROR:", errbuf.String())
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
84 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
85 if err != nil {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
86 return "", err
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
87 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
88 return string(outbuf.Bytes()), nil
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
89 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
90
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
91 // getVars returns list of variables defined in a text file and actual file
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
92 // content following the variables declaration. Header is separated from
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
93 // content by an empty line. Header can be either YAML or JSON.
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
94 // If no empty newline is found - file is treated as content-only.
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
95 func getVars(path string, globals Vars) (Vars, string, error) {
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
96 b, err := ioutil.ReadFile(path)
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
97 if err != nil {
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
98 return nil, "", err
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
99 }
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
100 s := string(b)
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
101
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
102 // Copy globals first
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
103 v := Vars{}
29
dd669a7e582f file, url and output should not be overridden by globals
zaitsev.serge
parents: 28
diff changeset
104 for name, value := range globals {
dd669a7e582f file, url and output should not be overridden by globals
zaitsev.serge
parents: 28
diff changeset
105 v[name] = value
6
cb66f5b86616 rewritted default variables assignment
zaitsev.serge
parents: 5
diff changeset
106 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
107
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
108 // Override them by default values extracted from file name/path
20
f8373c23a3ff replaced amber with my own fork, fixed file paths for amber and html
zaitsev.serge
parents: 19
diff changeset
109 if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
f8373c23a3ff replaced amber with my own fork, fixed file paths for amber and html
zaitsev.serge
parents: 19
diff changeset
110 v["layout"] = "layout.amber"
f8373c23a3ff replaced amber with my own fork, fixed file paths for amber and html
zaitsev.serge
parents: 19
diff changeset
111 } else {
f8373c23a3ff replaced amber with my own fork, fixed file paths for amber and html
zaitsev.serge
parents: 19
diff changeset
112 v["layout"] = "layout.html"
f8373c23a3ff replaced amber with my own fork, fixed file paths for amber and html
zaitsev.serge
parents: 19
diff changeset
113 }
29
dd669a7e582f file, url and output should not be overridden by globals
zaitsev.serge
parents: 28
diff changeset
114 v["file"] = path
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
115 v["url"] = path[:len(path)-len(filepath.Ext(path))] + ".html"
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
116 v["output"] = filepath.Join(PUBDIR, v["url"])
20
f8373c23a3ff replaced amber with my own fork, fixed file paths for amber and html
zaitsev.serge
parents: 19
diff changeset
117
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
118 delim := "\n---\n"
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
119 if sep := strings.Index(s, delim); sep == -1 {
19
802b96e67bae added global variables, added default date for markdown
zaitsev.serge
parents: 18
diff changeset
120 return v, s, nil
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
121 } else {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
122 header := s[:sep]
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
123 body := s[sep+len(delim):]
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
124
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
125 vars := Vars{}
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
126 if err := yaml.Unmarshal([]byte(header), &vars); err != nil {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
127 fmt.Println("ERROR: failed to parse header", err)
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
128 return nil, "", err
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
129 } else {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
130 for key, value := range vars {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
131 v[key] = value
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
132 log.Println(key, value)
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
133 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
134 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
135 if strings.HasPrefix(v["url"], "./") {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
136 v["url"] = v["url"][2:]
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
137 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
138 return v, body, nil
2
fd79b3a90bef fixed empty header in markdown
zaitsev.serge
parents: 0
diff changeset
139 }
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
140 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
141
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
142 // Render expanding zs plugins and variables
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
143 func render(s string, vars Vars) (string, error) {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
144 delim_open := "{{"
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
145 delim_close := "}}"
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
146
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
147 out := &bytes.Buffer{}
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
148 for {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
149 if from := strings.Index(s, delim_open); from == -1 {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
150 out.WriteString(s)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
151 return out.String(), nil
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
152 } else {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
153 if to := strings.Index(s, delim_close); to == -1 {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
154 return "", fmt.Errorf("Close delim not found")
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
155 } else {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
156 out.WriteString(s[:from])
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
157 cmd := s[from+len(delim_open) : to]
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
158 s = s[to+len(delim_close):]
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
159 m := strings.Fields(cmd)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
160 if len(m) == 1 {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
161 if v, ok := vars[m[0]]; ok {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
162 out.WriteString(v)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
163 continue
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
164 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
165 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
166 if res, err := run(vars, m[0], m[1:]...); err == nil {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
167 out.WriteString(res)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
168 } else {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
169 fmt.Println(err)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
170 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
171 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
172 }
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
173 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
174 return s, nil
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
175 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
176
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
177 // Renders markdown with the given layout into html expanding all the macros
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
178 func buildMarkdown(path string, w io.Writer, vars Vars) error {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
179 v, body, err := getVars(path, vars)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
180 if err != nil {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
181 return err
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
182 }
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
183 content, err := render(body, v)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
184 if err != nil {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
185 return err
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
186 }
31
b2f491299cee dead end with template functions
zaitsev.serge
parents: 30
diff changeset
187 v["content"] = string(blackfriday.MarkdownCommon([]byte(content)))
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
188 if w == nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
189 out, err := os.Create(filepath.Join(PUBDIR, renameExt(path, "", ".html")))
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
190 if err != nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
191 return err
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
192 }
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
193 defer out.Close()
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
194 w = out
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
195 }
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
196 if strings.HasSuffix(v["layout"], ".amber") {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
197 return buildAmber(filepath.Join(ZSDIR, v["layout"]), w, v)
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
198 } else {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
199 return buildHTML(filepath.Join(ZSDIR, v["layout"]), w, v)
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
200 }
14
515078352442 moved html rendering into a separate function
zaitsev.serge
parents: 13
diff changeset
201 }
515078352442 moved html rendering into a separate function
zaitsev.serge
parents: 13
diff changeset
202
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
203 // Renders text file expanding all variable macros inside it
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
204 func buildHTML(path string, w io.Writer, vars Vars) error {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
205 v, body, err := getVars(path, vars)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
206 if err != nil {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
207 return err
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
208 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
209 if body, err = render(body, v); err != nil {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
210 return err
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
211 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
212 tmpl, err := template.New("").Delims("<%", "%>").Parse(body)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
213 if err != nil {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
214 return err
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
215 }
24
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
216 if w == nil {
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
217 f, err := os.Create(filepath.Join(PUBDIR, path))
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
218 if err != nil {
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
219 return err
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
220 }
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
221 defer f.Close()
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
222 w = f
14
515078352442 moved html rendering into a separate function
zaitsev.serge
parents: 13
diff changeset
223 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
224 return tmpl.Execute(w, vars)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
225 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
226
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
227 // Renders .amber file into .html
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
228 func buildAmber(path string, w io.Writer, vars Vars) error {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
229 v, body, err := getVars(path, vars)
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
230 if err != nil {
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
231 return err
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
232 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
233 a := amber.New()
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
234 if err := a.Parse(body); err != nil {
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
235 fmt.Println(body)
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
236 return err
24
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
237 }
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
238
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
239 t, err := a.Compile()
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
240 if err != nil {
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
241 return err
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
242 }
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
243
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
244 htmlBuf := &bytes.Buffer{}
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
245 if err := t.Execute(htmlBuf, v); err != nil {
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
246 return err
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
247 }
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
248
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
249 if body, err = render(string(htmlBuf.Bytes()), v); err != nil {
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
250 return err
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
251 }
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
252
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
253 if w == nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
254 f, err := os.Create(filepath.Join(PUBDIR, renameExt(path, ".amber", ".html")))
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
255 if err != nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
256 return err
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
257 }
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
258 defer f.Close()
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
259 w = f
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
260 }
34
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
261 _, err = io.WriteString(w, body)
ed40ca93db1e added explicit yaml separator, fixed amber compilation sequence
zaitsev.serge
parents: 33
diff changeset
262 return err
17
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
263 }
0214b1b5f5eb added amber and gcss compilers
zaitsev.serge
parents: 15
diff changeset
264
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
265 // Compiles .gcss into .css
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
266 func buildGCSS(path string, w io.Writer) error {
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
267 f, err := os.Open(path)
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
268 if err != nil {
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
269 return err
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
270 }
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
271 defer f.Close()
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
272
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
273 if w == nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
274 s := strings.TrimSuffix(path, ".gcss") + ".css"
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
275 css, err := os.Create(filepath.Join(PUBDIR, s))
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
276 if err != nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
277 return err
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
278 }
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
279 defer css.Close()
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
280 w = css
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
281 }
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
282 _, err = gcss.Compile(w, f)
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
283 return err
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
284 }
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
285
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
286 // Copies file as is from path to writer
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
287 func buildRaw(path string, w io.Writer) error {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
288 in, err := os.Open(path)
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
289 if err != nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
290 return err
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
291 }
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
292 defer in.Close()
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
293 if w == nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
294 if out, err := os.Create(filepath.Join(PUBDIR, path)); err != nil {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
295 return err
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
296 } else {
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
297 defer out.Close()
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
298 w = out
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
299 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
300 }
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
301 _, err = io.Copy(w, in)
7
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
302 return err
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
303 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
304
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
305 func build(path string, w io.Writer, vars Vars) error {
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
306 ext := filepath.Ext(path)
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
307 if ext == ".md" || ext == ".mkd" {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
308 return buildMarkdown(path, w, vars)
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
309 } else if ext == ".html" || ext == ".xml" {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
310 return buildHTML(path, w, vars)
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
311 } else if ext == ".amber" {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
312 return buildAmber(path, w, vars)
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
313 } else if ext == ".gcss" {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
314 return buildGCSS(path, w)
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
315 } else {
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
316 return buildRaw(path, w)
18
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
317 }
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
318 }
ae3116ea938b started migration to go templates
zaitsev.serge
parents: 17
diff changeset
319
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
320 func buildAll(watch bool) {
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
321 lastModified := time.Unix(0, 0)
7
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
322 modified := false
19
802b96e67bae added global variables, added default date for markdown
zaitsev.serge
parents: 18
diff changeset
323
802b96e67bae added global variables, added default date for markdown
zaitsev.serge
parents: 18
diff changeset
324 vars := globals()
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
325 for {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
326 os.Mkdir(PUBDIR, 0755)
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
327 err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
328 // ignore hidden files and directories
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
329 if filepath.Base(path)[0] == '.' || strings.HasPrefix(path, ".") {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
330 return nil
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
331 }
30
526ba3c717ba added check for fs walk errors
zaitsev.serge
parents: 29
diff changeset
332 // inform user about fs walk errors, but continue iteration
526ba3c717ba added check for fs walk errors
zaitsev.serge
parents: 29
diff changeset
333 if err != nil {
526ba3c717ba added check for fs walk errors
zaitsev.serge
parents: 29
diff changeset
334 log.Println("ERROR:", err)
526ba3c717ba added check for fs walk errors
zaitsev.serge
parents: 29
diff changeset
335 return nil
526ba3c717ba added check for fs walk errors
zaitsev.serge
parents: 29
diff changeset
336 }
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
337
7
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
338 if info.IsDir() {
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
339 os.Mkdir(filepath.Join(PUBDIR, path), 0755)
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
340 return nil
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
341 } else if info.ModTime().After(lastModified) {
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
342 if !modified {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
343 // First file in this build cycle is about to be modified
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
344 run(vars, "prehook")
7
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
345 modified = true
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
346 }
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
347 log.Println("build:", path)
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
348 return build(path, nil, vars)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
349 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
350 return nil
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
351 })
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
352 if err != nil {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
353 log.Println("ERROR:", err)
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
354 }
7
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
355 if modified {
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
356 // At least one file in this build cycle has been modified
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
357 run(vars, "posthook")
7
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
358 modified = false
11073a30f71f simplified build process, added pre and post build hooks
zaitsev.serge
parents: 6
diff changeset
359 }
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
360 if !watch {
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
361 break
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
362 }
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
363 lastModified = time.Now()
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
364 time.Sleep(1 * time.Second)
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
365 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
366 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
367
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
368 func init() {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
369 // prepend .zs to $PATH, so plugins will be found before OS commands
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
370 p := os.Getenv("PATH")
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
371 p = ZSDIR + ":" + p
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
372 os.Setenv("PATH", p)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
373 }
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
374
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
375 func main() {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
376 if len(os.Args) == 1 {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
377 fmt.Println(os.Args[0], "<command> [args]")
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
378 return
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
379 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
380 cmd := os.Args[1]
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
381 args := os.Args[2:]
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
382 switch cmd {
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
383 case "build":
24
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
384 if len(args) == 0 {
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
385 buildAll(false)
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
386 } else if len(args) == 1 {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
387 if err := build(args[0], os.Stdout, globals()); err != nil {
24
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
388 fmt.Println("ERROR: " + err.Error())
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
389 }
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
390 } else {
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
391 fmt.Println("ERROR: too many arguments")
d052f3a44195 fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 23
diff changeset
392 }
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
393 case "watch":
23
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
394 buildAll(true)
40f55059fbfa fixed output file names in html pages, fixed amber function bindings, replaced print command with build, fixed plugin functions, implemented zs and exec functions
zaitsev.serge
parents: 22
diff changeset
395 case "var":
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
396 if len(args) == 0 {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
397 fmt.Println("var: filename expected")
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
398 } else {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
399 s := ""
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
400 if vars, _, err := getVars(args[0], globals()); err != nil {
32
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
401 fmt.Println("var: " + err.Error())
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
402 } else {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
403 if len(args) > 1 {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
404 for _, a := range args[1:] {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
405 s = s + vars[a] + "\n"
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
406 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
407 } else {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
408 for k, v := range vars {
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
409 s = s + k + ":" + v + "\n"
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
410 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
411 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
412 }
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
413 fmt.Println(strings.TrimSpace(s))
75822e38c3e0 removed funcs, ext and utils
zaitsev.serge
parents: 31
diff changeset
414 }
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
415 default:
33
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
416 if s, err := run(globals(), cmd, args...); err != nil {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
417 fmt.Println(err)
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
418 } else {
e3c902a7380d rewritten using zs templates, allowing go templates using <% %> delimiters
zaitsev.serge
parents: 32
diff changeset
419 fmt.Println(s)
0
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
420 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
421 }
45a9e1fac18e initial commit
zaitsev.serge
parents:
diff changeset
422 }