From 772e5676f75efeef7fc1f73081c9834fa482aa88 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2013 12:51:26 +0800 Subject: [PATCH 1/5] Fixed bug: repeat build in Mac OS, change to check file ModTime insetad of event time --- watch.go | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/watch.go b/watch.go index 1ce8d64..cba403a 100644 --- a/watch.go +++ b/watch.go @@ -14,7 +14,7 @@ import ( var ( cmd *exec.Cmd state sync.Mutex - eventTime = make(map[string]time.Time) + eventTime = make(map[string]int64) ) func NewWatcher(paths []string) { @@ -37,15 +37,23 @@ func NewWatcher(paths []string) { continue } - if t, ok := eventTime[e.Name]; ok { - // if 500ms change many times, then ignore it. - // for liteide often gofmt code after save. - if t.Add(time.Millisecond * 500).After(time.Now()) { - colorLog("[SKIP] %s\n", e.String()) - isbuild = false - } + mt := getFileModTime(e.Name) + if t := eventTime[e.Name]; mt == t { + colorLog("[SKIP] %s\n", e.String()) + isbuild = false } - eventTime[e.Name] = time.Now() + + // if t, ok := eventTime[e.Name]; ok { + // // if 500ms change many times, then ignore it. + // // for liteide often gofmt code after save. + // if t.Add(time.Millisecond * 500).After(time.Now()) { + // colorLog("[SKIP] %s\n", e.String()) + // isbuild = false + // } + // } + + eventTime[e.Name] = mt + fmt.Println(mt) if isbuild { colorLog("[EVEN] %s\n", e) @@ -68,6 +76,23 @@ func NewWatcher(paths []string) { } +// getFileModTime retuens unix timestamp of `os.File.ModTime` by given path. +func getFileModTime(path string) int64 { + f, err := os.Open(path) + if err != nil { + colorLog("[ERRO] Fail to open file[ %s ]", err) + return time.Now().Unix() + } + + fi, err := f.Stat() + if err != nil { + colorLog("[ERRO] Fail to get file information[ %s ]", err) + return time.Now().Unix() + } + + return fi.ModTime().Unix() +} + func Autobuild() { state.Lock() defer state.Unlock() From bf33c2b05c3daa979fa96f924569fbea9a8100e1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2013 12:51:48 +0800 Subject: [PATCH 2/5] Fixed bug: repeat build in Mac OS, change to check file ModTime insetad of event time --- watch.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/watch.go b/watch.go index cba403a..ece85da 100644 --- a/watch.go +++ b/watch.go @@ -43,15 +43,6 @@ func NewWatcher(paths []string) { isbuild = false } - // if t, ok := eventTime[e.Name]; ok { - // // if 500ms change many times, then ignore it. - // // for liteide often gofmt code after save. - // if t.Add(time.Millisecond * 500).After(time.Now()) { - // colorLog("[SKIP] %s\n", e.String()) - // isbuild = false - // } - // } - eventTime[e.Name] = mt fmt.Println(mt) From 5486f6ee5515280be7bcdce7f861b444da65b50a Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2013 12:52:32 +0800 Subject: [PATCH 3/5] Fixed bug: repeat build in Mac OS, change to check file ModTime insetad of event time --- watch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/watch.go b/watch.go index ece85da..7bf9c3e 100644 --- a/watch.go +++ b/watch.go @@ -74,6 +74,7 @@ func getFileModTime(path string) int64 { colorLog("[ERRO] Fail to open file[ %s ]", err) return time.Now().Unix() } + defer f.Close() fi, err := f.Stat() if err != nil { From a6840ebafde8defa8c1bf7ec0022625baa19962a Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2013 12:53:07 +0800 Subject: [PATCH 4/5] Fixed bug: repeat build in Mac OS, change to check file ModTime insetad of event time --- watch.go | 1 - 1 file changed, 1 deletion(-) diff --git a/watch.go b/watch.go index 7bf9c3e..b640c6b 100644 --- a/watch.go +++ b/watch.go @@ -44,7 +44,6 @@ func NewWatcher(paths []string) { } eventTime[e.Name] = mt - fmt.Println(mt) if isbuild { colorLog("[EVEN] %s\n", e) From 055609f64dd526fce54d8359d80531765e8a8a9d Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2013 15:24:23 +0800 Subject: [PATCH 5/5] Update color ouput --- .gitignore | 4 ++++ run.go | 3 ++- util.go | 14 ++++++++++---- watch.go | 10 ++++++---- 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..418384a --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +bee +*.exe +*.exe~ diff --git a/run.go b/run.go index 503abf3..4fb3c97 100644 --- a/run.go +++ b/run.go @@ -68,7 +68,8 @@ var conf struct { func runApp(cmd *Command, args []string) { exit := make(chan bool) if len(args) != 1 { - colorLog("[ERRO] Argument [appname] is missing\n") + colorLog("[ERRO] Cannot start running[ %s ]\n", + "argument 'appname' is missing") os.Exit(2) } crupath, _ := os.Getwd() diff --git a/util.go b/util.go index 026d8ed..2846b97 100644 --- a/util.go +++ b/util.go @@ -62,12 +62,16 @@ func colorLog(format string, a ...interface{}) { log = log[i+1:] // Error. - log = strings.Replace(log, "[ ", fmt.Sprintf("[ \033[%dm", Red), -1) - log = strings.Replace(log, " ]", EndColor+" ]", -1) + log = strings.Replace(log, "[ ", fmt.Sprintf("[\033[%dm", Red), -1) + log = strings.Replace(log, " ]", EndColor+"]", -1) // Path. - log = strings.Replace(log, "(", fmt.Sprintf("(\033[%dm", Yellow), -1) - log = strings.Replace(log, ")", EndColor+")", -1) + log = strings.Replace(log, "( ", fmt.Sprintf("(\033[%dm", Yellow), -1) + log = strings.Replace(log, " )", EndColor+")", -1) + + // Highlights. + log = strings.Replace(log, "# ", fmt.Sprintf("\033[%dm", Gray), -1) + log = strings.Replace(log, " #", EndColor, -1) log = clog + log } @@ -79,6 +83,8 @@ func colorLog(format string, a ...interface{}) { func getColorLevel(level string) string { level = strings.ToUpper(level) switch level { + case "TRAC": + return fmt.Sprintf("\033[%dm%s\033[0m", Blue, level) case "ERRO": return fmt.Sprintf("\033[%dm%s\033[0m", Red, level) case "WARN": diff --git a/watch.go b/watch.go index b640c6b..9f05e53 100644 --- a/watch.go +++ b/watch.go @@ -20,7 +20,8 @@ var ( func NewWatcher(paths []string) { watcher, err := fsnotify.NewWatcher() if err != nil { - log.Fatal(err) + colorLog("[ERRO] Fail to create new Watcher[ %s ]\n", err) + os.Exit(2) } go func() { @@ -39,7 +40,7 @@ func NewWatcher(paths []string) { mt := getFileModTime(e.Name) if t := eventTime[e.Name]; mt == t { - colorLog("[SKIP] %s\n", e.String()) + colorLog("[SKIP] # %s #\n", e.String()) isbuild = false } @@ -57,10 +58,11 @@ func NewWatcher(paths []string) { colorLog("[INFO] Initializing watcher...\n") for _, path := range paths { - fmt.Println(path) + colorLog("[TRAC] Directory( %s )\n", path) err = watcher.Watch(path) if err != nil { - log.Fatal(err) + colorLog("[ERRO] Fail to watch directory[ %s ]\n", err) + os.Exit(2) } }