Merge pull request #212 from Shopify/ignore_remote_files

Ignored files apply to download

commands/watch.go

@@ -28,18 +28,13 @@ func buildForeman(client kit.ThemeClient, args Args, config kit.Configuration) *
 			os.Chtimes(args.NotifyFile, time.Now(), time.Now())
 		}
 	}
-	foreman.JobQueue = constructFileWatcher(args.Directory, config)
-	foreman.Restart()
-	return foreman
-}
-
-func constructFileWatcher(dir string, config kit.Configuration) chan kit.AssetEvent {
-	filter := kit.NewEventFilterFromPatternsAndFiles(config.IgnoredFiles, config.Ignores)
-	watcher, err := kit.NewFileWatcher(dir, true, filter)
+	var err error
+	foreman.JobQueue, err = client.NewFileWatcher(args.Directory)
 	if err != nil {
 		kit.NotifyError(err)
 	}
-	return watcher
+	foreman.Restart()
+	return foreman
 }
 
 func spawnWorker(queue chan kit.AssetEvent, client kit.ThemeClient) {

kit/event_filter.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 
 	"github.com/ryanuber/go-glob"
+
+	"github.com/Shopify/themekit/theme"
 )
 
 const configurationFilename = "config\\.yml"
@@ -83,6 +85,16 @@ func NewEventFilterFromPatternsAndFiles(patterns []string, files []string) Event
 	return NewEventFilterFromReaders(allReaders)
 }
 
+func (e EventFilter) FilterAssets(assets []theme.Asset) []theme.Asset {
+	filteredAssets := []theme.Asset{}
+	for _, asset := range assets {
+		if !e.MatchesFilter(asset.Key) {
+			filteredAssets = append(filteredAssets, asset)
+		}
+	}
+	return filteredAssets
+}
+
 // Filter ... TODO
 func (e EventFilter) Filter(events chan string) chan string {
 	filtered := make(chan string)

kit/theme_client.go

@@ -86,16 +86,21 @@ func (t ThemeClient) GetConfiguration() Configuration {
 	return t.config
 }
 
-// LeakyBucket ... TODO
+// LeakyBucket creates a leaky bucket using the theme clients bucket size and refill rate
 func (t ThemeClient) LeakyBucket() *LeakyBucket {
 	return NewLeakyBucket(t.config.BucketSize, t.config.RefillRate, 1)
 }
 
-// NewForeman ... TODO
+// NewForeman creates a foreman job runner using a leaky bucket using the theme clients config
 func (t ThemeClient) NewForeman() *Foreman {
 	return NewForeman(t.LeakyBucket())
 }
 
+// NewFileWatcher creates a new filewatcher using the theme clients file filter
+func (t ThemeClient) NewFileWatcher(dir string) (chan AssetEvent, error) {
+	return NewFileWatcher(dir, true, t.filter)
+}
+
 func (t ThemeClient) ErrorMessage(content string, args ...interface{}) {
 	t.Message(RedText(fmt.Sprintf(content, args...)))
 }
@@ -140,7 +145,7 @@ func (t ThemeClient) AssetList() []theme.Asset {
 
 	sort.Sort(theme.ByAsset(assets["assets"]))
 
-	return ignoreCompiledAssets(assets["assets"])
+	return t.filter.FilterAssets(ignoreCompiledAssets(assets["assets"]))
 }
 
 // LocalAssets ... TODO