sashakoshka
/
gomp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using utils.GetNetwork

This commit is contained in:
aditya-K2 2022-09-14 20:42:28 +05:30
parent 503701691b
commit 3effda228b
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@ -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")

14
utils/utils.go
View File

@ -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
}

13
views/playlistview.go
View File

@ -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")