Use improved EventFilter instantiation

This will use both the provided ignorefiles as well as the ignore_files blacklist.
Shopify · Jan 12, 2015 · 58bf4e8 · 58bf4e8
1 parent 90456d1
commit 58bf4e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cmd/theme-manipulate/main.go b/cmd/theme-manipulate/main.go
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"github.com/csaunders/phoenix"
-	"log"
 	"os"
 	"strings"
 )
@@ -66,7 +65,7 @@ func main() {
 
 	config, err := phoenix.LoadConfigurationFromCurrentDirectory()
 	if err != nil {
-		log.Fatal(err)
+		phoenix.HaltAndCatchFire(err)
 	}
 
 	client := phoenix.NewThemeClient(config)

diff --git a/cmd/theme-watch/file_watcher.go b/cmd/theme-watch/file_watcher.go
@@ -126,7 +126,7 @@ func convertFsEvents(events chan fsnotify.Event, filter phoenix.EventFilter) cha
 func watchDirRecur(dir string, filter phoenix.EventFilter) (results chan phoenix.AssetEvent, err error) {
 	results = make(chan phoenix.AssetEvent)
 	err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-		if info.IsDir() {
+		if info.IsDir() && !filter.MatchesFilter(path) {
 			channel, _ := watchDir(path, filter)
 			go func() {
 				for {