a
/
realize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validate method fixed

This commit is contained in:
asoseil 2018-01-09 01:28:20 +01:00
parent 930f2a3562
commit c58c002c7e
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
realize/projects.go
View File

@ -294,7 +294,7 @@ L:
case fsnotify.Chmod: case fsnotify.Chmod:
case fsnotify.Remove: case fsnotify.Remove:
p.watcher.Remove(event.Name) p.watcher.Remove(event.Name)
if p.Validate(event.Name, false) { if p.Validate(event.Name, false) && ext(event.Name) != "" {
// stop and restart // stop and restart
close(p.stop) close(p.stop)
p.stop = make(chan bool) p.stop = make(chan bool)
@ -320,7 +320,6 @@ L:
p.lastTime = time.Now().Truncate(time.Second) p.lastTime = time.Now().Truncate(time.Second)
p.lastFile = event.Name p.lastFile = event.Name
} }
} }
} }
} }
@ -349,10 +348,6 @@ func (p *Project) Validate(path string, fcheck bool) bool {
if !array(e, p.Watcher.Exts) { if !array(e, p.Watcher.Exts) {
return false return false
} }
}else{
if !array(filepath.Base(path), p.Watcher.Paths) {
return false
}
} }
separator := string(os.PathSeparator) separator := string(os.PathSeparator)
// supported paths // supported paths
@ -366,7 +361,7 @@ func (p *Project) Validate(path string, fcheck bool) bool {
// file check // file check
if fcheck { if fcheck {
fi, err := os.Stat(path) fi, err := os.Stat(path)
if !fi.IsDir() && ext(path) == ""{ if !fi.IsDir() && ext(path) == "" {
return false return false
} }
if err != nil { if err != nil {
@ -432,7 +427,7 @@ func (p *Project) tools(stop <-chan bool, path string, fi os.FileInfo) {
return return
case r := <-result: case r := <-result:
if r.Err != nil { if r.Err != nil {
if fi.IsDir(){ if fi.IsDir() {
path, _ = filepath.Abs(fi.Name()) path, _ = filepath.Abs(fi.Name())
} }
msg = fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Bold(r.Name), Red.Regular("there are some errors in"), ":", Magenta.Bold(path)) msg = fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Bold(r.Name), Red.Regular("there are some errors in"), ":", Magenta.Bold(path))
@ -577,7 +572,7 @@ func (p *Project) run(path string, stream chan Response, stop <-chan bool) (err
name := filepath.Base(path) name := filepath.Base(path)
if path == "." && p.Tools.Run.Dir == "" { if path == "." && p.Tools.Run.Dir == "" {
name = filepath.Base(Wdir()) name = filepath.Base(Wdir())
}else{ } else {
name = filepath.Base(dirPath) name = filepath.Base(dirPath)
} }
path = filepath.Join(dirPath, name) path = filepath.Join(dirPath, name)

2
realize/projects_test.go
View File

@ -130,7 +130,7 @@ func TestProject_Validate(t *testing.T) {
}, },
}) })
for i, v := range data { for i, v := range data {
if r.Projects[0].Validate(i, true) != v { if r.Projects[0].Validate(i, false) != v {
t.Error("Unexpected error", i, "expected", v) t.Error("Unexpected error", i, "expected", v)
} }
} }