code cleaned up

Author: nProgrammer

controllers/functions.go

@@ -1,10 +1,7 @@
 package controllers
 
 import (
-	"encoding/json"
-	"fmt"
 	"godemon/models"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"time"
@@ -37,66 +34,16 @@ func ProgramStarting(cnf *string, filepath string, modOrFile string, command str
 	if *cnf == "cmd" {
 
 	} else if *cnf == "cnf" {
-		jsonFile, err := os.Open("godemon-cnf.json")
-		ErrorHandle(err)
-		defer jsonFile.Close()
-		byteValue, err := ioutil.ReadAll(jsonFile)
-		ErrorHandle(err)
-		var commands models.Commands
-		json.Unmarshal(byteValue, &commands)
-		for i := 0; i < len(commands.Commands); i++ {
-			if command == commands.Commands[i].Name {
-				fmt.Println(commands.Commands[i].Path)
-				fmt.Println(commands.Commands[i].Option)
-				filepath = commands.Commands[i].Path
-				modOrFile = commands.Commands[i].Option
-			}
-		}
+		cnfFunc(command, "", "")
 	} else if *cnf == "deploy" {
-		jsonFile, err := os.Open("project.json")
-		ErrorHandle(err)
-		defer jsonFile.Close()
-		byteValue, err := ioutil.ReadAll(jsonFile)
-		ErrorHandle(err)
-		var pr models.Project
-		json.Unmarshal(byteValue, &pr)
-		goos := "GOOS=" + pr.OS
-		arch := "GOARCH=" + pr.Arch
-		name := pr.Name
-		os.Chdir(pr.Path)
-		fmt.Println(pr)
-		cmd := exec.Command("env", goos, arch, "go", "build", "-o", name)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Run()
-		os.Exit(1)
+		deploy()
 	} else if init == true {
-		os.Mkdir(name, 0777)
-		os.Chdir(name)
-		var project models.Project
-		path, _ := os.Getwd()
-		project.Path = path
-		project.Name = name
-		project.Arch = arch
-		project.OS = oso
-		var commands models.Commands
-		var command models.Command
-		command.Name = "run"
-		command.Path = path
-		command.Option = "mod"
-		commands.Commands = append(commands.Commands, command)
-		file, _ := json.MarshalIndent(project, "", "	")
-		_ = ioutil.WriteFile("project.json", file, 0644)
-		file, _ = json.MarshalIndent(commands, "", "	")
-		_ = ioutil.WriteFile("godemon-cnf.json", file, 0644)
-		cmd := exec.Command("go", "mod", "init", name)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Run()
-		os.Exit(1)
-	} else if *help == true {
-		fmt.Printf("Godemon %v: \n 1. -cnf <- in this flag put info about what do you want to do - if use cmd option use -cnf=cmd, if config file use -cnf=cnf \n 2. -path <- path to file/directory \n 3. -modOrFile <- are you using modules or one file \n 4. -command <- binded command in config file \n", version)
-		os.Exit(1)
+		initialize(name, arch, oso)
+	} else if *help == true ||
+		(*cnf == "" && filepath == "" && modOrFile == "" &&
+			command == "" && *help == false && init == false &&
+			name == "" && oso == "" && arch == "") {
+		models.HelpCLI(version)
 	}
 	return filepath, modOrFile
 }
@@ -112,10 +59,7 @@ func WatchFiles(fileordirPath string) error {
 			return err
 		}
 		if stat.Size() != initialStat.Size() || stat.ModTime() != initialStat.ModTime() {
-			cmd := exec.Command("killall", "-9", "app-godemon-app-godemon-tmp-generated")
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Run()
+			killProcess()
 			break
 		}
 		time.Sleep(1 * time.Second)

controllers/pv.go

@@ -0,0 +1,81 @@
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"godemon/models"
+	"io/ioutil"
+	"os"
+	"os/exec"
+)
+
+func deploy() {
+	jsonFile, err := os.Open("project.json")
+	ErrorHandle(err)
+	defer jsonFile.Close()
+	byteValue, err := ioutil.ReadAll(jsonFile)
+	ErrorHandle(err)
+	var pr models.Project
+	json.Unmarshal(byteValue, &pr)
+	goos := "GOOS=" + pr.OS
+	arch := "GOARCH=" + pr.Arch
+	name := pr.Name
+	os.Chdir(pr.Path)
+	fmt.Println(pr)
+	cmd := exec.Command("env", goos, arch, "go", "build", "-o", name)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+	os.Exit(1)
+}
+
+func initialize(name string, arch string, oso string) {
+	os.Mkdir(name, 0777)
+	os.Chdir(name)
+	var project models.Project
+	path, _ := os.Getwd()
+	project.Path = path
+	project.Name = name
+	project.Arch = arch
+	project.OS = oso
+	var commands models.Commands
+	var command models.Command
+	command.Name = "run"
+	command.Path = path
+	command.Option = "mod"
+	commands.Commands = append(commands.Commands, command)
+	file, _ := json.MarshalIndent(project, "", "	")
+	_ = ioutil.WriteFile("project.json", file, 0644)
+	file, _ = json.MarshalIndent(commands, "", "	")
+	_ = ioutil.WriteFile("godemon-cnf.json", file, 0644)
+	cmd := exec.Command("go", "mod", "init", name)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+	os.Exit(1)
+}
+
+func cnfFunc(command string, filepath string, modOrFile string) {
+	jsonFile, err := os.Open("godemon-cnf.json")
+	ErrorHandle(err)
+	defer jsonFile.Close()
+	byteValue, err := ioutil.ReadAll(jsonFile)
+	ErrorHandle(err)
+	var commands models.Commands
+	json.Unmarshal(byteValue, &commands)
+	for i := 0; i < len(commands.Commands); i++ {
+		if command == commands.Commands[i].Name {
+			fmt.Println(commands.Commands[i].Path)
+			fmt.Println(commands.Commands[i].Option)
+			filepath = commands.Commands[i].Path
+			modOrFile = commands.Commands[i].Option
+		}
+	}
+}
+
+func killProcess() {
+	cmd := exec.Command("killall", "-9", "app-godemon-app-godemon-tmp-generated")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+}

models/staticCLI.go

@@ -0,0 +1,11 @@
+package models
+
+import (
+	"fmt"
+	"os"
+)
+
+func HelpCLI(version string) {
+	fmt.Printf("Godemon %v: \n 1. -cnf <- in this flag put info about what do you want to do - if use cmd option use -cnf=cmd, if config file use -cnf=cnf \n 2. -path <- path to file/directory \n 3. -modOrFile <- are you using modules or one file \n 4. -command <- binded command in config file \n", version)
+	os.Exit(1)
+}