cleaning up code that runs hugo

client.go

@@ -61,18 +61,21 @@ func (ch *CaddyHugo) renderDraft(es *editSession) error {
 		return fmt.Errorf("error starting hugo: %v", err)
 	}
 
+	renderer := HugoCmdRenderer{
+		TmpDir:   es.tmpdir,
+		SrcDir:   ch.Dir,
+		Filename: es.filename,
+	}
+
 	go func() {
 		ticker := time.NewTicker(WebsocketFileTicker)
 		idleTicks := 0
+		closeTicks := int(IdleWebsocketTimeout / WebsocketFileTicker)
 
 		defer func() {
-			err := hugoCmd.Process.Signal(os.Interrupt)
+			err = renderer.Stop()
 			if err != nil {
-				fmt.Println("error signaling to hugo:", err)
+				fmt.Println("error stopping hugo:", err)
-			}
-			err = hugoCmd.Wait()
-			if err != nil {
-				fmt.Println("error waiting for hugo:", err)
 			}
 		}()
 
@@ -80,15 +83,21 @@ func (ch *CaddyHugo) renderDraft(es *editSession) error {
 			<-ticker.C
 			ch.mtx.Lock()
 
-			err := ioutil.WriteFile(es.filename, []byte(es.doc.Contents()), 0644)
+			// render if there are connected clients OR if we haven't
-			if err != nil {
+			// been idle for very long.
-				fmt.Println("error saving document contents:", err)
+			if es.clients > 0 || idleTicks < 2 {
+				err := renderer.Render(es.doc.Contents())
+				if err != nil {
+					fmt.Println("error saving document contents:", err)
+				}
 			}
 
+			// count up idle time and possibly close down
 			if es.clients == 0 {
 				idleTicks++
-				idleTime := time.Duration(idleTicks) * WebsocketFileTicker
+
-				if idleTime >= IdleWebsocketTimeout {
+				if idleTicks >= closeTicks {
+					idleTime := time.Duration(idleTicks) * WebsocketFileTicker
 					err := ch.Publish()
 					fmt.Printf("idle for %v, quitting\n", idleTime)
 					if err != nil {
@@ -100,8 +109,6 @@ func (ch *CaddyHugo) renderDraft(es *editSession) error {
 					delete(ch.docs, es.filename)
 					ch.mtx.Unlock()
 					return
-				} else {
-					fmt.Println("idle for", idleTime)
 				}
 			} else {
 				idleTicks = 0

hugo.go

@@ -0,0 +1,67 @@
+package caddyhugo
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"sync"
+)
+
+type HugoInteractor interface {
+	Render(srcdir, workdir string) HugoRenderer
+}
+
+type HugoRenderer interface {
+	Start() error
+	Stop() error
+}
+
+type HugoCmdRenderer struct {
+	SrcDir   string
+	TmpDir   string
+	Filename string
+
+	cmd *exec.Cmd
+	mtx sync.Mutex
+}
+
+func (hcr *HugoCmdRenderer) Render(contents string) error {
+	err := ioutil.WriteFile(hcr.Filename, []byte(contents), 0644)
+	return err
+}
+
+func (hcr *HugoCmdRenderer) Start() error {
+	hcr.mtx.Lock()
+	defer hcr.mtx.Unlock()
+
+	hcr.cmd = exec.Command("hugo", "--watch", "-D", "-d", hcr.TmpDir)
+	hcr.cmd.Dir = hcr.TmpDir
+
+	err := hcr.cmd.Start()
+	if err != nil {
+		return fmt.Errorf("error starting hugo: %v", err)
+	}
+
+	return nil
+}
+
+func (hcr *HugoCmdRenderer) Stop() error {
+	hcr.mtx.Lock()
+	defer hcr.mtx.Unlock()
+
+	if hcr.cmd == nil {
+		return nil
+	}
+
+	err := hcr.cmd.Process.Signal(os.Interrupt)
+	if err != nil {
+		return err
+	}
+	err = hcr.cmd.Wait()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}