bug fix #175

realize.go

@@ -795,7 +795,7 @@ func setup(c *cli.Context) (err error) {
 							Resolve: func(d interact.Context) bool {
 								val, _ := d.Ans().Bool()
 								if val {
-									r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore.Paths = r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore.Paths[:len(r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore.Paths)-1]
+									r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore = r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore[:len(r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore)-1]
 								}
 								return val
 							},
@@ -815,7 +815,7 @@ func setup(c *cli.Context) (err error) {
 									if err != nil {
 										return d.Err()
 									}
-									r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore.Paths = append(r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore.Paths, val)
+									r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore = append(r.Schema.Projects[len(r.Schema.Projects)-1].Watcher.Ignore, val)
 									d.Reload()
 									return nil
 								},

realize/projects.go

@@ -30,10 +30,10 @@ type Watch struct {
 	Paths   []string  `yaml:"paths" json:"paths"`
 	Scripts []Command `yaml:"scripts,omitempty" json:"scripts,omitempty"`
 	Hidden  bool      `yaml:"hidden,omitempty" json:"hidden,omitempty"`
-	Ignore  Ignore    `yaml:"ignore,omitempty" json:"ignore,omitempty"`
+	Ignore  []string  `yaml:"ignored_paths,omitempty" json:"ignored_paths,omitempty"`
 }
 
-type Ignore struct{
+type Ignore struct {
 	Exts  []string `yaml:"exts,omitempty" json:"exts,omitempty"`
 	Paths []string `yaml:"paths,omitempty" json:"paths,omitempty"`
 }
@@ -69,7 +69,7 @@ type Project struct {
 }
 
 // Last is used to save info about last file changed
-type last struct{
+type last struct {
 	file string
 	time time.Time
 }
@@ -352,28 +352,28 @@ func (p *Project) Validate(path string, fcheck bool) bool {
 	}
 	// check for a valid ext or path
 	if e := ext(path); e != "" {
-		if len(p.Watcher.Exts) == 0{
+		if len(p.Watcher.Exts) == 0 {
 			return false
 		}
 		// check ignored
-		for _, v := range p.Watcher.Ignore.Exts {
+		for _, v := range p.Watcher.Ignore {
 			if v == e {
 				return false
 			}
 		}
 		// supported extensions
-		for index, v := range p.Watcher.Exts{
+		for index, v := range p.Watcher.Exts {
 			if e == v {
 				break
 			}
-			if index == len(p.Watcher.Exts)-1{
+			if index == len(p.Watcher.Exts)-1 {
 				return false
 			}
 		}
 	}
 	separator := string(os.PathSeparator)
 	// supported paths
-	for _, v := range p.Watcher.Ignore.Paths {
+	for _, v := range p.Watcher.Ignore {
 		s := append([]string{p.Path}, strings.Split(v, separator)...)
 		abs, _ := filepath.Abs(filepath.Join(s...))
 		if path == abs || strings.HasPrefix(path, abs+separator) {
@@ -383,7 +383,7 @@ func (p *Project) Validate(path string, fcheck bool) bool {
 	// file check
 	if fcheck {
 		fi, err := os.Stat(path)
-		if err != nil || fi.Mode()&os.ModeSymlink != 0 || !fi.IsDir() && ext(path) == "" || fi.Size() <= 0{
+		if err != nil || fi.Mode()&os.ModeSymlink != 0 || !fi.IsDir() && ext(path) == "" || fi.Size() <= 0 {
 			return false
 		}
 	}
@@ -495,7 +495,7 @@ func (p *Project) walk(path string, info os.FileInfo, err error) error {
 		result := p.watcher.Walk(path, p.init)
 		if result != "" {
 			if p.parent.Settings.Recovery.Index {
-				log.Println("Indexing",path)
+				log.Println("Indexing", path)
 			}
 			p.tools(p.stop, path, info)
 			if info.IsDir() {

realize/projects_test.go

@@ -129,9 +129,7 @@ func TestProject_Validate(t *testing.T) {
 		parent: &r,
 		Watcher: Watch{
 			Exts:   []string{},
-			Ignore: Ignore{
+			Ignore: []string{"/test/ignore"},
-				Paths:[]string{"/test/ignore"},
-			},
 		},
 	})
 	for i, v := range data {

realize/schema.go

@@ -68,9 +68,7 @@ func (s *Schema) New(c *cli.Context) Project {
 		Args: params(c),
 		Watcher: Watch{
 			Paths:  []string{"/"},
-			Ignore: Ignore{
+			Ignore: []string{".git", ".realize", "vendor"},
-				Paths:[]string{".git", ".realize", "vendor"},
-			},
 			Exts:   []string{"go"},
 		},
 	}

realize/server.go

@@ -14,7 +14,6 @@ import (
 	"os/exec"
 	"runtime"
 	"strconv"
-	"github.com/go-siris/siris/core/errors"
 )
 
 // Dafault host and port

realize/settings.go

@@ -62,7 +62,7 @@ type Resource struct {
 }
 
 // Set legacy watcher with an interval
-func (l *Legacy) Set(status bool, interval int){
+func (l *Legacy) Set(status bool, interval int) {
 	l.Force = true
 	l.Interval = time.Duration(interval) * time.Second
 }

realize/tools.go

@@ -135,7 +135,7 @@ func (t *Tool) Exec(path string, stop <-chan bool) (response Response) {
 		cmd.Stderr = &stderr
 		// Start command
 		err := cmd.Start()
-		if err != nil{
+		if err != nil {
 			response.Name = t.name
 			response.Err = err
 			return