From 3effda228b6412bde9cf775acd717556e97485d6 Mon Sep 17 00:00:00 2001
From: aditya-K2 <adityakurdunkar2@gmail.com>
Date: Wed, 14 Sep 2022 20:42:28 +0530
Subject: [PATCH] Using utils.GetNetwork

---
 main.go               | 11 +----------
 utils/utils.go        | 14 ++++++++++++++
 views/playlistview.go | 13 ++-----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/main.go b/main.go
index 4b12019..1008e53 100644
--- a/main.go
+++ b/main.go
@@ -22,16 +22,7 @@ import (
 func main() {
 	config.ReadConfig()
 	var mpdConnectionError error
-	del := ""
-	nt := viper.GetString("NETWORK_TYPE")
-	port := viper.GetString("MPD_PORT")
-	if nt == "tcp" {
-		del = ":"
-	} else if nt == "unix" && port != "" {
-		port = ""
-	}
-	client.Conn, mpdConnectionError = mpd.Dial(nt,
-		viper.GetString("NETWORK_ADDRESS")+del+port)
+	client.Conn, mpdConnectionError = mpd.Dial(utils.GetNetwork())
 	if mpdConnectionError != nil {
 		utils.Print("RED", "Could Not Connect to MPD Server\n")
 		utils.Print("GREEN", "Make Sure You Mention the Correct MPD Port in the config file.\n")
diff --git a/utils/utils.go b/utils/utils.go
index 772096d..3cf31c3 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"syscall"
 	"unsafe"
+
+	"github.com/spf13/viper"
 )
 
 type winsize struct {
@@ -174,3 +176,15 @@ func Unique(intSlice []int) []int {
 	}
 	return list
 }
+
+func GetNetwork() (string, string) {
+	del := ""
+	nt := viper.GetString("NETWORK_TYPE")
+	port := viper.GetString("MPD_PORT")
+	if nt == "tcp" {
+		del = ":"
+	} else if nt == "unix" && port != "" {
+		port = ""
+	}
+	return nt, viper.GetString("NETWORK_ADDRESS") + del + port
+}
diff --git a/views/playlistview.go b/views/playlistview.go
index 9aab0d4..97880bc 100644
--- a/views/playlistview.go
+++ b/views/playlistview.go
@@ -8,7 +8,6 @@ import (
 	"github.com/aditya-K2/tview"
 	"github.com/fhs/gompd/v2/mpd"
 	"github.com/gdamore/tcell/v2"
-	"github.com/spf13/viper"
 )
 
 type PlaylistView struct {
@@ -95,17 +94,9 @@ func (p *PlaylistView) StartWatcher() {
 			panic(err)
 		}
 	}
-	del := ""
-	nt := viper.GetString("NETWORK_TYPE")
-	port := viper.GetString("MPD_PORT")
-	if nt == "tcp" {
-		del = ":"
-	} else if nt == "unix" && port != "" {
-		port = ""
-	}
 
-	w, err := mpd.NewWatcher(nt,
-		viper.GetString("NETWORK_ADDRESS")+del+port, "", "playlist")
+	nt, addr := utils.GetNetwork()
+	w, err := mpd.NewWatcher(nt, addr, "", "playlist")
 	if err != nil {
 		utils.Print("RED", "Could Not Start Watcher.\n")
 		utils.Print("GREEN", "Please check your MPD Info in config File.\n")