lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-25 15:00:55 +00:00
Code Issues Releases Activity

Move getFileModTime() to utils package

Browse Source
This commit is contained in:
Faissal Elamraoui 2017-04-02 23:36:17 +02:00
parent 5600cb1c36
commit f80384a9f5
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/commands/run/watch.go
View File

@ -71,7 +71,7 @@ func NewWatcher(paths []string, files []string, isgenerate bool) {
continue continue
} }
mt := getFileModTime(e.Name) mt := utils.GetFileModTime(e.Name)
if t := eventTime[e.Name]; mt == t { if t := eventTime[e.Name]; mt == t {
beeLogger.Log.Hintf(colors.Bold("Skipping: ")+"%s", e.String()) beeLogger.Log.Hintf(colors.Bold("Skipping: ")+"%s", e.String())
isBuild = false isBuild = false
@ -104,25 +104,6 @@ func NewWatcher(paths []string, files []string, isgenerate bool) {
} }
} }
// getFileModTime returns unix timestamp of `os.File.ModTime` for the given path.
func getFileModTime(path string) int64 {
path = strings.Replace(path, "\\", "/", -1)
f, err := os.Open(path)
if err != nil {
beeLogger.Log.Errorf("Failed to open file on '%s': %s", path, err)
return time.Now().Unix()
}
defer f.Close()
fi, err := f.Stat()
if err != nil {
beeLogger.Log.Errorf("Failed to get file stats: %s", err)
return time.Now().Unix()
}
return fi.ModTime().Unix()
}
// AutoBuild builds the specified set of files // AutoBuild builds the specified set of files
func AutoBuild(files []string, isgenerate bool) { func AutoBuild(files []string, isgenerate bool) {
state.Lock() state.Lock()

22
utils/utils.go
View File

@ -26,6 +26,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"text/template" "text/template"
"time"
"unicode" "unicode"
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
@ -67,7 +68,7 @@ func IsInGOPATH(thePath string) bool {
thePath = filepath.ToSlash(thePath) thePath = filepath.ToSlash(thePath)
} }
for _, gopath := range GetGOPATHs() { for _, gopath := range GetGOPATHs() {
if strings.Contains(thePath, gopath + "/src") { if strings.Contains(thePath, gopath+"/src") {
return true return true
} }
} }
@ -412,3 +413,22 @@ func SplitQuotedFields(in string) []string {
return r return r
} }
// GetFileModTime returns unix timestamp of `os.File.ModTime` for the given path.
func GetFileModTime(path string) int64 {
path = strings.Replace(path, "\\", "/", -1)
f, err := os.Open(path)
if err != nil {
beeLogger.Log.Errorf("Failed to open file on '%s': %s", path, err)
return time.Now().Unix()
}
defer f.Close()
fi, err := f.Stat()
if err != nil {
beeLogger.Log.Errorf("Failed to get file stats: %s", err)
return time.Now().Unix()
}
return fi.ModTime().Unix()
}