From 6ba5a47b0ea5d32172d7fcd7d20f0eff6d939ae3 Mon Sep 17 00:00:00 2001 From: asoseil Date: Sun, 15 Apr 2018 19:26:18 +0200 Subject: [PATCH] bug fix #175 --- realize.go | 4 +-- realize/projects.go | 60 ++++++++++++++++++++-------------------- realize/projects_test.go | 8 ++---- realize/schema.go | 4 +-- realize/server.go | 1 - realize/settings.go | 2 +- realize/tools.go | 2 +- 7 files changed, 38 insertions(+), 43 deletions(-) diff --git a/realize.go b/realize.go index 0b886ea..8bd6e23 100644 --- a/realize.go +++ b/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 }, diff --git a/realize/projects.go b/realize/projects.go index 967bb41..425c34a 100644 --- a/realize/projects.go +++ b/realize/projects.go @@ -30,12 +30,12 @@ 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{ - Exts []string `yaml:"exts,omitempty" json:"exts,omitempty"` - Paths []string `yaml:"paths,omitempty" json:"paths,omitempty"` +type Ignore struct { + Exts []string `yaml:"exts,omitempty" json:"exts,omitempty"` + Paths []string `yaml:"paths,omitempty" json:"paths,omitempty"` } // Command fields @@ -49,27 +49,27 @@ type Command struct { // Project info type Project struct { - parent *Realize - watcher FileWatcher - stop chan bool - exit chan os.Signal - paths []string - last last - files int64 - folders int64 - init bool - Name string `yaml:"name" json:"name"` - Path string `yaml:"path" json:"path"` - Env map[string]string `yaml:"env,omitempty" json:"env,omitempty"` - Args []string `yaml:"args,omitempty" json:"args,omitempty"` - Tools Tools `yaml:"commands" json:"commands"` - Watcher Watch `yaml:"watcher" json:"watcher"` - Buffer Buffer `yaml:"-" json:"buffer"` + parent *Realize + watcher FileWatcher + stop chan bool + exit chan os.Signal + paths []string + last last + files int64 + folders int64 + init bool + Name string `yaml:"name" json:"name"` + Path string `yaml:"path" json:"path"` + Env map[string]string `yaml:"env,omitempty" json:"env,omitempty"` + Args []string `yaml:"args,omitempty" json:"args,omitempty"` + Tools Tools `yaml:"commands" json:"commands"` + Watcher Watch `yaml:"watcher" json:"watcher"` + Buffer Buffer `yaml:"-" json:"buffer"` ErrPattern string `yaml:"pattern,omitempty" json:"pattern,omitempty"` } // 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 } } @@ -477,8 +477,8 @@ func (p *Project) cmd(stop <-chan bool, flag string, global bool) { case <-done: return case r := <-result: - msg = fmt.Sprintln(p.pname(p.Name, 5), ":", Green.Bold("Command"), Green.Bold("\"")+r.Name+Green.Bold("\"")) - if r.Err != nil { + msg = fmt.Sprintln(p.pname(p.Name, 5), ":", Green.Bold("Command"), Green.Bold("\"")+r.Name+Green.Bold("\"")) + if r.Err != nil { out = BufferOut{Time: time.Now(), Text: r.Err.Error(), Type: flag} p.stamp("error", out, msg, fmt.Sprint(Red.Regular(r.Err.Error()))) } else { @@ -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() { diff --git a/realize/projects_test.go b/realize/projects_test.go index d1e5b6d..ae24f27 100644 --- a/realize/projects_test.go +++ b/realize/projects_test.go @@ -128,15 +128,13 @@ func TestProject_Validate(t *testing.T) { r.Projects = append(r.Projects, Project{ parent: &r, Watcher: Watch{ - Exts: []string{}, - Ignore: Ignore{ - Paths:[]string{"/test/ignore"}, - }, + Exts: []string{}, + Ignore: []string{"/test/ignore"}, }, }) for i, v := range data { result := r.Projects[0].Validate(i, false) - if result != v { + if result != v { t.Error("Unexpected error", i, "expected", v, result) } } diff --git a/realize/schema.go b/realize/schema.go index 37a1c71..36cedf1 100644 --- a/realize/schema.go +++ b/realize/schema.go @@ -68,9 +68,7 @@ func (s *Schema) New(c *cli.Context) Project { Args: params(c), Watcher: Watch{ Paths: []string{"/"}, - Ignore: Ignore{ - Paths:[]string{".git", ".realize", "vendor"}, - }, + Ignore: []string{".git", ".realize", "vendor"}, Exts: []string{"go"}, }, } diff --git a/realize/server.go b/realize/server.go index 250f118..114ec73 100644 --- a/realize/server.go +++ b/realize/server.go @@ -14,7 +14,6 @@ import ( "os/exec" "runtime" "strconv" - "github.com/go-siris/siris/core/errors" ) // Dafault host and port diff --git a/realize/settings.go b/realize/settings.go index 6859801..0f2f327 100644 --- a/realize/settings.go +++ b/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 } diff --git a/realize/tools.go b/realize/tools.go index 3d9bde1..1efe09b 100644 --- a/realize/tools.go +++ b/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