Changeset 8 in code

Timestamp:

Dec 5, 2014, 7:03:33 PM (11 years ago)

Author:

zaitsev.serge

Message:

simplified build process, added pre and post build hooks

File:

• trunk/zs.go (modified) (5 diffs)

trunk/zs.go

@@ -38 +38 @@
                 "file":   path,
                 "url":    url,
-                "outdir": PUBDIR,
                 "output": filepath.Join(PUBDIR, url),
                 "layout": "index.html",
@@ -90 +89 @@
 
 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()...)
-        for k, v := range vars {
-                env = append(env, "ZS_"+strings.ToUpper(k)+"="+v)
+        if vars != nil {
+                for k, v := range vars {
+                        env = append(env, "ZS_"+strings.ToUpper(k)+"="+v)
+                }
         }
         return env
@@ -160 +161 @@
 }
 
-func copyFile(path string) error {
-        if in, err := os.Open(path); err != nil {
-                return err
-        } else {
+func copyFile(path string) (err error) {
+        var in, out *os.File
+        if in, err = os.Open(path); err == nil {
                 defer in.Close()
-                if stat, err := in.Stat(); 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 {
+                if out, err = os.Create(filepath.Join(PUBDIR, path)); err == nil {
                         defer out.Close()
                         _, err = io.Copy(out, in)
-                        return err
-                }
-        }
+                }
+        }
+        return err
 }
 
 func buildAll(once bool) {
         lastModified := time.Unix(0, 0)
+        modified := false
         for {
                 os.Mkdir(PUBDIR, 0755)
@@ -197 +184 @@
                         }
 
-                        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)
                                 if ext == ".md" || ext == "mkd" {
@@ -211 +206 @@
                 if err != nil {
                         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()