Merge pull request #28 from silenceper/f-golangci

fix golangci-lint

Author: silenceper

.golangci.yml

@@ -50,4 +50,12 @@ issues:
 linters-settings:
   funlen:
     lines: 66
-    statements: 40
+    statements: 40
+
+issues:
+  include:
+  - EXC0002 # disable excluding of issues about comments from golint
+  exclude-rules:
+    - linters:
+       - stylecheck
+      text: "ST1000:"

README.md

@@ -8,6 +8,7 @@
 
 gowatch is a command line tool that builds and (re)starts your go project everytime you save a Go or template file.
 
+![gowatch](./screenshot/gowatch.png)
 
 ## Installation
 To install `gowatch` use the `go get` command:
@@ -33,7 +34,6 @@ Start gowatch:
 gowatch
 ```
 
-![gowatch](./screenshot/gowatch.png)
 
 Gowatch will watch for file events, and every time you create/modify/delete a file it will build and restart the application,If `go build` returns an error, it will log it in stdout.
 

config.go

@@ -11,31 +11,31 @@ import (
 var configFile = "./gowatch.yml"
 
 type config struct {
-	//执行的app名字，默认当前目录文字
+	// The name of the running app, the default current directory name
 	AppName string `yaml:"appname"`
-	//指定ouput执行的程序路径
+	// Specify the program path for output execution
 	Output string `yaml:"output"`
-	//需要追加监听的文件后缀名字，默认是'.go'，
+	// Need to add watch file suffix name, the default is'.go',
 	WatchExts []string `yaml:"watch_exts"`
-	//需要追加监听的目录，默认是当前文件夹，
+	// Need to add watch directory, the default is the current folder
 	WatchPaths []string `yaml:"watch_paths"`
-	//build前额外执行的命令
+	// Additional commands executed before the build command
 	PrevBuildCmds []string `yaml:"prev_build_cmds"`
-	//执行时的额外参数
+	// Extra parameters when running the application
 	CmdArgs []string `yaml:"cmd_args"`
-	//构建时的额外参数
+	// Additional parameters during build
 	BuildArgs []string `yaml:"build_args"`
-	//执行时追加的环境变量
+	// Environment variables added when running the application
 	Envs []string `yaml:"envs"`
-	//vendor 目录下的文件是否也监听
+	// Specify whether the files in the vendor directory are also watched
 	VendorWatch bool `yaml:"vendor_watch"`
-	//不需要监听的目录
+	// Specify a directory that does not require watch
 	ExcludedPaths []string `yaml:"excluded_paths"`
-	//需要编译的包或文件,优先使用-p参数
+	// For packages or files that need to be compiled, use the -p parameter first
 	BuildPkg string `yaml:"build_pkg"`
-	//在go build 时期接收的-tags参数
+	// -tags parameter accepted during go build
 	BuildTags string `yaml:"build_tags"`
-	//程序是否自动运行
+	// Specify whether the program runs automatically
 	DisableRun bool `yaml:"disable_run"`
 }
 

gowatch.go

@@ -22,7 +22,7 @@ var (
 	scheduleTime time.Time
 )
 
-//NewWatcher new watcher
+// NewWatcher new watcher
 func NewWatcher(paths []string, files []string) {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
@@ -46,7 +46,7 @@ func NewWatcher(paths []string, files []string) {
 
 				mt := getFileModTime(e.Name)
 				if t := eventTime[e.Name]; mt == t {
-					//log.Infof("[SKIP] # %s #\n", e.String())
+					// log.Infof("[SKIP] # %s #\n", e.String())
 					isbuild = false
 				}
 
@@ -86,7 +86,7 @@ func NewWatcher(paths []string, files []string) {
 
 // getFileModTime retuens unix timestamp of `os.File.ModTime` by given path.
 func getFileModTime(path string) int64 {
-	path = strings.Replace(path, "\\", "/", -1)
+	path = strings.ReplaceAll(path, "\\", "/")
 	f, err := os.Open(path)
 	if err != nil {
 		log.Errorf("Fail to open file[ %s ]\n", err)
@@ -103,7 +103,7 @@ func getFileModTime(path string) int64 {
 	return fi.ModTime().Unix()
 }
 
-//Autobuild auto build
+// Autobuild auto build
 func Autobuild(files []string) {
 	state.Lock()
 	defer state.Unlock()
@@ -159,7 +159,7 @@ func Autobuild(files []string) {
 	}
 }
 
-//Kill kill process
+// Kill kill process
 func Kill() {
 	defer func() {
 		if e := recover(); e != nil {
@@ -174,14 +174,14 @@ func Kill() {
 	}
 }
 
-//Restart restart app
+// Restart restart app
 func Restart(appname string) {
-	//log.Debugf("kill running process")
+	// log.Debugf("kill running process")
 	Kill()
 	go Start(appname)
 }
 
-//Start start app
+// Start start app
 func Start(appname string) {
 	log.Infof("Restarting %s ...\n", appname)
 	if !strings.HasPrefix(appname, "./") {

main.go

@@ -45,7 +45,7 @@ func main() {
 	cfg = parseConfig()
 	currpath, _ = os.Getwd()
 	if cfg.AppName == "" {
-		//app名默认取目录名
+		// The app name defaults to the directory name
 		if output == "" {
 			cfg.AppName = path.Base(currpath)
 		} else {
@@ -57,7 +57,7 @@ func main() {
 		cfg.Output = output
 	}
 
-	//如果未指定output则为"./appname"
+	// If output is not specified, it is "./appname"
 	if cfg.Output == "" {
 		outputExt := ""
 		if runtime.GOOS == "windows" {
@@ -70,7 +70,7 @@ func main() {
 		cfg.CmdArgs = strings.Split(cmdArgs, ",")
 	}
 
-	//监听的文件后缀
+	// File suffix to be watched
 	cfg.WatchExts = append(cfg.WatchExts, ".go")
 
 	runApp()
@@ -79,7 +79,7 @@ func main() {
 func runApp() {
 	var paths []string
 	readAppDirectories(currpath, &paths)
-	//除了当前目录，增加额外监听的目录
+	// In addition to the current directory, add additional watch directories
 	for _, path := range cfg.WatchPaths {
 		readAppDirectories(path, &paths)
 	}