From bfdc95f9852c245ab753dbfb5433380eb4144e69 Mon Sep 17 00:00:00 2001 From: Martin Angers Date: Sat, 13 Jul 2013 23:09:53 -0400 Subject: [PATCH] cleanup todos --- gen.go | 7 ++----- watch.go | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gen.go b/gen.go index aa7dc49..785396e 100644 --- a/gen.go +++ b/gen.go @@ -13,9 +13,6 @@ import ( "github.com/eknkc/amber" ) -// TODO : All fatal errors should be non-stopping errors when generating the site. Allows -// for corrections of the code, then re-triggering the generation. - var ( postTpl *template.Template postTplNm = "post.amber" @@ -116,7 +113,7 @@ func generateSite() error { } func generateRss(td *TemplateData) error { - r := NewRss(td.SiteName, "", Options.BaseURL) + r := NewRss(td.SiteName, td.TagLine, Options.BaseURL) base, err := url.Parse(Options.BaseURL) if err != nil { return fmt.Errorf("error parsing base URL: %s", err) @@ -140,7 +137,7 @@ func generateFile(td *TemplateData, idx bool) error { } defer fw.Close() - // If this is the newer file, also save as index.html + // If this is the newest file, also save as index.html w = fw if idx { idxw, err := os.Create(filepath.Join(PublicDir, "index.html")) diff --git a/watch.go b/watch.go index f940d45..6663614 100644 --- a/watch.go +++ b/watch.go @@ -41,8 +41,7 @@ func watch(w *fsnotify.Watcher) { var delay <-chan time.Time for { select { - case ev := <-w.Event: - log.Println("watch event ", ev) + case <-w.Event: // Regenerate the files after the delay, reset the delay if an event is triggered // in the meantime delay = time.After(watchEventDelay) @@ -51,9 +50,10 @@ func watch(w *fsnotify.Watcher) { log.Println("WATCH ERROR ", err) case <-delay: - log.Print("trigger generation of site") if err := generateSite(); err != nil { - log.Println("ERROR ", err) + log.Println("ERROR generating site: ", err) + } else { + log.Println("site generated") } } }