Rename conn -> CONN ( Also made it Global )

Following Changes have been made:

1. conn -> CONN
2. CONN is now a global as a lot of functions were requiring it and
   passing them as a parameter didn't seem intuitive.
3. In progressBar.go now we are sending only the short path instead of
   absolute path.
This commit is contained in:
aditya-K2
2021-11-13 11:32:00 +05:30
parent c19a053126
commit e4ed3bbab7
4 changed files with 52 additions and 57 deletions

View File

@@ -3,10 +3,7 @@ package main
import (
"strings"
"github.com/fhs/gompd/mpd"
// "github.com/gdamore/tcell/v2"
"github.com/rivo/tview"
// "fmt"
)
func getFormattedString(s string, width int) string {
@@ -19,18 +16,18 @@ func getFormattedString(s string, width int) string {
return s
}
func togglePlayBack(connection mpd.Client) error {
status, err := connection.Status()
func togglePlayBack() error {
status, err := CONN.Status()
if status["state"] == "play" && err == nil {
connection.Pause(true)
CONN.Pause(true)
} else if status["state"] == "pause" && err == nil {
connection.Play(-1)
CONN.Play(-1)
}
return err
}
func UpdatePlaylist(conn mpd.Client, inputTable *tview.Table) {
_playlistAttr, _ := conn.PlaylistInfo(-1, -1)
func UpdatePlaylist(inputTable *tview.Table) {
_playlistAttr, _ := CONN.PlaylistInfo(-1, -1)
inputTable.Clear()
for i, j := range _playlistAttr {
@@ -55,11 +52,11 @@ func join(stringSlice []string) string {
return _s
}
func Update(conn mpd.Client, f []FileNode, inputTable *tview.Table) {
func Update(f []FileNode, inputTable *tview.Table) {
inputTable.Clear()
for i, j := range f {
if len(j.children) == 0 {
_songAttributes, err := conn.ListAllInfo(j.absolutePath)
_songAttributes, err := CONN.ListAllInfo(j.absolutePath)
if err == nil && _songAttributes[0]["Title"] != "" {
_, _, w, _ := inputTable.GetInnerRect()
inputTable.SetCell(i, 0,