mirror of
https://git.mills.io/prologic/zs
synced 2025-02-19 21:43:14 +03:00
simplified build process, added pre and post build hooks
This commit is contained in:
parent
08b4928c10
commit
cefe57f6d8
48
zs.go
48
zs.go
@ -37,7 +37,6 @@ func md(path, s string) (map[string]string, string) {
|
|||||||
v := map[string]string{
|
v := map[string]string{
|
||||||
"file": path,
|
"file": path,
|
||||||
"url": url,
|
"url": url,
|
||||||
"outdir": PUBDIR,
|
|
||||||
"output": filepath.Join(PUBDIR, url),
|
"output": filepath.Join(PUBDIR, url),
|
||||||
"layout": "index.html",
|
"layout": "index.html",
|
||||||
}
|
}
|
||||||
@ -89,11 +88,13 @@ func render(s string, vars map[string]string, eval EvalFn) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func env(vars map[string]string) []string {
|
func env(vars map[string]string) []string {
|
||||||
env := []string{"ZS=" + os.Args[0]}
|
env := []string{"ZS=" + os.Args[0], "ZS_OUTDIR=" + PUBDIR}
|
||||||
env = append(env, os.Environ()...)
|
env = append(env, os.Environ()...)
|
||||||
|
if vars != nil {
|
||||||
for k, v := range vars {
|
for k, v := range vars {
|
||||||
env = append(env, "ZS_"+strings.ToUpper(k)+"="+v)
|
env = append(env, "ZS_"+strings.ToUpper(k)+"="+v)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return env
|
return env
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,35 +160,21 @@ func buildMarkdown(path string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func copyFile(path string) error {
|
func copyFile(path string) (err error) {
|
||||||
if in, err := os.Open(path); err != nil {
|
var in, out *os.File
|
||||||
return err
|
if in, err = os.Open(path); err == nil {
|
||||||
} else {
|
|
||||||
defer in.Close()
|
defer in.Close()
|
||||||
if stat, err := in.Stat(); err != nil {
|
if out, err = os.Create(filepath.Join(PUBDIR, path)); err == nil {
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
// Directory?
|
|
||||||
if stat.Mode().IsDir() {
|
|
||||||
os.Mkdir(filepath.Join(PUBDIR, path), 0755)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if !stat.Mode().IsRegular() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if out, err := os.Create(filepath.Join(PUBDIR, path)); err != nil {
|
|
||||||
return err
|
|
||||||
} else {
|
|
||||||
defer out.Close()
|
defer out.Close()
|
||||||
_, err = io.Copy(out, in)
|
_, err = io.Copy(out, in)
|
||||||
|
}
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildAll(once bool) {
|
func buildAll(once bool) {
|
||||||
lastModified := time.Unix(0, 0)
|
lastModified := time.Unix(0, 0)
|
||||||
|
modified := false
|
||||||
for {
|
for {
|
||||||
os.Mkdir(PUBDIR, 0755)
|
os.Mkdir(PUBDIR, 0755)
|
||||||
err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
|
err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
|
||||||
@ -196,7 +183,15 @@ func buildAll(once bool) {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if info.ModTime().After(lastModified) {
|
if info.IsDir() {
|
||||||
|
os.Mkdir(filepath.Join(PUBDIR, path), 0755)
|
||||||
|
return nil
|
||||||
|
} else if info.ModTime().After(lastModified) {
|
||||||
|
if !modified {
|
||||||
|
// About to be modified, so run pre-build hook
|
||||||
|
run(filepath.Join(ZSDIR, "pre"), []string{}, nil, nil)
|
||||||
|
modified = true
|
||||||
|
}
|
||||||
ext := filepath.Ext(path)
|
ext := filepath.Ext(path)
|
||||||
if ext == ".md" || ext == "mkd" {
|
if ext == ".md" || ext == "mkd" {
|
||||||
log.Println("mkd: ", path)
|
log.Println("mkd: ", path)
|
||||||
@ -211,6 +206,11 @@ func buildAll(once bool) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("ERROR:", err)
|
log.Println("ERROR:", err)
|
||||||
}
|
}
|
||||||
|
if modified {
|
||||||
|
// Something was modified, so post-build hook
|
||||||
|
run(filepath.Join(ZSDIR, "post"), []string{}, nil, nil)
|
||||||
|
modified = false
|
||||||
|
}
|
||||||
lastModified = time.Now()
|
lastModified = time.Now()
|
||||||
if once {
|
if once {
|
||||||
break
|
break
|
||||||
|
Loading…
x
Reference in New Issue
Block a user