code refactored

Author: nProgrammer

controllers/loadFlags.go cliTools/loadFlags.gocontrollers/loadFlags.go renamed to cliTools/loadFlags.go

@@ -1,4 +1,4 @@
-package controllers
+package cliTools
 
 import (
 	"flag"

controllers/logsToCli.go cliTools/logsToCli.gocontrollers/logsToCli.go renamed to cliTools/logsToCli.go

@@ -1,4 +1,4 @@
-package controllers
+package cliTools
 
 import (
 	"github.com/fatih/color"

controllers/timeLog.go cliTools/timeLog.gocontrollers/timeLog.go renamed to cliTools/timeLog.go

@@ -1,4 +1,4 @@
-package controllers
+package cliTools
 
 func TimeLog() {
 	timeLog()

controllers/executables.go

@@ -3,7 +3,9 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"godemon/errors"
 	"godemon/models"
+	"godemon/prepareProject"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -12,10 +14,10 @@ import (
 func deploy(oso string, archL string, hOS string) {
 	var goos string
 	var arch string
-	pr := loadProjectInfo()
+	pr := prepareProject.LoadProjectInfo()
 	name := pr.Name
 	err := os.Chdir(pr.Path)
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	if oso != "" && archL == "" {
 		goos = "GOOS=" + oso
 		arch = "GOARCH=" + archL
@@ -30,15 +32,15 @@ func deploy(oso string, archL string, hOS string) {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	os.Exit(1)
 }
 
 func initialize(name string, arch string, oso string) {
 	err := os.Mkdir(name, 0777)
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	err = os.Chdir(name)
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	var project models.Project
 	path, _ := os.Getwd()
 	project.Path = path
@@ -52,19 +54,19 @@ func initialize(name string, arch string, oso string) {
 	command.Option = "mod"
 	project.Commands = append(project.Commands, command)
 	file, err := json.MarshalIndent(project, "", "	")
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	err = ioutil.WriteFile("project.json", file, 0644)
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	cmd := exec.Command("go", "mod", "init", name)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
-	ErrorHandle(err)
+	errors.ErrorHandle(err)
 	os.Exit(1)
 }
 
 func cnfFunc(command string, filepath string, modOrFile string) (string, string) {
-	project := loadProjectInfo()
+	project := prepareProject.LoadProjectInfo()
 	for i := 0; i < len(project.Commands); i++ {
 		if command == project.Commands[i].Name {
 			filepath = project.Commands[i].Path

controllers/pv.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"godemon/killProcess"
 	"os"
 	"time"
 )
@@ -20,7 +21,7 @@ func watch(fileordirPath string, hOS string) error {
 			return err
 		}
 		if stat.Size() != initialStat.Size() || stat.ModTime() != initialStat.ModTime() {
-			killProcess(hOS)
+			killProcess.KillProcess(hOS)
 			break
 		}
 		time.Sleep(1 * time.Second)

controllers/watch.go

@@ -0,0 +1,5 @@
+package errors
+
+func ErrorHandle(err error) {
+	errorHandle(err)
+}

errors/errorHandling.go

@@ -1,8 +1,8 @@
-package controllers
+package errors
 
 import "fmt"
 
-func ErrorHandle(err error) {
+func errorHandle(err error) {
 	if err != nil {
 		fmt.Println(err)
 	}

controllers/errorHandling.go errors/errorHandlingPv.gocontrollers/errorHandling.go renamed to errors/errorHandlingPv.go

@@ -0,0 +1,29 @@
+package execs
+
+import (
+	"encoding/json"
+	"godemon/errors"
+	"godemon/models"
+	"io/ioutil"
+	"os"
+)
+
+func ExecMOD(hOS string) {
+	jsonFile, err := os.Open("project.json")
+	errors.ErrorHandle(err)
+	defer jsonFile.Close()
+	byteValue, err := ioutil.ReadAll(jsonFile)
+	errors.ErrorHandle(err)
+	var pr models.Project
+	err = json.Unmarshal(byteValue, &pr)
+	errors.ErrorHandle(err)
+	for i := 0; i < len(pr.Vars); i++ {
+		err = os.Setenv(pr.Vars[i].Key, pr.Vars[i].Value)
+		errors.ErrorHandle(err)
+	}
+	execMOD(hOS)
+}
+
+func ExecFile(filepath string) {
+	execFile(filepath)
+}

execs/executables.go

@@ -0,0 +1,31 @@
+package execs
+
+import (
+	"godemon/errors"
+	"os"
+	"os/exec"
+)
+
+func execMOD(hOS string) {
+	if hOS == "windows" {
+		cmd := exec.Command("app-godemon-app-godemon-tmp-generated.exe")
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		err := cmd.Run()
+		errors.ErrorHandle(err)
+	} else {
+		cmd := exec.Command("./app-godemon-app-godemon-tmp-generated")
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		err := cmd.Run()
+		errors.ErrorHandle(err)
+	}
+}
+
+func execFile(filepath string) {
+	cmd := exec.Command("go", "run", filepath)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	errors.ErrorHandle(err)
+}