From d04bafa0eb54f6da5d63e799582db43b56623e80 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <xdrm.brackets.dev@gmail.com>
Date: Mon, 9 Jul 2018 00:29:25 +0200
Subject: [PATCH] dispatch cmd/main into files.go

---
 cmd/aicra/files.go | 25 +++++++++++++++++++++++++
 cmd/aicra/main.go  | 29 +++++++++--------------------
 2 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 cmd/aicra/files.go

diff --git a/cmd/aicra/files.go b/cmd/aicra/files.go
new file mode 100644
index 0000000..79292f4
--- /dev/null
+++ b/cmd/aicra/files.go
@@ -0,0 +1,25 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+)
+
+// Returns an absolute path from the @path variable if already absolute
+// if @path is relative, it is processed relative to the @base directory
+func getAbsPath(base string, path string) (string, error) {
+
+	// already absolute
+	if filepath.IsAbs(path) {
+		return path, nil
+	}
+
+	// relative: join from @base dir
+	return filepath.Abs(filepath.Join(base, path))
+}
+
+// Returns whether a directory exists for the path @path
+func dirExists(path string) bool {
+	stat, err := os.Stat(path)
+	return err != nil || !stat.IsDir()
+}
diff --git a/cmd/aicra/main.go b/cmd/aicra/main.go
index 730f218..b80e9ce 100644
--- a/cmd/aicra/main.go
+++ b/cmd/aicra/main.go
@@ -46,30 +46,21 @@ func main() {
 		return
 	}
 	/* (2) Get absolute controllers' path */
-	if !filepath.IsAbs(*ctlPathFlag) {
-		*ctlPathFlag = filepath.Join(projectPath, *ctlPathFlag)
-	}
-	cPath, err := filepath.Abs(*ctlPathFlag)
+	cPath, err := getAbsPath(projectPath, *ctlPathFlag)
 	if err != nil {
 		fmt.Printf("invalid argument: controllers' path\n")
 		return
 	}
 
 	/* (3) Get absolute types' path */
-	if !filepath.IsAbs(*typPathFlag) {
-		*typPathFlag = filepath.Join(projectPath, *typPathFlag)
-	}
-	tPath, err := filepath.Abs(*typPathFlag)
+	tPath, err := getAbsPath(projectPath, *typPathFlag)
 	if err != nil {
 		fmt.Printf("invalid argument: types' path\n")
 		return
 	}
 
 	/* (4) Get absolute middlewares' path */
-	if !filepath.IsAbs(*midPathFlag) {
-		*midPathFlag = filepath.Join(projectPath, *midPathFlag)
-	}
-	mPath, err := filepath.Abs(*midPathFlag)
+	mPath, err := getAbsPath(projectPath, *midPathFlag)
 	if err != nil {
 		fmt.Printf("invalid argument: middlwares' path\n")
 		return
@@ -84,18 +75,17 @@ func main() {
 
 	/* (1) Project path */
 	clifmt.Align("    . project root")
-	if stat, err := os.Stat(projectPath); err != nil || !stat.IsDir() {
+	if !dirExists(projectPath) {
 		fmt.Printf("invalid\n\n")
 		fmt.Printf("%s  invalid project folder - %s\n\n", clifmt.Warn(), clifmt.Color(36, projectPath))
 		fmt.Printf("You must specify an existing directory path\n")
 		return
-	} else {
-		fmt.Printf("ok\n")
 	}
+	fmt.Printf("ok\n")
 
 	/* (2) Controllers path */
 	clifmt.Align("    . controllers")
-	if stat, err := os.Stat(cPath); err != nil || !stat.IsDir() {
+	if !dirExists(cPath) {
 		compileControllers = false
 		fmt.Printf("missing\n")
 	} else {
@@ -104,7 +94,7 @@ func main() {
 
 	/* (3) Middlewares path */
 	clifmt.Align("    . middlewares")
-	if stat, err := os.Stat(cPath); err != nil || !stat.IsDir() {
+	if !dirExists(mPath) {
 		compileMiddlewares = false
 		fmt.Printf("missing\n")
 	} else {
@@ -113,7 +103,7 @@ func main() {
 
 	/* (4) Default types path */
 	clifmt.Align("    . default types")
-	if stat, err := os.Stat(dtPath); err != nil || !stat.IsDir() {
+	if !dirExists(dtPath) {
 		fmt.Printf("missing\n")
 		compileTypes = false
 
@@ -123,10 +113,9 @@ func main() {
 
 	/* (5) Types path */
 	clifmt.Align("    . custom types")
-	if stat, err := os.Stat(tPath); err != nil || !stat.IsDir() {
+	if !dirExists(tPath) {
 		fmt.Printf("missing\n")
 		compileTypes = false
-
 	} else {
 		fmt.Printf("ok\n")
 	}