consolidate utils

src/utils/exists.go

@@ -1,13 +0,0 @@
-package utils
-
-import "os"
-
-// Exists reports whether the named file or directory exists.
-func Exists(name string) bool {
-	if _, err := os.Stat(name); err != nil {
-		if os.IsNotExist(err) {
-			return false
-		}
-	}
-	return true
-}

src/utils/getinput.go

@@ -1,15 +0,0 @@
-package utils
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"strings"
-)
-
-func GetInput(prompt string) string {
-	reader := bufio.NewReader(os.Stdin)
-	fmt.Fprintf(os.Stderr, "%s", prompt)
-	text, _ := reader.ReadString('\n')
-	return strings.TrimSpace(text)
-}

src/utils/hash.go

@@ -1,33 +0,0 @@
-package utils
-
-import (
-	"crypto/md5"
-	"crypto/sha256"
-	"fmt"
-	"io"
-	"os"
-)
-
-// HashFile returns the md5 hash of a file
-func HashFile(fname string) (hash256 []byte, err error) {
-	f, err := os.Open(fname)
-	if err != nil {
-		return
-	}
-	defer f.Close()
-
-	h := md5.New()
-	if _, err = io.Copy(h, f); err != nil {
-		return
-	}
-
-	hash256 = h.Sum(nil)
-	return
-}
-
-// SHA256 returns sha256 sum
-func SHA256(s string) string {
-	sha := sha256.New()
-	sha.Write([]byte(s))
-	return fmt.Sprintf("%x", sha.Sum(nil))
-}

src/utils/ip.go

@@ -1,39 +0,0 @@
-package utils
-
-import (
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"strings"
-)
-
-func PublicIP() (ip string, err error) {
-	resp, err := http.Get("https://canhazip.com")
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode == http.StatusOK {
-		bodyBytes, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return "", err
-		}
-		ip = strings.TrimSpace(string(bodyBytes))
-	}
-	return
-}
-
-// Get preferred outbound ip of this machine
-func LocalIP() string {
-	conn, err := net.Dial("udp", "8.8.8.8:80")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer conn.Close()
-
-	localAddr := conn.LocalAddr().(*net.UDPAddr)
-
-	return localAddr.IP.String()
-}

src/utils/ip_test.go

@@ -1,11 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestGetIP(t *testing.T) {
-	fmt.Println(PublicIP())
-	fmt.Println(LocalIP())
-}

src/utils/randomname.go

@@ -1,16 +0,0 @@
-package utils
-
-import (
-	"crypto/rand"
-	"strings"
-
-	"github.com/schollz/mnemonicode"
-)
-
-func GetRandomName() string {
-	result := []string{}
-	bs := make([]byte, 4)
-	rand.Read(bs)
-	result = mnemonicode.EncodeWordList(result, bs)
-	return strings.Join(result, "-")
-}

src/utils/utils.go

@@ -0,0 +1,98 @@
+package utils
+
+import (
+	"bufio"
+	"crypto/md5"
+	"crypto/rand"
+	"crypto/sha256"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+
+	"github.com/schollz/mnemonicode"
+)
+
+// Exists reports whether the named file or directory exists.
+func Exists(name string) bool {
+	if _, err := os.Stat(name); err != nil {
+		if os.IsNotExist(err) {
+			return false
+		}
+	}
+	return true
+}
+
+// GetInput returns the input with a given prompt
+func GetInput(prompt string) string {
+	reader := bufio.NewReader(os.Stdin)
+	fmt.Fprintf(os.Stderr, "%s", prompt)
+	text, _ := reader.ReadString('\n')
+	return strings.TrimSpace(text)
+}
+
+// HashFile returns the md5 hash of a file
+func HashFile(fname string) (hash256 []byte, err error) {
+	f, err := os.Open(fname)
+	if err != nil {
+		return
+	}
+	defer f.Close()
+
+	h := md5.New()
+	if _, err = io.Copy(h, f); err != nil {
+		return
+	}
+
+	hash256 = h.Sum(nil)
+	return
+}
+
+// SHA256 returns sha256 sum
+func SHA256(s string) string {
+	sha := sha256.New()
+	sha.Write([]byte(s))
+	return fmt.Sprintf("%x", sha.Sum(nil))
+}
+
+func PublicIP() (ip string, err error) {
+	resp, err := http.Get("https://canhazip.com")
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusOK {
+		bodyBytes, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return "", err
+		}
+		ip = strings.TrimSpace(string(bodyBytes))
+	}
+	return
+}
+
+// Get preferred outbound ip of this machine
+func LocalIP() string {
+	conn, err := net.Dial("udp", "8.8.8.8:80")
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer conn.Close()
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+
+	return localAddr.IP.String()
+}
+
+func GetRandomName() string {
+	result := []string{}
+	bs := make([]byte, 4)
+	rand.Read(bs)
+	result = mnemonicode.EncodeWordList(result, bs)
+	return strings.Join(result, "-")
+}