Skip to content

Commit a30167a

Browse files
committed
code cleaned up
1 parent c91b0aa commit a30167a

File tree

2 files changed

+35
-27
lines changed

2 files changed

+35
-27
lines changed

controllers/functions.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package controllers
2+
3+
import (
4+
"os"
5+
"os/exec"
6+
"time"
7+
)
8+
9+
func ExecMOD() {
10+
cmd := exec.Command("./app-godemon-app-godemon-tmp-generated")
11+
cmd.Stdout = os.Stdout
12+
cmd.Stderr = os.Stderr
13+
cmd.Run()
14+
}
15+
16+
func ExecFile(filepath string) {
17+
cmd := exec.Command("go", "run", filepath)
18+
cmd.Stdout = os.Stdout
19+
cmd.Stderr = os.Stderr
20+
cmd.Run()
21+
}
22+
23+
func TimeLog() {
24+
log := time.Now().Format("2006-01-02, 15:04 \n\n")
25+
log = `Building project: ` + log + `Program result: `
26+
cmd := exec.Command("printf", "\\e[1;34m%-6s\\e[m\n", log)
27+
cmd.Stdout = os.Stdout
28+
cmd.Stderr = os.Stderr
29+
cmd.Run()
30+
}

main.go

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"fmt"
5+
"godemon/controllers"
56
"os"
67
"os/exec"
78
"time"
@@ -33,29 +34,6 @@ func watch(fileordirPath string) error {
3334
return nil
3435
}
3536

36-
func execMOD() {
37-
cmd := exec.Command("./app-godemon-app-godemon-tmp-generated")
38-
cmd.Stdout = os.Stdout
39-
cmd.Stderr = os.Stderr
40-
cmd.Run()
41-
}
42-
43-
func execFile(filepath string) {
44-
cmd := exec.Command("go", "run", filepath)
45-
cmd.Stdout = os.Stdout
46-
cmd.Stderr = os.Stderr
47-
cmd.Run()
48-
}
49-
50-
func timeLog() {
51-
log := time.Now().Format("2006-01-02, 15:04 \n\n")
52-
log = `Building project: ` + log + `Program result: `
53-
cmd := exec.Command("printf", "\\e[1;34m%-6s\\e[m\n", log)
54-
cmd.Stdout = os.Stdout
55-
cmd.Stderr = os.Stderr
56-
cmd.Run()
57-
}
58-
5937
func main() {
6038
doneChan := make(chan bool)
6139
filepath := os.Args[1]
@@ -75,15 +53,15 @@ func main() {
7553
fmt.Println("File has been changed")
7654
if modOrFile == "mod" {
7755
os.Chdir(filepath)
78-
timeLog()
56+
controllers.TimeLog()
7957
cmd := exec.Command("go", "build", "-o", "app-godemon-app-godemon-tmp-generated")
8058
cmd.Stdout = os.Stdout
8159
cmd.Stderr = os.Stderr
8260
cmd.Run()
83-
go execMOD()
61+
go controllers.ExecMOD()
8462
} else if modOrFile == "file" {
85-
timeLog()
86-
go execFile(filepath)
63+
controllers.TimeLog()
64+
go controllers.ExecFile(filepath)
8765
}
8866
}(doneChan)
8967
<-doneChan

0 commit comments

Comments
 (0)